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 pull request #30 from BjossiAlfreds/pathcorner

Browse source 
Fixed triggered spawn monsters not using path_corner markers
This commit is contained in:
Yamagi 2019-09-23 14:07:47 +02:00 committed by GitHub
commit f3dd878809
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/g_monster.c
View file

@ -1059,12 +1059,14 @@ walkmonster_start_go(edict_t *self)
self->viewheight = 25;
}
monster_start_go(self);
if (self->spawnflags & 2)
{
monster_triggered_start(self);
}
else
{
monster_start_go(self);
}
}
void
@ -1102,12 +1104,14 @@ flymonster_start_go(edict_t *self)
self->viewheight = 25;
}
monster_start_go(self);
if (self->spawnflags & 2)
{
monster_triggered_start(self);
}
else
{
monster_start_go(self);
}
}
void
@ -1141,12 +1145,14 @@ swimmonster_start_go(edict_t *self)
self->viewheight = 10;
}
monster_start_go(self);
if (self->spawnflags & 2)
{
monster_triggered_start(self);
}
else
{
monster_start_go(self);
}
}
void
@ -1180,8 +1186,7 @@ stationarymonster_triggered_spawn(edict_t *self)
self->air_finished = level.time + 12;
gi.linkentity(self);
self->spawnflags &= ~2;
stationarymonster_start_go(self);
monster_start_go(self);
if (self->enemy && !(self->spawnflags & 1) &&
!(self->enemy->flags & FL_NOTARGET))
@ -1250,12 +1255,14 @@ stationarymonster_start_go(edict_t *self)
self->yaw_speed = 20;
}
monster_start_go(self);
if (self->spawnflags & 2)
{
stationarymonster_triggered_start(self);
}
else
{
monster_start_go(self);
}
}
void