Merge pull request #648 from jengelh/lv12

d3: fix game crash in Retribution level 12's big matcen room
DescentDevelopers · Nov 25, 2024 · f7efa4b · f7efa4b
2 parents 238aead + 0b7989b
commit f7efa4b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/Descent3/BOA.cpp b/Descent3/BOA.cpp
@@ -329,6 +329,8 @@ int BOA_DetermineStartRoomPortal(int start_room, vector *start_pos, int end_room
                                  bool f_making_robot_path_invalid_list, int *blocked_portal) {
   int i;
 
+  if (start_room == -1 || end_room == -1)
+    return -1;
   if (start_room > Highest_room_index && end_room > Highest_room_index)
     return -1;
 
@@ -566,12 +568,12 @@ int BOA_GetNextRoom(int start_room, int end_room) {
   int e_index = end_room;
 
   if (start_room == -1 || end_room == -1) {
-    return false;
+    return BOA_NO_PATH;
   }
 
   if ((!ROOMNUM_OUTSIDE(s_index)) && s_index <= Highest_room_index) {
     if (!Rooms[s_index].used) {
-      return false;
+      return BOA_NO_PATH;
     }
   } else if (ROOMNUM_OUTSIDE(s_index)) {
     s_index = TERRAIN_REGION(start_room) + Highest_room_index + 1;
@@ -581,7 +583,7 @@ int BOA_GetNextRoom(int start_room, int end_room) {
 
   if ((!ROOMNUM_OUTSIDE(e_index)) && e_index <= Highest_room_index) {
     if (!Rooms[e_index].used) {
-      return false;
+      return BOA_NO_PATH;
     }
   } else if (ROOMNUM_OUTSIDE(e_index)) {
     e_index = TERRAIN_REGION(end_room) + Highest_room_index + 1;

diff --git a/Descent3/aipath.cpp b/Descent3/aipath.cpp
@@ -60,6 +60,8 @@ static void AIUpdatePathInfo(q_item **node_list, int start, int end) {
 
 // Ok to use Highest_room_index offset stuff
 bool AIFindAltPath(object *obj, int i, int j, float *dist) {
+  if (i == -1 || j == -1)
+    return false;
   i = BOA_INDEX(i);
   j = BOA_INDEX(j);
 

diff --git a/Descent3/bnode.cpp b/Descent3/bnode.cpp
@@ -210,6 +210,8 @@ static void BNode_UpdatePathInfo(pq_item **node_list, int start, int end) {
 
 // Ok to use Highest_room_index offset stuff
 bool BNode_FindPath(int start_room, int i, int j, float rad) {
+  if (start_room == -1)
+    return false;
   bpq PQPath;
   int counter;
   pq_item *start_node = new pq_item(i, -1, 0.0f);
@@ -311,6 +313,8 @@ int BNode_FindDirLocalVisibleBNode(int roomnum, vector *pos, vector *fvec, float
   }
 
   bn_list *bnlist = BNode_GetBNListPtr(roomnum);
+  if (bnlist == nullptr)
+    return -1;
 
 retry:
 
@@ -402,6 +406,7 @@ int BNode_FindClosestLocalVisibleBNode(int roomnum, vector *pos, float rad) {
   }
 
   bn_list *bnlist = BNode_GetBNListPtr(roomnum);
+  ASSERT(bnlist);
 
 retry: