Merge pull request #623 from rafccq/port-max-explosions

Maximum number of explosions now can be changed from the .ini file

src/game/explosionsreset.c

@@ -14,12 +14,6 @@ void explosionsReset(void)
 	g_ExplosionShakeIntensityTimer = 0;
 	g_ExplosionDamageTxScale = 1;
 
-	g_MaxExplosions = MAX_EXPLOSIONS;
-
-	if (g_Vars.stagenum >= STAGE_TITLE) {
-		g_MaxExplosions = 0;
-	}
-
 	if (g_MaxExplosions == 0) {
 		g_Explosions = NULL;
 	} else {

src/game/explosionsstop.c

@@ -14,7 +14,7 @@ void explosionsStop(void)
 	viShake(0);
 
 	if (g_Explosions) {
-		for (i = 0; i < MAX_EXPLOSIONS; i++) {
+		for (i = 0; i < g_MaxExplosions; i++) {
 			if (g_Explosions[i].prop) {
 				propDelist(g_Explosions[i].prop);
 				propDisable(g_Explosions[i].prop);

src/game/training.c

@@ -1544,7 +1544,7 @@ bool frIsAmmoWasted(void)
 		}
 
 		// Check if there are any explosions
-		for (i = 0; i != MAX_EXPLOSIONS; i++) {
+		for (i = 0; i != g_MaxExplosions; i++) {
 			if (g_Explosions[i].prop) {
 				return false;
 			}

src/include/constants.h

@@ -18,7 +18,6 @@
 #define MAX_CHRSPERSQUADRON    16
 #define MAX_CHRSPERTEAM        32
 #define MAX_CHRWAYPOINTS       6
-#define MAX_EXPLOSIONS         6
 #define MAX_EYESPYDARTS        8
 #define MAX_MPCHRS             (MAX_PLAYERS + MAX_BOTS)
 #define MAX_MPPLAYERCONFIGS    (MAX_PLAYERS + 2)