Merged revision(s) 6826-6828 from branches/ja2_source_official_2014:

- Minor code improvements and cleanup
- Fix from r6775 is no longer necessary.
- Code improvement: Instead of calling inv.size() repeatedly, just call it once and remember that value

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6829 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-01-26 12:18:43 +00:00
parent d4aa35a66e
commit d6186aca15
34 changed files with 677 additions and 643 deletions
+4 -2
View File
@@ -211,14 +211,16 @@ MercStartingGearEndElementHandle(void *userData, const XML_Char *name)
pData->curMercStartingGear.PriceModifier = 0;
pData->curMercStartingGear.AbsolutePrice = -1;
pData->curMercStartingGear.mGearKitName[0] = '\0';
for(unsigned int i = 0; i < pData->curMercStartingGear.inv.size(); i++)
UINT32 invsize = pData->curMercStartingGear.inv.size();
for(UINT32 i = 0; i < invsize; ++i)
{
pData->curMercStartingGear.inv[i] = 0;
pData->curMercStartingGear.iStatus[i] = 0;
pData->curMercStartingGear.iDrop[i] = 0;
pData->curMercStartingGear.iNumber[i] = 0;
}
for(unsigned int i = 0; i < pData->curMercStartingGear.lbe.size(); i++)
UINT32 lbesize = pData->curMercStartingGear.lbe.size();
for(UINT32 i = 0; i < lbesize; ++i)
{
pData->curMercStartingGear.lbe[i] = 0;
pData->curMercStartingGear.lStatus[i] = 0;