1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00: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
Utils/XML_Items.cpp
+7 -7
View File
@@ -541,7 +541,7 @@ itemEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "usItemClass") == 0)
{
pData->curElement = ELEMENT;
pData->curItem.usItemClass = (UINT32) atol(pData->szCharData);
pData->curItem.usItemClass = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "nasAttachmentClass") == 0)
{
@@ -1318,7 +1318,7 @@ itemEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "AttachmentClass") == 0)
{
pData->curElement = ELEMENT;
pData->curItem.attachmentclass = (UINT32) atol(pData->szCharData);
pData->curItem.attachmentclass = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "TripWireActivation") == 0)
{
@@ -1338,7 +1338,7 @@ itemEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "DrugType") == 0)
{
pData->curElement = ELEMENT;
pData->curItem.drugtype = (UINT32) atol(pData->szCharData);
pData->curItem.drugtype = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "BlockIronSight") == 0)
{
@@ -1353,12 +1353,12 @@ itemEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "ItemFlag") == 0)
{
pData->curElement = ELEMENT;
pData->curItem.usItemFlag = (UINT32) atol(pData->szCharData);
pData->curItem.usItemFlag = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "FoodType") == 0)
{
pData->curElement = ELEMENT;
pData->curItem.foodtype = (UINT32) atol(pData->szCharData);
pData->curItem.foodtype = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
//JMich_SkillsModifiers: Parse new values
else if(strcmp(name, "LockPickModifier") == 0)
@@ -1394,12 +1394,12 @@ itemEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "usActionItemFlag") == 0)
{
pData->curElement = ELEMENT;
pData->curItem.usActionItemFlag = (UINT32) atol(pData->szCharData);
pData->curItem.usActionItemFlag = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "clothestype") == 0)
{
pData->curElement = ELEMENT;
pData->curItem.clothestype = (UINT32) atol(pData->szCharData);
pData->curItem.clothestype = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "randomitem") == 0)
{