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

Try to continue loading if we detected a bad ID. 

fixes ticket:2100

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11500 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit bef4eb0f8d5312961ac6b110ece6552fe1098e51)
master
Buginator 2010-08-21 00:24:36 +00:00 committed by buginator
parent bc24cd6a22
commit dd87aaf864
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/game.c
View File

@ -8233,16 +8233,16 @@ BOOL loadStructSetPointers(void)
}
else
{
if (list == 1) //ie offWorld
{
//don't need to worry about the Flag
((FACTORY *)psStruct->pFunctionality)->psCommander =
psCommander;
}
else
{
assignFactoryCommandDroid(psStruct, psCommander);
}
if (list == 1) //ie offWorld
{
//don't need to worry about the Flag
((FACTORY *)psStruct->pFunctionality)->psCommander =
psCommander;
}
else
{
assignFactoryCommandDroid(psStruct, psCommander);
}
}
}
else
@ -8260,6 +8260,11 @@ BOOL loadStructSetPointers(void)
else
{
psRepair->psObj = getBaseObjFromId(_tmpid);
if (!psRepair->psObj)
{
ASSERT(psRepair->psObj, "Can't find object from ID %x", _tmpid);
break;
}
ASSERT(psRepair->psObj->type == OBJ_DROID, "%s cannot repair %s",
objInfo((BASE_OBJECT *)psStruct), objInfo(psRepair->psObj));
//if the build has started set the powerAccrued =