mirror of
https://github.com/yquake2/rogue.git
synced 2024-11-25 21:51:22 +00:00
Merge pull request #78 from BjossiAlfreds/bad-triggered
Console warning and fix triggered monsters with no targetname
This commit is contained in:
commit
9fd0bab374
4 changed files with 13 additions and 0 deletions
|
@ -38,6 +38,7 @@ cvar_t *maxentities;
|
|||
cvar_t *g_select_empty;
|
||||
cvar_t *dedicated;
|
||||
cvar_t *g_footsteps;
|
||||
cvar_t *g_fix_triggered;
|
||||
|
||||
cvar_t *filterban;
|
||||
|
||||
|
|
|
@ -872,6 +872,16 @@ monster_start(edict_t *self)
|
|||
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)) &&
|
||||
(!(self->monsterinfo.aiflags & AI_DO_NOT_COUNT)))
|
||||
{
|
||||
|
|
|
@ -596,6 +596,7 @@ extern cvar_t *spectator_password;
|
|||
extern cvar_t *g_select_empty;
|
||||
extern cvar_t *dedicated;
|
||||
extern cvar_t *g_footsteps;
|
||||
extern cvar_t *g_fix_triggered;
|
||||
|
||||
extern cvar_t *filterban;
|
||||
|
||||
|
|
|
@ -220,6 +220,7 @@ InitGame(void)
|
|||
maxentities = gi.cvar ("maxentities", "1024", CVAR_LATCH);
|
||||
gamerules = gi.cvar ("gamerules", "0", CVAR_LATCH); //PGM
|
||||
g_footsteps = gi.cvar ("g_footsteps", "1", CVAR_LATCH);
|
||||
g_fix_triggered = gi.cvar ("g_fix_triggered", "0", 0);
|
||||
|
||||
/* change anytime vars */
|
||||
dmflags = gi.cvar ("dmflags", "0", CVAR_SERVERINFO);
|
||||
|
|
Loading…
Reference in a new issue