# HG changeset patch # User Ritor1 # Date 1360433843 -21600 # Node ID bf7ea4c330b31442df98fc4d2659d8c649c39787 # Parent aa9b34eb3da41457a6818ac88dcb9375a2c92b0d Paperdoll fixed diff -r aa9b34eb3da4 -r bf7ea4c330b3 GUIWindow.h --- a/GUIWindow.h Sat Feb 09 17:39:50 2013 +0600 +++ b/GUIWindow.h Sun Feb 10 00:17:23 2013 +0600 @@ -202,7 +202,7 @@ UIMSG_ToggleWalkSound = 0xB9, UIMSG_ChangeVoiceVolume = 0xBA, UIMSG_ToggleShowDamage = 0xBB, - UIMSG_BC = 0xBC, + UIMSG_ScrollNPCPanel = 0xBC, UIMSG_BD = 0xBD, UIMSG_BE = 0xBE, UIMSG_BF = 0xBF, diff -r aa9b34eb3da4 -r bf7ea4c330b3 mm7_5.cpp --- a/mm7_5.cpp Sat Feb 09 17:39:50 2013 +0600 +++ b/mm7_5.cpp Sun Feb 10 00:17:23 2013 +0600 @@ -1777,21 +1777,21 @@ } sub_41426F(); continue; - case UIMSG_BC://Right and Left button for NPCPanel + case UIMSG_ScrollNPCPanel://Right and Left button for NPCPanel if ( uMessageParam ) { - GUIWindow::Create(0x272u, 0xB3u, 0, 0, (enum WindowType)90, (int)pBtn_NPCRight, 0); + GUIWindow::Create(626, 179, 0, 0, (enum WindowType)90, (int)pBtn_NPCRight, 0); v37 = (pParty->pHirelings[0].pName != 0) + (pParty->pHirelings[1].pName != 0) + (unsigned __int8)pParty->field_70A - 2; if ( (unsigned __int8)pParty->field_709 < v37 ) { - ++pParty->field_709; + ++pParty->field_709;//??? maybe number of the first cell??? if ( (unsigned __int8)pParty->field_709 >= v37 ) pParty->field_709 = (pParty->pHirelings[0].pName != 0) + (pParty->pHirelings[1].pName != 0) + pParty->field_70A - 2; } } else { - GUIWindow::Create(0x1D5u, 0xB3u, 0, 0, (enum WindowType)90, (int)pBtn_NPCLeft, 0); + GUIWindow::Create(469, 179, 0, 0, (enum WindowType)90, (int)pBtn_NPCLeft, 0); if ( pParty->field_709 ) { --pParty->field_709; diff -r aa9b34eb3da4 -r bf7ea4c330b3 mm7_data.cpp --- a/mm7_data.cpp Sat Feb 09 17:39:50 2013 +0600 +++ b/mm7_data.cpp Sun Feb 10 00:17:23 2013 +0600 @@ -287,7 +287,41 @@ #include "MM7.h" stru161 stru_4ECBB8[6]; stru289 stru_6BE158; -stru329 array_4E4C30[4]; +stru329 array_4E4C30[4] = +{ + 0x80, //Shield_X + 0xCD, //Shield_Y + 0x1E, //Weapon_X + 0x90, //Weapon_Y + 0x58, //Bow_X + 0x55, //Bow_Y + 0, //field_18 + 0, //field_1C + 0, //field_20 + 0, //field_24 + 0, //field_28 + 0, //field_2C + 0x11, //field_30 + 0x68, //field_34 + 0, //field_38 + 0, //field_3C + 0, //field_40 + 0, //field_44 + 0, //field_48 + 0, //field_4C + 0, //field_50 + 0, //field_54 + 0, //field_58 + 0, //field_5C + 0, //field_60 + 0, //field_64 + 0, //field_68 + 0, //field_6C + 0, //field_70 + 0, //field_74 + 0, //field_78 + 0, //field_7C +}; stru332 stru_511698; stru333 stru_511718; stru334 array_4E2940[26];