Fix: usBackGround is now UINT16 (was UINT8) to accommodate more than 255 backgrounds.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6513 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-10-19 20:45:05 +00:00
parent ac0e14beca
commit a71f8745ab
12 changed files with 64 additions and 63 deletions
+1 -1
View File
@@ -1513,7 +1513,7 @@ void MERCPROFILESTRUCT::initialize()
clearInventory();
// SANDRO - added this
memset( &records, 0, sizeof(STRUCT_Records) );
memset( &usBackground, 0, sizeof(UINT8) );
memset( &usBackground, 0, sizeof(UINT16) );
}
// Initialize the soldier.
+1 -1
View File
@@ -418,7 +418,7 @@ typedef struct
INT8 bTownAttachment;
// Flugente: backgrounds
UINT8 usBackground;
UINT16 usBackground;
} TEMPPROFILETYPE;
+1 -1
View File
@@ -1085,7 +1085,7 @@ profileEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "usBackground") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.usBackground = (UINT8) atol(pData->szCharData);
pData->curProfile.usBackground = (UINT16) atol(pData->szCharData);
}
+1 -1
View File
@@ -936,7 +936,7 @@ public:
STRUCT_Records records;
// Flugente: background
UINT8 usBackground;
UINT16 usBackground;
}; // MERCPROFILESTRUCT;