immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix RestoreState for subclass instance vars

dev-new-models
melex750 2016-08-03 17:52:53 -04:00
parent 48666c4604
commit 397e312424
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/CBot/CBotStack.cpp
View File

@ -19,6 +19,8 @@
#include "CBot/CBotStack.h" #include "CBot/CBotStack.h"
#include "CBot/CBotClass.h"
#include "CBot/CBotInstr/CBotFunction.h" #include "CBot/CBotInstr/CBotFunction.h"
#include "CBot/CBotVar/CBotVarPointer.h" #include "CBot/CBotVar/CBotVarPointer.h"
@ -866,10 +868,11 @@ bool CBotVar::RestoreState(FILE* pf, CBotVar* &pVar)
if (isClass && p == nullptr) // set id for each item in this instance if (isClass && p == nullptr) // set id for each item in this instance
{ {
CBotVar* pVars = pNew->GetItemList(); CBotVar* pVars = pNew->GetItemList();
long itemId = 1; CBotVar* pv = pNew->GetClass()->GetVar();
while (pVars != nullptr) while (pVars != nullptr && pv != nullptr)
{ {
pVars->m_ident = itemId++; pVars->m_ident = pv->m_ident;
pv = pv->GetNext();
pVars = pVars->GetNext(); pVars = pVars->GetNext();
} }
} }