# HG changeset patch # User zipi # Date 1364936478 -3600 # Node ID abf7b7d2c8f7f74690af92fa4a6803755322adcd # Parent 4de9c65baa39e7c4468c76ab6e772d1721f02cdc small fixes diff -r 4de9c65baa39 -r abf7b7d2c8f7 mm7_5.cpp --- a/mm7_5.cpp Tue Apr 02 20:54:41 2013 +0100 +++ b/mm7_5.cpp Tue Apr 02 22:01:18 2013 +0100 @@ -3261,7 +3261,7 @@ sub_41C0B8_set_status_string(pTmpBuf); v108 = 8 * uMessageParam - 8; LOBYTE(v108) = v108 | 4; - pMouse->uPointingObjectID = v108; + pMouse->uPointingObjectID = PID(OBJECT_Player,v108); continue; case UIMSG_ShowStatus_ManaHP: v109 = pGlobalTXT_LocalizationStrings[212];// "Spell Points" diff -r 4de9c65baa39 -r abf7b7d2c8f7 mm7_6.cpp --- a/mm7_6.cpp Tue Apr 02 20:54:41 2013 +0100 +++ b/mm7_6.cpp Tue Apr 02 22:01:18 2013 +0100 @@ -1190,7 +1190,7 @@ //----- (00426947) -------------------------------------------------------- void __cdecl sub_426947() { - dword_50C968 = 0; + stru_50C198.field_0[500] = 0; dword_50C994 = 0; dword_50C998_turnbased_icon_1A = 0; } @@ -2449,7 +2449,7 @@ Player *v17; // esi@70 //int v18; // eax@72 //int v19; // eax@74 - char *v20; // eax@74 + Player *v20; // eax@74 signed int i; // esi@76 //int v22; // eax@88 __int16 v23; // ax@88 @@ -3364,8 +3364,8 @@ a1.field_60_distance_related_prolly_lod = LOBYTE(v715.uDistance); a1.uFacing = LOWORD(v715.uYawAngle); a1.uSoundID = LOWORD(v3->sound_id); - v20 = (char *)&pParty->pPlayers[v3->uPlayerID]; - memcpy(&a1.stru_24, &v20[36 * *((int *)v20 + 1620) + 496], sizeof(a1.stru_24)); + v20 = &pParty->pPlayers[v3->uPlayerID]; + memcpy(&a1.stru_24, &v20[v20->pEquipment.uBow], sizeof(a1.stru_24)); a1.uAttributes = 256; if ( pParty->bTurnBasedModeOn == 1 ) a1.uAttributes = 260; diff -r 4de9c65baa39 -r abf7b7d2c8f7 mm7_data.cpp --- a/mm7_data.cpp Tue Apr 02 20:54:41 2013 +0100 +++ b/mm7_data.cpp Tue Apr 02 22:01:18 2013 +0100 @@ -1589,7 +1589,7 @@ int dword_50BF30[777]; // weak char town_portal_caster_id; // weak int some_active_character; // weak -_UNKNOWN unk_50C190; // weak +//_UNKNOWN unk_50C190; // weak int dword_50C968; // weak unsigned int pIconIDs_Turn[5]; unsigned int uIconID_TurnStop; diff -r 4de9c65baa39 -r abf7b7d2c8f7 stru6.cpp --- a/stru6.cpp Tue Apr 02 20:54:41 2013 +0100 +++ b/stru6.cpp Tue Apr 02 22:01:18 2013 +0100 @@ -1298,7 +1298,7 @@ switch (uSpellID) { case SPELL_153: - __debugbreak(); // spell id == 153 wtf + __debugbreak(); // spell id == 153 wtf , curse probably ? happening when attacked by harpies v6 = "zapp"; break;