1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-12 14:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: replaced (UINT32) atol(pData->szCharData) with (UINT32) strtoul(pData->szCharData, NULL, 0) as atol renders the last flag unusable through casts

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5854 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-02-07 22:25:53 +00:00
parent e2c1a333fa
commit f6274eade2
26 changed files with 159 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/XML_Merchants.cpp
+10 -10
View File
@@ -160,27 +160,27 @@ merchantEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "uiFlags") == 0)
{
pData->curElement = ELEMENT;
pData->curMerchant.uiFlags = (UINT32) atol(pData->szCharData);
pData->curMerchant.uiFlags = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "dailyIncrement") == 0)
{
pData->curElement = ELEMENT;
pData->curMerchant.dailyIncrement = (UINT32) atol(pData->szCharData);
pData->curMerchant.dailyIncrement = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "dailyMaximum") == 0)
{
pData->curElement = ELEMENT;
pData->curMerchant.dailyMaximum = (UINT32) atol(pData->szCharData);
pData->curMerchant.dailyMaximum = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "dailyRetained") == 0)
{
pData->curElement = ELEMENT;
pData->curMerchant.dailyRetained = (UINT32) atol(pData->szCharData);
pData->curMerchant.dailyRetained = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "minCoolness") == 0)
{
pData->curElement = ELEMENT;
pData->curMerchant.minCoolness = (UINT32) atol(pData->szCharData);
pData->curMerchant.minCoolness = (UINT32) strtoul(pData->szCharData, NULL, 0);
// fit for reasonable values
pData->curMerchant.minCoolness = min(10, max(1, pData->curMerchant.minCoolness) );
@@ -188,7 +188,7 @@ merchantEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "maxCoolness") == 0)
{
pData->curElement = ELEMENT;
pData->curMerchant.maxCoolness = (UINT32) atol(pData->szCharData);
pData->curMerchant.maxCoolness = (UINT32) strtoul(pData->szCharData, NULL, 0);
// fit for reasonable values
pData->curMerchant.maxCoolness = min(10, max(1, pData->curMerchant.maxCoolness) );
@@ -196,22 +196,22 @@ merchantEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "addToCoolness") == 0)
{
pData->curElement = ELEMENT;
pData->curMerchant.addToCoolness = (UINT32) atol(pData->szCharData);
pData->curMerchant.addToCoolness = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "coolnessProgressRate") == 0)
{
pData->curElement = ELEMENT;
pData->curMerchant.coolnessProgressRate = (UINT32) atol(pData->szCharData);
pData->curMerchant.coolnessProgressRate = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "daysDelayMin") == 0)
{
pData->curElement = ELEMENT;
pData->curMerchant.daysDelayMin = (UINT32) atol(pData->szCharData);
pData->curMerchant.daysDelayMin = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "daysDelayMax") == 0)
{
pData->curElement = ELEMENT;
pData->curMerchant.daysDelayMax = (UINT32) atol(pData->szCharData);
pData->curMerchant.daysDelayMax = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "useBRSetting") == 0)
{