Mercurial > mm7
diff mm7_4.cpp @ 1760:a2ea57410b15
Merge
author | Grumpy7 |
---|---|
date | Tue, 01 Oct 2013 06:19:58 +0200 |
parents | 421c29d4ab3e |
children | 4dee76d79c78 04b92ce868e3 |
line wrap: on
line diff
--- a/mm7_4.cpp Tue Oct 01 06:17:32 2013 +0200 +++ b/mm7_4.cpp Tue Oct 01 06:19:58 2013 +0200 @@ -2715,27 +2715,22 @@ //----- (004B1447) -------------------------------------------------------- -Player *__fastcall sub_4B1447_party_fine(int a1, int a2, int a3) +void sub_4B1447_party_fine(int a1, int a2, int a3) { signed int v3; // esi@1 char v4; // sf@8 int v5; // eax@8 unsigned __int64 v6; // qax@12 DDM_DLV_Header *v7; // eax@14 - Player **v8; // edi@18 - Player *result; // eax@19 - //char *v10; // esi@20 v3 = 0; if ( a2 ) { - if ( a2 != 1 ) - { - if ( a2 == 2 ) - v3 = 2; + if ( a2 == 1 ) + v3 = 2; + if ( a2 == 2 ) + v3 = 2; goto LABEL_13; - } - v3 = 2; } else { @@ -2768,22 +2763,14 @@ if ( v7->uReputation > 10000 ) v7->uReputation = 10000; } - v8 = &pPlayers[1]; - do + for ( uint i = 1; i <= 4; ++i ) { - result = *v8; if ( pParty->uFine ) { - //v10 = result->_guilds_member_bits; - result = (Player *)_449B57_test_bit((unsigned __int8 *)result->_achieved_awards_bits, 1); - if ( !(short)result ) - __debugbreak(); - //result = (Player *)_449B7E_toggle_bit((unsigned char *)v10, 1, 1u); + if ( !_449B57_test_bit(pPlayers[i]->_achieved_awards_bits, 1) ) + _449B7E_toggle_bit(pPlayers[i]->_achieved_awards_bits, 1, 1); } - ++v8; } - while ( (signed int)v8 <= (signed int)&pPlayers[4] ); - return result; } //----- (004B1523) --------------------------------------------------------