From 29d0b6cbd567f5472f1945e9728389792caf1dca Mon Sep 17 00:00:00 2001
From: BjossiAlfreds <bjorna11@ru.is>
Date: Sat, 21 Sep 2019 19:48:03 +0000
Subject: [PATCH] Fixed triggered spawn monsters not using path_corner markers

---
 src/g_monster.c | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/g_monster.c b/src/g_monster.c
index 074fce0..badaec3 100644
--- a/src/g_monster.c
+++ b/src/g_monster.c
@@ -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