1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +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_AmmoTypes.cpp
+2 -2
View File
@@ -132,7 +132,7 @@ ammotypeEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "uiIndex") == 0)
{
pData->curElement = ELEMENT;
pData->curAmmoType.uiIndex = (UINT32) atol(pData->szCharData);
pData->curAmmoType.uiIndex = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "fontColour") == 0)
{
@@ -302,7 +302,7 @@ ammotypeEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "ammoflag") == 0)
{
pData->curElement = ELEMENT;
pData->curAmmoType.ammoflag = (UINT32) atol(pData->szCharData);
pData->curAmmoType.ammoflag = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
pData->maxReadDepth--;
Tactical/XML_Armour.cpp
+1 -1
View File
@@ -102,7 +102,7 @@ armourEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "uiIndex") == 0)
{
pData->curElement = ELEMENT;
pData->curArmour.uiIndex = (UINT32) atol(pData->szCharData);
pData->curArmour.uiIndex = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "ubArmourClass") == 0)
{
Tactical/XML_AttachmentInfo.cpp
+2 -2
View File
@@ -101,7 +101,7 @@ attachmentinfoEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "uiIndex") == 0)
{
pData->curElement = ELEMENT;
pData->curAttachmentInfo.uiIndex = (UINT32) atol(pData->szCharData);
pData->curAttachmentInfo.uiIndex = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "usItem") == 0)
{
@@ -111,7 +111,7 @@ attachmentinfoEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "uiItemClass") == 0)
{
pData->curElement = ELEMENT;
pData->curAttachmentInfo.uiItemClass= (UINT32) atol(pData->szCharData);
pData->curAttachmentInfo.uiItemClass= (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bAttachmentSkillCheck") == 0)
{
Tactical/XML_AttachmentSlots.cpp
+1 -1
View File
@@ -113,7 +113,7 @@ attachmentslotEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "uiSlotIndex") == 0)
{
pData->curElement = ELEMENT;
pData->curAttachmentSlot.uiSlotIndex = (UINT32) atol(pData->szCharData);
pData->curAttachmentSlot.uiSlotIndex = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "szSlotName") == 0)
{
Tactical/XML_ComboMergeInfo.cpp
+1 -1
View File
@@ -101,7 +101,7 @@ attachmentcombomergeEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "uiIndex") == 0)
{
pData->curElement = ELEMENT;
pData->curAttachmentComboMerge.uiIndex = (UINT32) atol(pData->szCharData);
pData->curAttachmentComboMerge.uiIndex = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "usItem") == 0)
{
Tactical/XML_EnemyAmmoDrops.cpp
+2 -2
View File
@@ -101,12 +101,12 @@ ammoDropEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "uiIndex") == 0)
{
pData->curElement = ELEMENT;
pData->curAmmoDrop.uiIndex = (UINT32) atol(pData->szCharData);
pData->curAmmoDrop.uiIndex = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "uiType") == 0)
{
pData->curElement = ELEMENT;
pData->curAmmoDrop.uiType = (UINT32) atol(pData->szCharData);
pData->curAmmoDrop.uiType = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "ubEnemyDropRate") == 0)
{
Tactical/XML_EnemyArmourDrops.cpp
+1 -1
View File
@@ -101,7 +101,7 @@ armourDropEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "uiIndex") == 0)
{
pData->curElement = ELEMENT;
pData->curArmourDrop.uiIndex = (UINT32) atol(pData->szCharData);
pData->curArmourDrop.uiIndex = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "ubArmourClass") == 0)
{
Tactical/XML_EnemyExplosiveDrops.cpp
+1 -1
View File
@@ -101,7 +101,7 @@ explosiveDropEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "uiIndex") == 0)
{
pData->curElement = ELEMENT;
pData->curExplosiveDrop.uiIndex = (UINT32) atol(pData->szCharData);
pData->curExplosiveDrop.uiIndex = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "ubType") == 0)
{
Tactical/XML_EnemyItemChoice.cpp
+1 -1
View File
@@ -149,7 +149,7 @@ armyitemchoicesEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "uiIndex") == 0)
{
pData->curElement = ELEMENT;
pData->curArmyItemChoices.uiIndex = (UINT32) atol(pData->szCharData);
pData->curArmyItemChoices.uiIndex = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "ubChoices") == 0)
{
Tactical/XML_EnemyMiscDrops.cpp
+2 -2
View File
@@ -102,12 +102,12 @@ miscDropEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "uiIndex") == 0)
{
pData->curElement = ELEMENT;
pData->curMiscDrop.uiIndex = (UINT32) atol(pData->szCharData);
pData->curMiscDrop.uiIndex = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "usItemClass") == 0)
{
pData->curElement = ELEMENT;
pData->curMiscDrop.usItemClass = (UINT32) atol(pData->szCharData);
pData->curMiscDrop.usItemClass = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "ubEnemyDropRate") == 0)
{
Tactical/XML_EnemyWeaponChoice.cpp
+1 -1
View File
@@ -149,7 +149,7 @@ extendedarmygunchoicesEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "uiIndex") == 0)
{
pData->curElement = ELEMENT;
pData->curExtendedArmyGunChoices.uiIndex = (UINT32) atol(pData->szCharData);
pData->curExtendedArmyGunChoices.uiIndex = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "ubChoices") == 0)
{
Tactical/XML_EnemyWeaponDrops.cpp
+1 -1
View File
@@ -135,7 +135,7 @@ weaponDropEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "uiIndex") == 0)
{
pData->curElement = ELEMENT;
pData->curWeaponDrop.uiIndex = (UINT32) atol(pData->szCharData);
pData->curWeaponDrop.uiIndex = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "ubWeaponType") == 0)
{
Tactical/XML_Explosive.cpp
+1 -1
View File
@@ -115,7 +115,7 @@ explosiveEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "uiIndex") == 0)
{
pData->curElement = ELEMENT;
pData->curExplosive.uiIndex = (UINT32) atol(pData->szCharData);
pData->curExplosive.uiIndex = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "ubType") == 0)
{
Tactical/XML_IMPItemChoices.cpp
+1 -1
View File
@@ -149,7 +149,7 @@ IMPitemchoicesEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "uiIndex") == 0)
{
pData->curElement = ELEMENT;
pData->curIMPItemChoices.uiIndex = (UINT32) atol(pData->szCharData);
pData->curIMPItemChoices.uiIndex = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "ubChoices") == 0)
{
Tactical/XML_LBEPocket.cpp
+1 -1
View File
@@ -219,7 +219,7 @@ lbepocketParseData * pData = (lbepocketParseData *)userData;
else if(strcmp(name, "pRestriction") == 0)
{
pData->curElement = ELEMENT;
pData->curLBEPocket.pRestriction = (UINT32) atol(pData->szCharData);
pData->curLBEPocket.pRestriction = (UINT32) strtoul(pData->szCharData, NULL, 0);
} //DBrot: MOLLE added tag
else if(strcmp(name, "pVolume") == 0)
{
Tactical/XML_LoadBearingEquipment.cpp
+2 -2
View File
@@ -111,12 +111,12 @@ lbeEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "lbeClass") == 0)
{
pData->curElement = ELEMENT;
pData->curLBE.lbeClass = (UINT32) atol(pData->szCharData);
pData->curLBE.lbeClass = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "lbeCombo") == 0)
{
pData->curElement = ELEMENT;
pData->curLBE.lbeCombo = (UINT32) atol(pData->szCharData);
pData->curLBE.lbeCombo = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "lbeFilledSize") == 0)
{
Tactical/XML_Magazine.cpp
+1 -1
View File
@@ -101,7 +101,7 @@ magazineEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "uiIndex") == 0)
{
pData->curElement = ELEMENT;
pData->curMagazine.uiIndex = (UINT32) atol(pData->szCharData);
pData->curMagazine.uiIndex = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "ubCalibre") == 0)
{
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)
{
Tactical/XML_Opinions.cpp
+1 -1
View File
@@ -209,7 +209,7 @@ opinionEndElementHandle(void *userData, const XML_Char *name)
pData->curElement = ELEMENT;
// Sets new index for writing.
pData->curIndex = (UINT32) atol(pData->szCharData);
pData->curIndex = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "Opinion0") == 0)
Tactical/XML_Profiles.cpp
+97 -97
View File
@@ -367,55 +367,55 @@ profileEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "ubFaceIndex") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.ubFaceIndex = (UINT32) atol(pData->szCharData);
pData->curProfile.ubFaceIndex = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "usEyesX") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.usEyesX = (UINT32) atol(pData->szCharData);
pData->curProfile.usEyesX = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "usEyesY") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.usEyesY = (UINT32) atol(pData->szCharData);
pData->curProfile.usEyesY = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "usMouthX") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.usMouthX = (UINT32) atol(pData->szCharData);
pData->curProfile.usMouthX = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "usMouthY") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.usMouthY = (UINT32) atol(pData->szCharData);
pData->curProfile.usMouthY = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "uiEyeDelay") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.uiEyeDelay = (UINT32) atol(pData->szCharData);
pData->curProfile.uiEyeDelay = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "uiMouthDelay") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.uiMouthDelay = (UINT32) atol(pData->szCharData);
pData->curProfile.uiMouthDelay = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "uiBlinkFrequency") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.uiBlinkFrequency = (UINT32) atol(pData->szCharData);
pData->curProfile.uiBlinkFrequency = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "uiExpressionFrequency") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.uiExpressionFrequency = (UINT32) atol(pData->szCharData);
pData->curProfile.uiExpressionFrequency = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "PANTS") == 0)
@@ -445,490 +445,490 @@ profileEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "bSex") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bSex = (UINT32) atol(pData->szCharData);
pData->curProfile.bSex = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "ubBodyType") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.ubBodyType = (UINT32) atol(pData->szCharData);
pData->curProfile.ubBodyType = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "uiBodyTypeSubFlags") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.uiBodyTypeSubFlags = (UINT32) atol(pData->szCharData);
pData->curProfile.uiBodyTypeSubFlags = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bAttitude") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bAttitude = (UINT32) atol(pData->szCharData);
pData->curProfile.bAttitude = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
// SANDRO - added Character Trait
else if(strcmp(name, "bCharacterTrait") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bCharacterTrait = (UINT32) atol(pData->szCharData);
pData->curProfile.bCharacterTrait = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bDisability") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bDisability = (UINT32) atol(pData->szCharData);
pData->curProfile.bDisability = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "ubNeedForSleep") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.ubNeedForSleep = (UINT32) atol(pData->szCharData);
pData->curProfile.ubNeedForSleep = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bReputationTolerance") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bReputationTolerance = (UINT32) atol(pData->szCharData);
pData->curProfile.bReputationTolerance = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bDeathRate") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bDeathRate = (UINT32) atol(pData->szCharData);
pData->curProfile.bDeathRate = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bLifeMax") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bLifeMax = (UINT32) atol(pData->szCharData);
pData->curProfile.bLifeMax = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bLife") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bLife = (UINT32) atol(pData->szCharData);
pData->curProfile.bLife = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bStrength") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bStrength = (UINT32) atol(pData->szCharData);
pData->curProfile.bStrength = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bAgility") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bAgility = (UINT32) atol(pData->szCharData);
pData->curProfile.bAgility = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bDexterity") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bDexterity = (UINT32) atol(pData->szCharData);
pData->curProfile.bDexterity = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bWisdom") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bWisdom = (UINT32) atol(pData->szCharData);
pData->curProfile.bWisdom = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bMarksmanship") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bMarksmanship = (UINT32) atol(pData->szCharData);
pData->curProfile.bMarksmanship = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bExplosive") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bExplosive = (UINT32) atol(pData->szCharData);
pData->curProfile.bExplosive = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bLeadership") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bLeadership = (UINT32) atol(pData->szCharData);
pData->curProfile.bLeadership = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bMedical") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bMedical = (UINT32) atol(pData->szCharData);
pData->curProfile.bMedical = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bMechanical") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bMechanical = (UINT32) atol(pData->szCharData);
pData->curProfile.bMechanical = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bExpLevel") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bExpLevel = (UINT32) atol(pData->szCharData);
pData->curProfile.bExpLevel = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bEvolution") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bEvolution = (UINT32) atol(pData->szCharData);
pData->curProfile.bEvolution = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
////////////////////////////////////////////////////////////////////////////
// SANDRO was here - messed this a bit
else if(strcmp(name, "bOldSkillTrait") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bOldSkillTrait = (UINT32) atol(pData->szCharData);
pData->curProfile.bOldSkillTrait = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bOldSkillTrait2") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bOldSkillTrait2 = (UINT32) atol(pData->szCharData);
pData->curProfile.bOldSkillTrait2 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait1") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait1 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait1 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait2") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait2 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait2 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait3") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait3 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait3 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait4") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait4 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait4 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait5") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait5 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait5 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait6") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait6 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait6 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait7") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait7 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait7 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait8") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait8 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait8 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait9") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait9 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait9 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait10") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait10 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait10 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait11") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait11 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait11 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait12") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait12 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait12 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait13") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait13 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait13 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait14") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait14 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait14 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait15") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait15 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait15 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait16") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait16 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait16 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait17") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait17 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait17 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait18") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait18 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait18 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait19") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait19 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait19 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait20") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait20 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait20 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait21") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait21 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait21 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait22") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait22 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait22 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait23") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait23 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait23 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait24") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait24 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait24 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait25") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait25 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait25 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait26") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait26 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait26 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait27") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait27 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait27 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait28") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait28 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait28 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait29") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait29 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait29 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bNewSkillTrait30") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bNewSkillTrait30 = (UINT32) atol(pData->szCharData);
pData->curProfile.bNewSkillTrait30 = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
////////////////////////////////////////////////////////////////////////////
else if(strcmp(name, "bBuddy1") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bBuddy[0] = (UINT32) atol(pData->szCharData);
pData->curProfile.bBuddy[0] = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bBuddy2") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bBuddy[1] = (UINT32) atol(pData->szCharData);
pData->curProfile.bBuddy[1] = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bBuddy3") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bBuddy[2] = (UINT32) atol(pData->szCharData);
pData->curProfile.bBuddy[2] = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bBuddy4") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bBuddy[3] = (UINT32) atol(pData->szCharData);
pData->curProfile.bBuddy[3] = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bBuddy5") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bBuddy[4] = (UINT32) atol(pData->szCharData);
pData->curProfile.bBuddy[4] = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bLearnToLike") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bLearnToLike = (UINT32) atol(pData->szCharData);
pData->curProfile.bLearnToLike = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bLearnToLikeTime") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bLearnToLikeTime = (UINT32) atol(pData->szCharData);
pData->curProfile.bLearnToLikeTime = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bHated1") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bHated[0] = (UINT32) atol(pData->szCharData);
pData->curProfile.bHated[0] = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bHatedTime1") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bHatedTime[0] = (UINT32) atol(pData->szCharData);
pData->curProfile.bHatedTime[0] = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bHated2") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bHated[1] = (UINT32) atol(pData->szCharData);
pData->curProfile.bHated[1] = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bHatedTime2") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bHatedTime[1] = (UINT32) atol(pData->szCharData);
pData->curProfile.bHatedTime[1] = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bHated3") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bHated[2] = (UINT32) atol(pData->szCharData);
pData->curProfile.bHated[2] = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bHatedTime3") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bHatedTime[2] = (UINT32) atol(pData->szCharData);
pData->curProfile.bHatedTime[2] = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bHated4") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bHated[3] = (UINT32) atol(pData->szCharData);
pData->curProfile.bHated[3] = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bHatedTime4") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bHatedTime[3] = (UINT32) atol(pData->szCharData);
pData->curProfile.bHatedTime[3] = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bHated5") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bHated[4] = (UINT32) atol(pData->szCharData);
pData->curProfile.bHated[4] = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bHatedTime5") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bHatedTime[4] = (UINT32) atol(pData->szCharData);
pData->curProfile.bHatedTime[4] = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bLearnToHate") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bLearnToHate = (UINT32) atol(pData->szCharData);
pData->curProfile.bLearnToHate = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bLearnToHateTime") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bLearnToHateTime = (UINT32) atol(pData->szCharData);
pData->curProfile.bLearnToHateTime = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "sSalary") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.sSalary = (UINT32) atol(pData->szCharData);
pData->curProfile.sSalary = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "uiWeeklySalary") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.uiWeeklySalary = (UINT32) atol(pData->szCharData);
pData->curProfile.uiWeeklySalary = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "uiBiWeeklySalary") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.uiBiWeeklySalary = (UINT32) atol(pData->szCharData);
pData->curProfile.uiBiWeeklySalary = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bMedicalDeposit") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bMedicalDeposit = (UINT32) atol(pData->szCharData);
pData->curProfile.bMedicalDeposit = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "sMedicalDepositAmount") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.sMedicalDepositAmount = (UINT32) atol(pData->szCharData);
pData->curProfile.sMedicalDepositAmount = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "usOptionalGearCost") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.usOptionalGearCost = (UINT32) atol(pData->szCharData);
pData->curProfile.usOptionalGearCost = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bArmourAttractiveness") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bArmourAttractiveness = (UINT32) atol(pData->szCharData);
pData->curProfile.bArmourAttractiveness = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "bMainGunAttractiveness") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.bMainGunAttractiveness = (UINT32) atol(pData->szCharData);
pData->curProfile.bMainGunAttractiveness = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "fGoodGuy") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.fGoodGuy = (UINT32) atol(pData->szCharData);
pData->curProfile.fGoodGuy = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "usApproachFactorFriendly") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.usApproachFactor[0] = (UINT32) atol(pData->szCharData);
pData->curProfile.usApproachFactor[0] = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "usApproachFactorDirect") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.usApproachFactor[1] = (UINT32) atol(pData->szCharData);
pData->curProfile.usApproachFactor[1] = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "usApproachFactorThreaten") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.usApproachFactor[2] = (UINT32) atol(pData->szCharData);
pData->curProfile.usApproachFactor[2] = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "usApproachFactorRecruit") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.usApproachFactor[3] = (UINT32) atol(pData->szCharData);
pData->curProfile.usApproachFactor[3] = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "uiIndex") == 0)
@@ -937,13 +937,13 @@ profileEndElementHandle(void *userData, const XML_Char *name)
pData->curElement = ELEMENT;
// Sets new index for writing.
pData->curIndex = (UINT32) atol(pData->szCharData);
pData->curIndex = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "Type") == 0)
{
pData->curElement = ELEMENT;
pData->curProfile.Type = (UINT32) atol(pData->szCharData);
pData->curProfile.Type = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "sSectorX") == 0)
Tactical/XML_SectorLoadscreens.cpp
+1 -1
View File
@@ -107,7 +107,7 @@ sectorLoadscreensEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "uiIndex") == 0)
{
pData->curElement = ELEMENT;
pData->curSectorLoadscreens.uiIndex = (UINT32) atol(pData->szCharData);
pData->curSectorLoadscreens.uiIndex = (UINT32) strtoul(pData->szCharData, NULL, 0);
}
else if(strcmp(name, "szLocation") == 0)
{