Mercurial > mm7

comparison Items.cpp @ 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 b13ab8114e5d
comparison
equal deleted inserted replaced
2262:037ad3678c0f 2263:3d644efae786
493 pItems[item_counter].pName = RemoveQuotes(tokens[2]); 493 pItems[item_counter].pName = RemoveQuotes(tokens[2]);
494 pItems[item_counter].uValue=atoi(tokens[3]); 494 pItems[item_counter].uValue=atoi(tokens[3]);
495 auto findResult = equipStatMap.find(tokens[4]); 495 auto findResult = equipStatMap.find(tokens[4]);
496 pItems[item_counter].uEquipType = findResult == equipStatMap.end() ? EQUIP_NONE : findResult->second; 496 pItems[item_counter].uEquipType = findResult == equipStatMap.end() ? EQUIP_NONE : findResult->second;
497 auto findResult2 = equipSkillMap.find(tokens[5]); 497 auto findResult2 = equipSkillMap.find(tokens[5]);
498 pItems[item_counter].uSkillType = findResult2 == equipSkillMap.end() ? PLAYER_SKILL_MISC : findResult->second; 498 pItems[item_counter].uSkillType = findResult2 == equipSkillMap.end() ? PLAYER_SKILL_MISC : findResult2->second;
499 auto tokens2 = Tokenize(tokens[6], 'd'); 499 auto tokens2 = Tokenize(tokens[6], 'd');
500 if (tokens2.size() == 2) 500 if (tokens2.size() == 2)
501 { 501 {
502 pItems[item_counter].uDamageDice=atoi(tokens2[0]); 502 pItems[item_counter].uDamageDice=atoi(tokens2[0]);
503 pItems[item_counter].uDamageRoll=atoi(tokens2[1]); 503 pItems[item_counter].uDamageRoll=atoi(tokens2[1]);
512 pItems[item_counter].uDamageDice=0; 512 pItems[item_counter].uDamageDice=0;
513 pItems[item_counter].uDamageRoll=0; 513 pItems[item_counter].uDamageRoll=0;
514 } 514 }
515 pItems[item_counter].uDamageMod=atoi(tokens[7]); 515 pItems[item_counter].uDamageMod=atoi(tokens[7]);
516 auto findResult3 = materialMap.find(tokens[8]); 516 auto findResult3 = materialMap.find(tokens[8]);
517 pItems[item_counter].uSkillType = findResult3 == materialMap.end() ? MATERIAL_COMMON : findResult->second; 517 pItems[item_counter].uMaterial = findResult3 == materialMap.end() ? MATERIAL_COMMON : findResult->second;
518 pItems[item_counter].uItemID_Rep_St=atoi(tokens[9]); 518 pItems[item_counter].uItemID_Rep_St=atoi(tokens[9]);
519 pItems[item_counter].pUnidentifiedName = RemoveQuotes(tokens[10]); 519 pItems[item_counter].pUnidentifiedName = RemoveQuotes(tokens[10]);
520 pItems[item_counter].uSpriteID=atoi(tokens[11]); 520 pItems[item_counter].uSpriteID=atoi(tokens[11]);
521 521
522 pItems[item_counter]._additional_value=0; 522 pItems[item_counter]._additional_value=0;