Merge pull request #376 from qw-ctf/spm-compat

tcsabina · web-flow · commit f8d7cb1564b6 · 2024-12-01T20:45:58.000+01:00
SPAWN: Better k_spm_custom_model compatibility.
diff --git a/src/items.c b/src/items.c
@@ -2875,13 +2875,9 @@ char *Spawn_GetModel(void)
 	if (!spawn_model[0])
 	{
 		char *mdl = cvar_string("k_spm_custom_model");
-		if (!strcmp(mdl, "0") || strlen(mdl) == 0)
+		if (only_digits(mdl))
 		{
-			strlcpy(spawn_model, "progs/w_g_key.mdl", sizeof(spawn_model));
-		}
-		else if (!strcmp(mdl, "1"))
-		{
-			strlcpy(spawn_model, "progs/wizard.mdl", sizeof(spawn_model));
+			strlcpy(spawn_model, atoi(mdl) ? "progs/wizard.mdl" : "progs/w_g_key.mdl", sizeof(spawn_model));
 		}
 		else
 		{

Original file line number	Diff line number	Diff line change
`@@ -2875,13 +2875,9 @@ char *Spawn_GetModel(void)`
`2875`	`2875`	`if (!spawn_model[0])`
`2876`	`2876`	`{`
`2877`	`2877`	`char *mdl = cvar_string("k_spm_custom_model");`
`2878`		`- if (!strcmp(mdl, "0") \|\| strlen(mdl) == 0)`
	`2878`	`+ if (only_digits(mdl))`
`2879`	`2879`	`{`
`2880`		`- strlcpy(spawn_model, "progs/w_g_key.mdl", sizeof(spawn_model));`
`2881`		`- }`
`2882`		`- else if (!strcmp(mdl, "1"))`
`2883`		`- {`
`2884`		`- strlcpy(spawn_model, "progs/wizard.mdl", sizeof(spawn_model));`
	`2880`	`+ strlcpy(spawn_model, atoi(mdl) ? "progs/wizard.mdl" : "progs/w_g_key.mdl", sizeof(spawn_model));`
`2885`	`2881`	`}`
`2886`	`2882`	`else`
`2887`	`2883`	`{`