port: fix #541

fgsfdsfgs · Nov 29, 2024 · 67675d8 · 67675d8
1 parent 9c4aded
commit 67675d8
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/game/chraicommands.c b/src/game/chraicommands.c
@@ -2114,14 +2114,18 @@ bool aiIfGunUnclaimed(void)
 			g_Vars.aioffset += 5;
 		}
 	} else {
-		struct weaponobj *weapon = g_Vars.chrdata->gunprop->weapon;
-
-		if (weapon && weapon->base.prop) {
-			weapon->base.flags |= OBJFLAG_FORCENOBOUNCE;
-			g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]);
-		} else {
-			g_Vars.aioffset += 5;
+		struct prop *prop = g_Vars.chrdata->gunprop;
+
+		if (prop && prop->weapon && prop->parent == NULL && prop->type == PROPTYPE_WEAPON) {
+			struct weaponobj *weapon = prop->weapon;
+			if (weapon->base.prop) {
+				weapon->base.flags |= OBJFLAG_FORCENOBOUNCE;
+				g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]);
+				return false;
+			}
 		}
+
+		g_Vars.aioffset += 5;
 	}
 
 	return false;