yquake2/rogue
0
0
Fork 0
mirror of https://github.com/yquake2/rogue.git synced 2024-11-29 15:32:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #78 from BjossiAlfreds/bad-triggered

Browse source 
Console warning and fix triggered monsters with no targetname
This commit is contained in:
Yamagi 2021-03-31 10:07:02 +02:00 committed by GitHub
commit 9fd0bab374
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/g_main.c
View file

@ -38,6 +38,7 @@ cvar_t *maxentities;
cvar_t *g_select_empty; cvar_t *g_select_empty;
cvar_t *dedicated; cvar_t *dedicated;
cvar_t *g_footsteps; cvar_t *g_footsteps;
cvar_t *g_fix_triggered;
cvar_t *filterban; cvar_t *filterban;

10
src/g_monster.c
View file

@ -872,6 +872,16 @@ monster_start(edict_t *self)
self->spawnflags |= 1; self->spawnflags |= 1;
} }
if ((self->spawnflags & 2) && !self->targetname)
{
if (g_fix_triggered->value)
{
self->spawnflags &= ~2;
}
gi.dprintf ("triggered %s at %s has no targetname\n", self->classname, vtos (self->s.origin));
}
if ((!(self->monsterinfo.aiflags & AI_GOOD_GUY)) && if ((!(self->monsterinfo.aiflags & AI_GOOD_GUY)) &&
(!(self->monsterinfo.aiflags & AI_DO_NOT_COUNT))) (!(self->monsterinfo.aiflags & AI_DO_NOT_COUNT)))
{ {

1
src/header/local.h
View file

@ -596,6 +596,7 @@ extern cvar_t *spectator_password;
extern cvar_t *g_select_empty; extern cvar_t *g_select_empty;
extern cvar_t *dedicated; extern cvar_t *dedicated;
extern cvar_t *g_footsteps; extern cvar_t *g_footsteps;
extern cvar_t *g_fix_triggered;
extern cvar_t *filterban; extern cvar_t *filterban;

1
src/savegame/savegame.c
View file

@ -220,6 +220,7 @@ InitGame(void)
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
g_footsteps = gi.cvar ("g_footsteps", "1", CVAR_LATCH); g_footsteps = gi.cvar ("g_footsteps", "1", CVAR_LATCH);
g_fix_triggered = gi.cvar ("g_fix_triggered", "0", 0);
/* change anytime vars */ /* change anytime vars */
dmflags = gi.cvar ("dmflags", "0", CVAR_SERVERINFO); dmflags = gi.cvar ("dmflags", "0", CVAR_SERVERINFO);