Mercurial > mm7
changeset 230:b9f4ff2f6c45
Merge
author | Gloval |
---|---|
date | Sun, 17 Feb 2013 17:18:45 +0400 |
parents | 05a2d2b35ed0 (diff) 46ae2602aceb (current diff) |
children | a69fc44061d5 0df4136b6aac 3395164886cd |
files | Items.cpp Items.h |
diffstat | 2 files changed, 42 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/Items.cpp Sun Feb 17 15:45:46 2013 +0200 +++ b/Items.cpp Sun Feb 17 17:18:45 2013 +0400 @@ -245,7 +245,7 @@ { int i,j; char* test_string; - char c; + unsigned char c; bool break_loop; unsigned int temp_str_len; char* tmp_pos; @@ -1164,7 +1164,7 @@ *tmp_pos = 0; if (temp_str_len) { - if(i) + //if(i) pClassDescriptions[i]=RemoveQuotes(test_string); } else
--- a/Items.h Sun Feb 17 15:45:46 2013 +0200 +++ b/Items.h Sun Feb 17 17:18:45 2013 +0400 @@ -123,44 +123,44 @@ /* 175 */ #pragma pack(push, 1) struct ItemDesc -{ //Item # |Pic File|Name|Value|Equip Stat|Skill Group|Mod1|Mod2|material| - ///ID/Rep/St|Not identified name|Sprite Index|VarA|VarB|Equip X|Equip Y|Notes - char *pIconName; //0 4 - char *pName; //4 8 - char *pUnidentifiedName; //8 c - char *pDescription; //0c 10 - unsigned int uValue; //10 14 - unsigned __int16 uSpriteID; //14 18 - __int16 field_1A; //16 - unsigned __int16 uEquipX; //18 1c - unsigned __int16 uEquipY; //1a 1e - unsigned __int8 uEquipType; //1c 20 - unsigned __int8 uSkillType; //1d 21 - unsigned __int8 uDamageDice; //1e 22 - unsigned __int8 uDamageRoll; //1f 23 - unsigned __int8 uDamageMod; //20 24 - unsigned __int8 uMaterial; //21 25 - char _additional_value; //22 26 - char _bonus_type; //23 27 - char _bonus_strength; //24 28 - char field_25; // 25 29 - char field_26; //26 2A - char field_27; // 27 2b - union - { - unsigned __int8 uChanceByTreasureLvl[6]; - struct { - unsigned __int8 uChanceByTreasureLvl1; // 28 2c - unsigned __int8 uChanceByTreasureLvl2; // 29 2d - unsigned __int8 uChanceByTreasureLvl3; // 2A 2e - unsigned __int8 uChanceByTreasureLvl4; // 2B 2f - unsigned __int8 uChanceByTreasureLvl5; // 2C 30 - unsigned __int8 uChanceByTreasureLvl6; // 2D 32 - }; - }; - unsigned char uItemID_Rep_St; //2e 32 - char field_2f; -}; + { //Item # |Pic File|Name|Value|Equip Stat|Skill Group|Mod1|Mod2|material| + ///ID/Rep/St|Not identified name|Sprite Index|VarA|VarB|Equip X|Equip Y|Notes + char *pIconName; //0 4 + char *pName; //4 8 + char *pUnidentifiedName; //8 c + char *pDescription; //0c 10 + unsigned int uValue; //10 14 + unsigned __int16 uSpriteID; //14 18 + __int16 field_1A; //16 + unsigned __int16 uEquipX; //18 1c + unsigned __int16 uEquipY; //1a 1e + unsigned __int8 uEquipType; //1c 20 + unsigned __int8 uSkillType; //1d 21 + unsigned __int8 uDamageDice; //1e 22 + unsigned __int8 uDamageRoll; //1f 23 + unsigned __int8 uDamageMod; //20 24 + unsigned __int8 uMaterial; //21 25 + char _additional_value; //22 26 + char _bonus_type; //23 27 + char _bonus_strength; //24 28 + char field_25; // 25 29 + char field_26; //26 2A + char field_27; // 27 2b + union + { + unsigned __int8 uChanceByTreasureLvl[6]; + struct { + unsigned __int8 uChanceByTreasureLvl1; // 28 2c + unsigned __int8 uChanceByTreasureLvl2; // 29 2d + unsigned __int8 uChanceByTreasureLvl3; // 2A 2e + unsigned __int8 uChanceByTreasureLvl4; // 2B 2f + unsigned __int8 uChanceByTreasureLvl5; // 2C 30 + unsigned __int8 uChanceByTreasureLvl6; // 2D 32 + }; + }; + unsigned char uItemID_Rep_St; //2e 32 + char field_2f; + }; #pragma pack(pop) @@ -225,12 +225,12 @@ int uAllItemsCount; ItemDesc pItems[800]; //4-9604h ItemEnchantment pEnchantments[24]; //9604h - ItemSpecialEnchantment pSpecialEnchantments[72]; //97E4h + ItemSpecialEnchantment pSpecialEnchantments[72]; //97E4h -9FC4h char field_9FC4[5000]; char field_B348[5000]; char field_C6D0[5000]; char field_DA58[5000]; - char field_EDE0[180]; + char field_EDE0[384]; unsigned __int16 potion_data[50][50]; // 77B2h*2=EF64h -102ECh unsigned __int16 potion_note[50][50]; // 8176h*2=102ECh -11674h char *pItemsTXT_Raw; //11674h