From f1321b5e49dd6cf1eba9a90d1858af4d75579a68 Mon Sep 17 00:00:00 2001 From: Per Inge Mathisen Date: Sat, 21 May 2011 22:44:27 +0200 Subject: [PATCH] Load mission droid pointers, fixes bug present in ticket:2731 --- src/game.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/game.cpp b/src/game.cpp index 6e738005a2c..295779f128c 100644 --- 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++)