Mercurial > mm7
diff mm7_5.cpp @ 484:4bd56919f075
avard quest guild bits
author | Gloval |
---|---|
date | Wed, 27 Feb 2013 02:25:31 +0400 |
parents | 5d2667144526 |
children | 7887a9cf9e7b |
line wrap: on
line diff
--- a/mm7_5.cpp Tue Feb 26 17:24:53 2013 +0600 +++ b/mm7_5.cpp Wed Feb 27 02:25:31 2013 +0400 @@ -2159,7 +2159,7 @@ { v63 = 206; } - if ( !(unsigned __int16)_449B57_test_bit(pParty->_award_bits, v63) ) + if ( !(unsigned __int16)_449B57_test_bit(pParty->_quest_bits, v63) ) return; goto LABEL_486; case UIMSG_B6: @@ -2227,7 +2227,7 @@ { v68 = 206; } - if ( !(unsigned __int16)_449B57_test_bit(pParty->_award_bits, v68) ) + if ( !(unsigned __int16)_449B57_test_bit(pParty->_quest_bits, v68) ) { pRenderer->DrawTextureRGB(0, 0x160u, pTexture_StatusBar); continue; @@ -12093,9 +12093,9 @@ v8 = 1; if ( !_strcmpi(pCurrentMapName, "d26.blv") ) v6 = 1; - if (_449B57_test_bit(pParty->_award_bits, 99)) + if (_449B57_test_bit(pParty->_quest_bits, 99)) v7 = 1; - if (_449B57_test_bit(pParty->_award_bits, 100)) + if (_449B57_test_bit(pParty->_quest_bits, 100)) v5 = 1; Log::Warning(L"%S %S %u", __FILE__, __FUNCTION__, __LINE__); // ai_near_actors_targets_pid[i] for AI_Stand seems always 0; original code behaviour is identical @@ -13152,7 +13152,7 @@ { v1 = 206; LABEL_14: - if ( !(unsigned __int16)_449B57_test_bit(pParty->_award_bits, v1) ) + if ( !(unsigned __int16)_449B57_test_bit(pParty->_quest_bits, v1) ) goto LABEL_16; goto LABEL_15; } @@ -13199,7 +13199,7 @@ { v4 = 206; LABEL_30: - if ( (unsigned __int16)_449B57_test_bit(pParty->_award_bits, v4) ) + if ( (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, v4) ) goto LABEL_31; return v6.DrawTitleText(pBook2Font, 0, 22u, 0, pGlobalTXT_LocalizationStrings[10], 3u); } @@ -13421,7 +13421,7 @@ { do { - if ( *(&v0->field_152[v1 + 63] + v4) ) + if ( *(&v0->_guilds_member_bits[v1 + 63] + v4) ) { v5 = (Texture *)dword_506408[v4]; if ( v5 != v3 ) @@ -13679,7 +13679,7 @@ 0, 0, 0, - (__int64 *)&pParty->field_3C.field_440[2 * v6 + 42]); + (__int64 *)&pParty->field_3C._s_times[ v6 + 21]); if ( v7 ) { v9 = pAutonoteFont->_44C6C2(v8, &a1, 1u, (unsigned __int8)byte_5C6D50[dword_506528]); @@ -13779,7 +13779,7 @@ v7 = a1.uFrameY + v6; if ( (signed int)(a1.uFrameY + v6) > (signed int)a1.uFrameHeight ) break; - pRenderer->DrawTextureTransparent(0x64u, v7 + 12, pTextures_5064A0[10]); + pRenderer->DrawTextureTransparent(100, v7 + 12, pTextures_5064A0[10]); ++v3; a1.uFrameY = v7 + 24; } @@ -15528,16 +15528,14 @@ v10 = window_SpeakInHouse->ptr_1C; if ( (signed int)v10 >= 53 ) continue; - v11 = pParty->field_3C._shop_ban_times[2 * (_DWORD)v10 + 1]; - if ( !__PAIR__(v11, pParty->field_3C._shop_ban_times[2 * (_DWORD)v10]) - || v11 < SHIDWORD(pParty->uTimePlayed) - || v11 <= SHIDWORD(pParty->uTimePlayed) - && (unsigned int)pParty->field_3C._shop_ban_times[2 * (_DWORD)v10] <= LODWORD(pParty->uTimePlayed) ) + if ( pParty->field_3C._shop_ban_times[(signed int)v10] <=pParty->uTimePlayed ) { if ( (signed int)v10 < 53 ) { - pParty->field_3C._shop_ban_times[2 * (_DWORD)v10] = 0; - pParty->field_3C._shop_ban_times[2 * (_DWORD)v10 + 1] = 0; + + + pParty->field_3C._shop_ban_times[(signed int)v10] = 0; + } continue; } @@ -17700,7 +17698,7 @@ dword_506520 = 0; dword_50651C = 0; dword_506528 = 0; - v2 = (unsigned __int8 *)pPlayer->field_152; + v2 = (unsigned __int8 *)pPlayer->_guilds_member_bits; do { v13 = (char *)pAwards[v1-1].pText;//dword_723E80_award_related[2 * v1];