From 63d87550788ee7dd5de349e4532997c952afc7e4 Mon Sep 17 00:00:00 2001
From: BjossiAlfreds <bjorna11@ru.is>
Date: Mon, 4 Nov 2019 17:18:29 +0000
Subject: [PATCH] Rogue jump code fixes

---
 src/g_newai.c                     | 4 ++--
 src/monster/berserker/berserker.c | 4 ++--
 src/monster/gunner/gunner.c       | 4 ++--
 src/monster/infantry/infantry.c   | 4 ++--
 src/monster/mutant/mutant.c       | 2 +-
 src/monster/parasite/parasite.c   | 2 +-
 src/monster/stalker/stalker.c     | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/g_newai.c b/src/g_newai.c
index e6887bf..e8a5595 100644
--- a/src/g_newai.c
+++ b/src/g_newai.c
@@ -268,7 +268,7 @@ blocked_checkjump(edict_t *self, float dist, float maxDown, float maxUp)
 		}
 
 		VectorCopy(pt1, pt2);
-		pt2[2] = self->mins[2] - maxDown - 1;
+		pt2[2] = self->absmin[2] - maxDown - 1;
 
 		trace = gi.trace(pt1, vec3_origin, vec3_origin, pt2, self,
 				MASK_MONSTERSOLID | MASK_WATER);
@@ -276,7 +276,7 @@ blocked_checkjump(edict_t *self, float dist, float maxDown, float maxUp)
 		if ((trace.fraction < 1) && !trace.allsolid && !trace.startsolid)
 		{
 			if (((self->absmin[2] - trace.endpos[2]) >=
-				 24) && trace.contents & MASK_SOLID)
+				 24) && (trace.contents & MASK_SOLID))
 			{
 				if ((self->enemy->absmin[2] - trace.endpos[2]) > 32)
 				{
diff --git a/src/monster/berserker/berserker.c b/src/monster/berserker/berserker.c
index 1df68fc..5cdd363 100644
--- a/src/monster/berserker/berserker.c
+++ b/src/monster/berserker/berserker.c
@@ -585,7 +585,7 @@ mframe_t berserk_frames_jump2[] = {
 	{ai_move, -8, NULL},
 	{ai_move, -4, NULL},
 	{ai_move, -4, NULL},
-	{ai_move, 0, berserk_jump_now},
+	{ai_move, 0, berserk_jump2_now},
 	{ai_move, 0, NULL},
 	{ai_move, 0, NULL},
 	{ai_move, 0, berserk_jump_wait_land},
@@ -610,7 +610,7 @@ berserk_jump(edict_t *self)
 
 	monster_done_dodge(self);
 
-	if (self->enemy->s.origin[2] > self->s.origin[2])
+	if (self->enemy->absmin[2] > self->absmin[2])
 	{
 		self->monsterinfo.currentmove = &berserk_move_jump2;
 	}
diff --git a/src/monster/gunner/gunner.c b/src/monster/gunner/gunner.c
index f4e865f..c023512 100644
--- a/src/monster/gunner/gunner.c
+++ b/src/monster/gunner/gunner.c
@@ -1052,7 +1052,7 @@ mframe_t gunner_frames_jump2[] = {
 	{ai_move, -8, NULL},
 	{ai_move, -4, NULL},
 	{ai_move, -4, NULL},
-	{ai_move, 0, gunner_jump_now},
+	{ai_move, 0, gunner_jump2_now},
 	{ai_move, 0, NULL},
 	{ai_move, 0, NULL},
 	{ai_move, 0, gunner_jump_wait_land},
@@ -1083,7 +1083,7 @@ gunner_jump(edict_t *self)
 
 	monster_done_dodge(self);
 
-	if (self->enemy->s.origin[2] > self->s.origin[2])
+	if (self->enemy->absmin[2] > self->absmin[2])
 	{
 		self->monsterinfo.currentmove = &gunner_move_jump2;
 	}
diff --git a/src/monster/infantry/infantry.c b/src/monster/infantry/infantry.c
index 790868c..b169250 100644
--- a/src/monster/infantry/infantry.c
+++ b/src/monster/infantry/infantry.c
@@ -772,7 +772,7 @@ mframe_t infantry_frames_jump2[] = {
 	{ai_move, -8, NULL},
 	{ai_move, -4, NULL},
 	{ai_move, -4, NULL},
-	{ai_move, 0, infantry_jump_now},
+	{ai_move, 0, infantry_jump2_now},
 	{ai_move, 0, NULL},
 	{ai_move, 0, NULL},
 	{ai_move, 0, NULL},
@@ -803,7 +803,7 @@ infantry_jump(edict_t *self)
 
 	monster_done_dodge(self);
 
-	if (self->enemy->s.origin[2] > self->s.origin[2])
+	if (self->enemy->absmin[2] > self->absmin[2])
 	{
 		self->monsterinfo.currentmove = &infantry_move_jump2;
 	}
diff --git a/src/monster/mutant/mutant.c b/src/monster/mutant/mutant.c
index f1836cc..7aafdf5 100644
--- a/src/monster/mutant/mutant.c
+++ b/src/monster/mutant/mutant.c
@@ -885,7 +885,7 @@ mutant_jump_updown(edict_t *self)
 		return;
 	}
 
-	if (self->enemy->s.origin[2] > self->s.origin[2])
+	if (self->enemy->absmin[2] > self->absmin[2])
 	{
 		self->monsterinfo.currentmove = &mutant_move_jump_up;
 	}
diff --git a/src/monster/parasite/parasite.c b/src/monster/parasite/parasite.c
index 553efd5..ffbdcf0 100644
--- a/src/monster/parasite/parasite.c
+++ b/src/monster/parasite/parasite.c
@@ -735,7 +735,7 @@ parasite_jump(edict_t *self)
 		return;
 	}
 
-	if (self->enemy->s.origin[2] > self->s.origin[2])
+	if (self->enemy->absmin[2] > self->absmin[2])
 	{
 		self->monsterinfo.currentmove = &parasite_move_jump_up;
 	}
diff --git a/src/monster/stalker/stalker.c b/src/monster/stalker/stalker.c
index 61dc27e..0084c7b 100644
--- a/src/monster/stalker/stalker.c
+++ b/src/monster/stalker/stalker.c
@@ -1269,7 +1269,7 @@ stalker_jump(edict_t *self)
 		return;
 	}
 
-	if (self->enemy->s.origin[2] >= self->s.origin[2])
+	if (self->enemy->absmin[2] >= self->absmin[2])
 	{
 		self->monsterinfo.currentmove = &stalker_move_jump_up;
 	}