upstream-merge-27971

This commit is contained in:
LetterJay
2017-06-11 08:21:14 -05:00
parent bd4d42a8a6
commit 11ff6a7628
5 changed files with 32 additions and 24 deletions
+2
View File
@@ -430,6 +430,8 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
#define GIBTONITE_ACTIVE 1
#define GIBTONITE_STABLE 2
#define GIBTONITE_DETONATE 3
//for obj explosion block calculation
#define EXPLOSION_BLOCK_PROC -1
//Gangster starting influences
#define GANGSTER_SOLDIER_STARTING_INFLUENCE 5