From 9642eec016b5e9e5e8aeba3376e34f16a70ca0d7 Mon Sep 17 00:00:00 2001 From: BjossiAlfreds Date: Mon, 23 Sep 2019 16:41:29 +0000 Subject: [PATCH] coop_baseq2 added and fully functional --- src/g_main.c | 1 + src/g_spawn.c | 2 +- src/header/local.h | 1 + src/savegame/savegame.c | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/g_main.c b/src/g_main.c index 6c51ddb..dedf549 100644 --- a/src/g_main.c +++ b/src/g_main.c @@ -22,6 +22,7 @@ edict_t *g_edicts; cvar_t *deathmatch; cvar_t *coop; +cvar_t *coop_baseq2; /* treat spawnflags according to baseq2 rules */ cvar_t *dmflags; cvar_t *skill; cvar_t *fraglimit; diff --git a/src/g_spawn.c b/src/g_spawn.c index a16e2ab..94593c6 100644 --- a/src/g_spawn.c +++ b/src/g_spawn.c @@ -846,7 +846,7 @@ SpawnEntities(const char *mapname, char *entities, const char *spawnpoint) continue; } } - else if (coop->value) + else if (coop->value && !coop_baseq2->value) { if (ent->spawnflags & SPAWNFLAG_NOT_COOP) { diff --git a/src/header/local.h b/src/header/local.h index 3d6a3b2..984755e 100644 --- a/src/header/local.h +++ b/src/header/local.h @@ -576,6 +576,7 @@ extern edict_t *g_edicts; extern cvar_t *maxentities; extern cvar_t *deathmatch; extern cvar_t *coop; +extern cvar_t *coop_baseq2; /* treat spawnflags according to baseq2 rules */ extern cvar_t *dmflags; extern cvar_t *skill; extern cvar_t *fraglimit; diff --git a/src/savegame/savegame.c b/src/savegame/savegame.c index f8151d9..7ce8d0a 100644 --- a/src/savegame/savegame.c +++ b/src/savegame/savegame.c @@ -213,6 +213,7 @@ InitGame(void) maxspectators = gi.cvar ("maxspectators", "4", CVAR_SERVERINFO); deathmatch = gi.cvar ("deathmatch", "0", CVAR_LATCH); coop = gi.cvar ("coop", "0", CVAR_LATCH); + coop_baseq2 = gi.cvar ("coop_baseq2", "0", CVAR_LATCH); skill = gi.cvar ("skill", "1", CVAR_LATCH); maxentities = gi.cvar ("maxentities", "1024", CVAR_LATCH); gamerules = gi.cvar ("gamerules", "0", CVAR_LATCH); //PGM