From 988d32eacb4a9a7cb2a84d5cd19b002312db5ad4 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 11 Feb 2014 02:25:18 -0700 Subject: [PATCH] If you use memset to 0 out std::strings for initialization, you're gonna have a bad time. --- .../src/shared/combat/ConfigCombatEngine.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/game/server/application/SwgGameServer/src/shared/combat/ConfigCombatEngine.cpp b/game/server/application/SwgGameServer/src/shared/combat/ConfigCombatEngine.cpp index 8b42da06..4fd1db3e 100644 --- a/game/server/application/SwgGameServer/src/shared/combat/ConfigCombatEngine.cpp +++ b/game/server/application/SwgGameServer/src/shared/combat/ConfigCombatEngine.cpp @@ -46,7 +46,7 @@ void ConfigCombatEngine::install(void) Iff file; ms_boneMap.insert(BoneMap::value_type(CrcLowerString("CSB_body"), static_cast(CSB_body))); - ms_boneMap.insert(BoneMap::value_type(CrcLowerString("CSB_head"), static_cast(CSB_head))); + ms_boneMap.insert(BoneMap::value_type(CrcLowerString("CSB_head"), static_cast(CSB_head))); ms_boneMap.insert(BoneMap::value_type(CrcLowerString("CSB_rightArm"), static_cast(CSB_rightArm))); ms_boneMap.insert(BoneMap::value_type(CrcLowerString("CSB_leftArm"), static_cast(CSB_leftArm))); ms_boneMap.insert(BoneMap::value_type(CrcLowerString("CSB_rightLeg"), static_cast(CSB_rightLeg))); @@ -96,11 +96,11 @@ void ConfigCombatEngine::parseVersion0(Iff & file) std::string paramName, tempString; ConfigCombatEngineData::BodyAttackMod bodyAttackMod; ConfigCombatEngine::SkeletonAttackMod skeletonAttackMod; - - //-- Initialize data structures. - memset(&bodyAttackMod, 0, sizeof(bodyAttackMod)); - memset(&skeletonAttackMod, 0, sizeof(skeletonAttackMod)); - +// +// //-- Initialize data structures. +// memset(&bodyAttackMod, 0, sizeof(bodyAttackMod)); +// memset(&skeletonAttackMod, 0, sizeof(skeletonAttackMod)); +// file.enterForm(); for (;;) @@ -212,7 +212,7 @@ ConfigCombatEngine::SkeletonAttackMod skeletonAttackMod; bodyLoc.damageBonus[Attributes::Mind] = static_cast(file.read_uint8()) / 100.0f; } file.exitChunk(); - } + } file.exitForm();