Mercurial > mm7
changeset 1432:2489c8aeac90
.
author | Nomad |
---|---|
date | Fri, 02 Aug 2013 19:28:36 +0200 |
parents | c7489dd19f88 |
children | a6d966e85611 |
files | Player.cpp |
diffstat | 1 files changed, 3 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/Player.cpp Thu Aug 01 17:51:16 2013 +0600 +++ b/Player.cpp Fri Aug 02 19:28:36 2013 +0200 @@ -7997,14 +7997,6 @@ v27->uReputation = 10000; } } -// 506568: using guessed type int dword_506568; -// 507948: using guessed type char bFlashHistoryBook; -// 507949: using guessed type char bFlashAutonotesBook; -// 50794A: using guessed type char bFlashQuestBook; -// 72371C: using guessed type int dword_72371C[]; -// 723E80: using guessed type int dword_723E80_award_related[]; - - //----- (0044B9C4) -------------------------------------------------------- @@ -8748,7 +8740,7 @@ //v5 = 604; //while ( 1 ) assert ( a1 > 0 && a1 < 5 ); - for ( uint i = 1; i < (signed int)&qword_A750D8; ++i ) + for ( uint i = 1; i < 5; ++i ) { //item_flag = Player_has_item(604, *pPlayers, 0); if ( !Player_has_item(604, ::pPlayers[i], 0) ) @@ -8758,7 +8750,7 @@ if ( !::pPlayers[i]->pEquipment.uArmor ) return false; //result *= 9; - if ( *(int *)&::pPlayers[i]->spellbook.pDarkSpellbook.bIsSpellAvailable[4 * 9 + 5] != 604 ) + if (::pPlayers[i]->pEquippedItems[::pPlayers[i]->pEquipment.uArmor].uItemID != 604 ) return false; //++pPlayers; //if ( (signed int)pPlayers >= (signed int)&qword_A750D8 ) @@ -8766,23 +8758,7 @@ } return true; } - //return false; - //} - //result = Player_has_item(604u, ::pPlayers[a1], 0); - //__debugbreak(); // player.cpp(8764): warning C4700: uninitialized local variable 'v2' used - //__debugbreak(); // player.cpp(8764): warning C4700: uninitialized local variable 'v3' used - //if ( !result - // || (result = v2->pEquipment.uArmor) == 0 - // || (result *= 9, *(int *)&v2->spellbook.pDarkSpellbook.bIsSpellAvailable[4 * result + 5] != v3) ) - //{ -//LABEL_6: - //LOBYTE(result) = 0; - // return false; - //} -//LABEL_13: - //LOBYTE(result) = 1; - //return true; -//} + //----- (0043EE15) -------------------------------------------------------- bool __fastcall Player_has_item(unsigned int uItemID, Player *pPlayer, char a3) {