From 92e193b7568b7441ae3bbbdc190157e5a422c651 Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Fri, 15 Jan 2021 02:39:20 +0100
Subject: [PATCH] [hellfire] MAI_Rhino

---
 Source/monster.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Source/monster.cpp b/Source/monster.cpp
index fc415da7d..d83b8e8e4 100644
--- a/Source/monster.cpp
+++ b/Source/monster.cpp
@@ -4820,7 +4820,7 @@ void MAI_SkelKing(int i)
 #ifdef HELLFIRE
 		return;
 #else
-		app_fatal("MAI_SkelKing: Invalid monster %d",i);
+		app_fatal("MAI_SkelKing: Invalid monster %d", i);
 #endif
 	Monst = &monster[i];
 	if (Monst->_mmode == MM_STAND && Monst->_msquelch != 0) {
@@ -4889,7 +4889,11 @@ void MAI_Rhino(int i)
 	int v, dist, md;
 
 	if ((DWORD)i >= MAXMONSTERS)
+#ifdef HELLFIRE
+		return;
+#else
 		app_fatal("MAI_Rhino: Invalid monster %d", i);
+#endif
 	Monst = &monster[i];
 	if (Monst->_mmode == MM_STAND && Monst->_msquelch != 0) {
 		fx = Monst->_menemyx;
@@ -4927,8 +4931,8 @@ void MAI_Rhino(int i)
 				if (AddMissile(Monst->_mx, Monst->_my, fx, fy, md, MIS_RHINO, Monst->_menemy, i, 0, 0) != -1) {
 					if (Monst->MData->snd_special)
 						PlayEffect(i, 3);
-					Monst->_mmode = MM_CHARGE;
 					dMonster[Monst->_mx][Monst->_my] = -1 - i;
+					Monst->_mmode = MM_CHARGE;
 				}
 			} else {
 				if (abs(mx) >= 2 || abs(my) >= 2) {