Mercurial > mm7
changeset 289:92d443ed0cba
Слияние
| author | Ritor1 |
|---|---|
| date | Mon, 18 Feb 2013 19:16:38 +0600 |
| parents | 9a6052fecad4 (diff) 250e49fef6f6 (current diff) |
| children | 4776715a964b |
| files | Indoor.cpp MM7.vcxproj.filters Player.cpp mm7_5.cpp mm7_data.cpp |
| diffstat | 4 files changed, 5 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/Indoor.cpp Mon Feb 18 16:39:49 2013 +0600 +++ b/Indoor.cpp Mon Feb 18 19:16:38 2013 +0600 @@ -1215,7 +1215,6 @@ - //----- (004B0E07) -------------------------------------------------------- unsigned int __fastcall sub_4B0E07(unsigned int uFaceID) {
--- a/Player.cpp Mon Feb 18 16:39:49 2013 +0600 +++ b/Player.cpp Mon Feb 18 19:16:38 2013 +0600 @@ -1744,6 +1744,7 @@ v4->pInventoryIndices[a4] = a3 + 1; return 1; } + // 506128: using guessed type int areWeLoadingTexture; //----- (00492A36) -------------------------------------------------------- @@ -3349,19 +3350,13 @@ //----- (0048D62C) -------------------------------------------------------- int Player::GetEquippedItemEquipType(unsigned int uEquipSlot) { - return pItemsTable->pItems[*(int *)&this->spellbook.pDarkSpellbook.bIsSpellAvailable[36 - * *(&this->pEquipment.uOffHand - + uEquipSlot) - + 5]].uEquipType; + return pItemsTable->pItems[pInventoryItems[pEquipment.pIndices[uEquipSlot]-1].uItemID].uEquipType; } //----- (0048D651) -------------------------------------------------------- int Player::GetEquippedItemSkillType(enum ITEM_EQUIP_TYPE uEquipSlot) { - return pItemsTable->pItems[*(int *)&this->spellbook.pDarkSpellbook.bIsSpellAvailable[36 - * *(&this->pEquipment.uOffHand - + uEquipSlot) - + 5]].uSkillType; + return pItemsTable->pItems[pInventoryItems[pEquipment.pIndices[uEquipSlot] - 1].uItemID].uSkillType; } //----- (0048D676) --------------------------------------------------------
--- a/mm7_5.cpp Mon Feb 18 16:39:49 2013 +0600 +++ b/mm7_5.cpp Mon Feb 18 19:16:38 2013 +0600 @@ -7286,7 +7286,7 @@ pRenderer->DrawTextureIndexed(0x1D3u, 0, (Texture *)(uTextureID_BACKDOLL != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BACKDOLL] : 0));// if ( !IsPlayerWearingWatersuit[uPlayerID_] ) { - v21 = pPlayer->pEquipment.uBow; // + v21 = pPlayer->pEquipment.uBow; // if ( !v21 ) goto LABEL_59; v230 = pPlayer->pEquipment.uBow;
--- a/mm7_data.cpp Mon Feb 18 16:39:49 2013 +0600 +++ b/mm7_data.cpp Mon Feb 18 19:16:38 2013 +0600 @@ -679,7 +679,7 @@ int dword_4E57F0[4][7][2]; int dword_4E58D0[777]; // weak int dword_4E58D4[777]; // weak -int dword_4E5AD0[777]; // weak +int dword_4E5AD0[777]; // weak 52 int dword_4E5AD4[777]; // weak int pPaperdoll_LeftHand[8] = {