game: avoid mod 0

IR4T4 · IR4T4 · commit ccac196218d2 · 2015-03-15T11:08:06.000+01:00
diff --git a/src/game/g_script_actions.c b/src/game/g_script_actions.c
@@ -2420,11 +2420,21 @@ qboolean G_ScriptAction_Accum(gentity_t *ent, char *params)
 	}
 	else if (!Q_stricmp(lastToken, "random"))
 	{
+		int randomValue;
+
 		if (!token[0])
 		{
 			G_Error("G_ScriptAction_Accum: accum %s requires a parameter\n", lastToken);
 		}
-		ent->scriptAccumBuffer[bufferIndex] = rand() % atoi(token);
+
+		randomValue = atoi(token);
+
+		if (randomValue == 0)
+		{
+			G_Error("G_ScriptAction_Accum: accum %s requires a random parameter <> 0\n", lastToken);
+		}
+
+		ent->scriptAccumBuffer[bufferIndex] = rand() % randomValue;
 	}
 	else if (!Q_stricmp(lastToken, "trigger_if_equal"))
 	{
@@ -2689,11 +2699,21 @@ qboolean G_ScriptAction_GlobalAccum(gentity_t *ent, char *params)
 	}
 	else if (!Q_stricmp(lastToken, "random"))
 	{
+		int randomValue;
+
 		if (!token[0])
 		{
 			G_Error("G_ScriptAction_GlobalAccum: globalaccum %s requires a parameter\n", lastToken);
 		}
-		level.globalAccumBuffer[bufferIndex] = rand() % atoi(token);
+
+		randomValue = atoi(token);
+
+		if (randomValue == 0)
+		{
+			G_Error("G_ScriptAction_GlobalAccum: globalaccum %s requires a random parameter <> 0\n", lastToken);
+		}
+
+		level.globalAccumBuffer[bufferIndex] = rand() % randomValue;
 	}
 	else if (!Q_stricmp(lastToken, "trigger_if_equal"))
 	{

Original file line number	Diff line number	Diff line change
`@@ -2420,11 +2420,21 @@ qboolean G_ScriptAction_Accum(gentity_t ent, char params)`
`2420`	`2420`	`}`
`2421`	`2421`	`else if (!Q_stricmp(lastToken, "random"))`
`2422`	`2422`	`{`
	`2423`	`+ int randomValue;`
	`2424`	`+`
`2423`	`2425`	`if (!token[0])`
`2424`	`2426`	`{`
`2425`	`2427`	`G_Error("G_ScriptAction_Accum: accum %s requires a parameter\n", lastToken);`
`2426`	`2428`	`}`
`2427`		`- ent->scriptAccumBuffer[bufferIndex] = rand() % atoi(token);`
	`2429`	`+`
	`2430`	`+ randomValue = atoi(token);`
	`2431`	`+`
	`2432`	`+ if (randomValue == 0)`
	`2433`	`+ {`
	`2434`	`+ G_Error("G_ScriptAction_Accum: accum %s requires a random parameter <> 0\n", lastToken);`
	`2435`	`+ }`
	`2436`	`+`
	`2437`	`+ ent->scriptAccumBuffer[bufferIndex] = rand() % randomValue;`
`2428`	`2438`	`}`
`2429`	`2439`	`else if (!Q_stricmp(lastToken, "trigger_if_equal"))`
`2430`	`2440`	`{`
`@@ -2689,11 +2699,21 @@ qboolean G_ScriptAction_GlobalAccum(gentity_t ent, char params)`
`2689`	`2699`	`}`
`2690`	`2700`	`else if (!Q_stricmp(lastToken, "random"))`
`2691`	`2701`	`{`
	`2702`	`+ int randomValue;`
	`2703`	`+`
`2692`	`2704`	`if (!token[0])`
`2693`	`2705`	`{`
`2694`	`2706`	`G_Error("G_ScriptAction_GlobalAccum: globalaccum %s requires a parameter\n", lastToken);`
`2695`	`2707`	`}`
`2696`		`- level.globalAccumBuffer[bufferIndex] = rand() % atoi(token);`
	`2708`	`+`
	`2709`	`+ randomValue = atoi(token);`
	`2710`	`+`
	`2711`	`+ if (randomValue == 0)`
	`2712`	`+ {`
	`2713`	`+ G_Error("G_ScriptAction_GlobalAccum: globalaccum %s requires a random parameter <> 0\n", lastToken);`
	`2714`	`+ }`
	`2715`	`+`
	`2716`	`+ level.globalAccumBuffer[bufferIndex] = rand() % randomValue;`
`2697`	`2717`	`}`
`2698`	`2718`	`else if (!Q_stricmp(lastToken, "trigger_if_equal"))`
`2699`	`2719`	`{`