Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Keep default secondary order from droid initialization if no replacement order found in savegame. Should fix ticket:3359

master
Per Inge Mathisen 2012-04-11 20:09:59 +02:00
parent a00bab1a65
commit be375355ed
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game.cpp
View File

@ -4231,7 +4231,7 @@ static bool loadSaveDroid(const char *pFileName, DROID **ppsCurrentDroidLists)
psDroid->burnStart = ini.value("burnStart", 0).toInt(); psDroid->burnStart = ini.value("burnStart", 0).toInt();
psDroid->experience = ini.value("experience", 0).toInt(); psDroid->experience = ini.value("experience", 0).toInt();
psDroid->timeLastHit = ini.value("timeLastHit", UDWORD_MAX).toInt(); psDroid->timeLastHit = ini.value("timeLastHit", UDWORD_MAX).toInt();
psDroid->secondaryOrder = ini.value("secondaryOrder", DSS_NONE).toInt(); psDroid->secondaryOrder = ini.value("secondaryOrder", psDroid->secondaryOrder).toInt();
psDroid->secondaryOrderPending = psDroid->secondaryOrder; psDroid->secondaryOrderPending = psDroid->secondaryOrder;
psDroid->action = (DROID_ACTION)ini.value("action", DACTION_NONE).toInt(); psDroid->action = (DROID_ACTION)ini.value("action", DACTION_NONE).toInt();
psDroid->actionPos = ini.vector2i("action/pos"); psDroid->actionPos = ini.vector2i("action/pos");