Mercurial > mm7

changeset 2263:3d644efae786

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
some more items.cpp init bugfixing
author Grumpy7
date Sat, 08 Mar 2014 17:53:38 +0100
parents 037ad3678c0f
children 6532bbac1a9e b13ab8114e5d
files Items.cpp
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Items.cpp	Sat Mar 08 17:29:36 2014 +0100
+++ b/Items.cpp	Sat Mar 08 17:53:38 2014 +0100
@@ -495,7 +495,7 @@
     auto findResult = equipStatMap.find(tokens[4]);
     pItems[item_counter].uEquipType = findResult == equipStatMap.end() ? EQUIP_NONE : findResult->second;
     auto findResult2 = equipSkillMap.find(tokens[5]);
-    pItems[item_counter].uSkillType = findResult2 == equipSkillMap.end() ? PLAYER_SKILL_MISC : findResult->second;
+    pItems[item_counter].uSkillType = findResult2 == equipSkillMap.end() ? PLAYER_SKILL_MISC : findResult2->second;
     auto tokens2 = Tokenize(tokens[6], 'd');
     if (tokens2.size() == 2)
     {
@@ -514,7 +514,7 @@
     }
     pItems[item_counter].uDamageMod=atoi(tokens[7]);
     auto findResult3 = materialMap.find(tokens[8]);
-    pItems[item_counter].uSkillType = findResult3 == materialMap.end() ? MATERIAL_COMMON : findResult->second;
+    pItems[item_counter].uMaterial = findResult3 == materialMap.end() ? MATERIAL_COMMON : findResult->second;
     pItems[item_counter].uItemID_Rep_St=atoi(tokens[9]);
     pItems[item_counter].pUnidentifiedName = RemoveQuotes(tokens[10]);
     pItems[item_counter].uSpriteID=atoi(tokens[11]);