1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

- bug fix: secrets on strategic map and other externalized stuff were not properly initialized, if user loads a saved game before he creates a new game.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@635 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Lesh
2006-11-18 19:16:58 +00:00
parent 0e8afa6c7a
commit ff814b7fc7
4 changed files with 72 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/XML_Army.cpp
+6 -6
View File
@@ -11,8 +11,8 @@
extern GARRISON_GROUP gOrigGarrisonGroup[ MAX_GARRISON_GROUPS ];
extern PATROL_GROUP gOrigPatrolGroup[ MAX_PATROL_GROUPS ];
extern ARMY_COMPOSITION gOrigArmyComp[ MAX_ARMY_COMPOSITIONS ];
extern INT32 giGarrisonArraySize;
extern INT32 giPatrolArraySize;
extern INT32 iOrigGarrisonArraySize;
extern INT32 iOrigPatrolArraySize;
// Garrison externalization
@@ -101,7 +101,7 @@ garrisonEndElementHandle(void *userData, const char *name)
if(strcmp(name, "GARRISON_INFO") == 0 && pData->curElement == GARRISON_ELEMENT_GARRISON_INFO)
{
pData->curElement = GARRISON_ELEMENT_NONE;
giGarrisonArraySize = pData->uiGarrisonCount;
iOrigGarrisonArraySize = pData->uiGarrisonCount;
}
else if(strcmp(name, "GARRISON") == 0 && pData->curElement == GARRISON_ELEMENT_GARRISON)
{
@@ -179,7 +179,7 @@ BOOLEAN ReadInGarrisonInfo(STR fileName)
memset(&pData,0,sizeof(pData));
XML_SetUserData(parser, &pData);
giGarrisonArraySize = 0;
iOrigGarrisonArraySize = 0;
if(!XML_Parse(parser, lpcBuffer, uiFSize, TRUE))
{
@@ -351,7 +351,7 @@ patrolEndElementHandle(void *userData, const char *name)
if(strcmp(name, "PATROL_INFO") == 0 && pData->curElement == PATROL_ELEMENT_PATROL_INFO)
{
pData->curElement = PATROL_ELEMENT_NONE;
giPatrolArraySize = pData->uiPatrolCount;
iOrigPatrolArraySize = pData->uiPatrolCount;
}
else if(strcmp(name, "PATROL") == 0 && pData->curElement == PATROL_ELEMENT_PATROL)
{
@@ -523,7 +523,7 @@ BOOLEAN ReadInPatrolInfo(STR fileName)
memset(&pData,0,sizeof(pData));
XML_SetUserData(parser, &pData);
giPatrolArraySize = 0;
iOrigPatrolArraySize = 0;
if(!XML_Parse(parser, lpcBuffer, uiFSize, TRUE))
{