yquake2/rogue
0
0
Fork 0
mirror of https://github.com/yquake2/rogue.git synced 2024-11-10 06:42:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into pvs

Browse source
This commit is contained in:
BjossiAlfreds 2019-09-26 14:02:30 +00:00
commit 01c20df240
5 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_ai.c
View file

@ -1158,7 +1158,7 @@ ai_checkattack(edict_t *self, float dist)
qboolean hesDeadJim; qboolean hesDeadJim;
qboolean retval; qboolean retval;
if (!self || !self->enemy || !self->enemy->inuse) if (!self)
{ {
enemy_vis = false; enemy_vis = false;

1
src/g_main.c
View file

@ -22,6 +22,7 @@ edict_t *g_edicts;
cvar_t *deathmatch; cvar_t *deathmatch;
cvar_t *coop; cvar_t *coop;
cvar_t *coop_baseq2; /* treat spawnflags according to baseq2 rules */
cvar_t *dmflags; cvar_t *dmflags;
cvar_t *skill; cvar_t *skill;
cvar_t *fraglimit; cvar_t *fraglimit;

2
src/g_spawn.c
View file

@ -846,7 +846,7 @@ SpawnEntities(const char *mapname, char *entities, const char *spawnpoint)
continue; continue;
} }
} }
else if (coop->value) else if (coop->value && !coop_baseq2->value)
{ {
if (ent->spawnflags & SPAWNFLAG_NOT_COOP) if (ent->spawnflags & SPAWNFLAG_NOT_COOP)
{ {

1
src/header/local.h
View file

@ -576,6 +576,7 @@ extern edict_t *g_edicts;
extern cvar_t *maxentities; extern cvar_t *maxentities;
extern cvar_t *deathmatch; extern cvar_t *deathmatch;
extern cvar_t *coop; extern cvar_t *coop;
extern cvar_t *coop_baseq2; /* treat spawnflags according to baseq2 rules */
extern cvar_t *dmflags; extern cvar_t *dmflags;
extern cvar_t *skill; extern cvar_t *skill;
extern cvar_t *fraglimit; extern cvar_t *fraglimit;

1
src/savegame/savegame.c
View file

@ -213,6 +213,7 @@ InitGame(void)
maxspectators = gi.cvar ("maxspectators", "4", CVAR_SERVERINFO); maxspectators = gi.cvar ("maxspectators", "4", CVAR_SERVERINFO);
deathmatch = gi.cvar ("deathmatch", "0", CVAR_LATCH); deathmatch = gi.cvar ("deathmatch", "0", CVAR_LATCH);
coop = gi.cvar ("coop", "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); skill = gi.cvar ("skill", "1", CVAR_LATCH);
maxentities = gi.cvar ("maxentities", "1024", CVAR_LATCH); maxentities = gi.cvar ("maxentities", "1024", CVAR_LATCH);
gamerules = gi.cvar ("gamerules", "0", CVAR_LATCH); //PGM gamerules = gi.cvar ("gamerules", "0", CVAR_LATCH); //PGM