Mercurial > mm7

changeset 287:64770a1eb8e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Paperdoll fix
author Ritor1
date Mon, 18 Feb 2013 00:37:49 +0600
parents 0fbb07ec6241
children 9a6052fecad4
files Player.cpp mm7_data.cpp
diffstat 2 files changed, 11 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/Player.cpp	Sun Feb 17 23:11:49 2013 +0600
+++ b/Player.cpp	Mon Feb 18 00:37:49 2013 +0600
@@ -3350,8 +3350,7 @@
 //----- (0048D62C) --------------------------------------------------------
 int Player::GetEquippedItemEquipType(unsigned int uEquipSlot)
 {
-  return pItemsTable->pItems[*(int *)&this->spellbook.pDarkSpellbook.bIsSpellAvailable[36
-                                                                             * *(&this->pEquipment.uOffHand
+  return pItemsTable->pItems[*(int *)&this->pInventoryItems[36 * *(&this->pEquipment.uOffHand
                                                                                + uEquipSlot)
                                                                              + 5]].uEquipType;
 }
@@ -3359,8 +3358,7 @@
 //----- (0048D651) --------------------------------------------------------
 int Player::GetEquippedItemSkillType(enum ITEM_EQUIP_TYPE uEquipSlot)
 {
-  return pItemsTable->pItems[*(int *)&this->spellbook.pDarkSpellbook.bIsSpellAvailable[36
-                                                                             * *(&this->pEquipment.uOffHand
+  return pItemsTable->pItems[*(int *)&this->pInventoryItems[36 * *(&this->pEquipment.uOffHand
                                                                                + uEquipSlot)
                                                                              + 5]].uSkillType;
 }
--- a/mm7_data.cpp	Sun Feb 17 23:11:49 2013 +0600
+++ b/mm7_data.cpp	Mon Feb 18 00:37:49 2013 +0600
@@ -282,10 +282,10 @@
 stru161 stru_4ECBB8[6];
 stru289 stru_6BE158;
 stru329 array_4E4C30[4] ={
-	{128, 205, 30, 144, 88, 85, 0, 0, 0, 0, 0, 0, 17, 104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{131, 201, 38, 158, 98, 87, 0, 0, 0, 0, 0, 0, 21, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{131, 216, 29, 186, 88, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{123, 216, 35, 184, 98, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+	{0x80, 0xCD, 0x1E, 0x90, 0x58, 0x55, 0, 0, 0, 0, 0, 0, 0x11, 0x68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{0x83, 0xC9, 0x26, 0x9E, 0x62, 0x57, 0, 0, 0, 0, 0, 0, 0x15, 0x64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{0x83, 0xD8, 0x1D, 0xBA, 0x58, 0x77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{0x7B, 0xD8, 0x23, 0xB8, 0x62, 0x77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 };
 stru332 stru_511698;
 stru333 stru_511718;
@@ -674,34 +674,11 @@
 };
 int dword_4E5270[8];
 int dword_4E5490[4][7][2];
-int paredoll_array_4E54B8[3][14] = 
-{
-  0xD, 0x137, 0xC, 0x10E, 0x14, 0x125, 0x13, 0x122, 0x15, 0x120, 0x15, 0x114, 0x13, 0x10A,
-  0x11, 0x13E, 0x11, 0x116, 0x1D, 0x121, 0x1C, 0x11F, 0x1B, 0x11B, 0x1C, 0x117, 0x16, 0x116,
-  0x1B, 0x137, 0x1B, 0x11B, 0x1F, 0x127, 0x1F, 0x122, 0x1B, 0x11B, 0x1D, 0x117, 0x1D, 0x116,
-};
-int paperdoll_array_4E5570[4][10][2] = 
-{
-  17, 104, 15, 104, 20, 113, 25, 107, 33, 111, 
-  5, 104, 5, 104, 20, 0x71, 3, 113, 15, 111, 
-  21, 100, 11, 107, 14, 103, 21, 107, 27, 111,
-  3, 107, 0, 107, 14, 103, 0, 107, 3, 111,
-  16, 138, 9, 139, 24, 152, 37, 145, 41, 144,
-  8, 138, 9, 139, 24, 152, 3, 145, 3, 144,
-  20, 146, 16, 146, 21, 152, 31, 145, 34, 144,
-  8, 146, 12, 146, 21, 152, 3, 145, 3, 144,
-};
-int dword_4E56B0 = 17; // weak
-int dword_4E56B4 = 104; // weak
-int dword_4E57F0[4][7][2] = 
-{
-  0x3A, 0xB6, 0x37, 0xB2, 0x34, 0xB9, 0x3A, 0xB9, 0x37, 0xB7,
-  0x38, 0xAC, 0x37, 0xB7, 0x3E, 0xAD, 0x3A, 0xAC, 0x37, 0xB0,
-  0x3A, 0xB1, 0x39, 0xB0, 0x3C, 0xA5, 0x39, 0xB0, 0x3B, 0xD5,
-  0x37, 0xD2, 0x31, 0xD5, 0x39, 0xD6, 0x37, 0xD8, 0x37, 0xD1,
-  0x37, 0xD8, 0x42, 0xD2, 0x3F, 0xD0, 0x3B, 0xD7, 0x3C, 0xD5,
-  0x3B, 0xD6, 0x3E, 0xCF, 0x36, 0xD6,
-};
+int paredoll_array_4E54B8[3][14];
+int paperdoll_array_4E5570[4][10][2];
+int dword_4E56B0; // weak
+int dword_4E56B4; // weak
+int dword_4E57F0[4][7][2];
 int dword_4E58D0[777]; // weak
 int dword_4E58D4[777]; // weak
 int dword_4E5AD0[777]; // weak  52