Load mission droid pointers, fixes bug present in ticket:2731

Warzone2100 · May 21, 2011 · f1321b5 · f1321b5
1 parent 10f6740
commit f1321b5
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/game.cpp b/src/game.cpp
@@ -4353,6 +4353,10 @@ static bool loadSaveDroidPointers(const QString &pFileName, DROID **ppsCurrentDr
 		int id = ini.value("id").toInt();
 
 		for (psDroid = ppsCurrentDroidLists[player]; psDroid && psDroid->id != id; psDroid = psDroid->psNext) {}
+		if (!psDroid)
+		{
+			for (psDroid = mission.apsDroidLists[player]; psDroid && psDroid->id != id; psDroid = psDroid->psNext) {}
+		}
 		ASSERT_OR_RETURN(false, psDroid, "Droid %d not found", id);
 
 		for (int j = 0; j < DROID_MAXWEAPS; j++)