Mercurial > mm7

comparison mm7_5.cpp @ 484:4bd56919f075

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avard quest guild bits
author Gloval
date Wed, 27 Feb 2013 02:25:31 +0400
parents 5d2667144526
children 7887a9cf9e7b
comparison
equal deleted inserted replaced
481:5b6e2021c6fe 484:4bd56919f075
2157 } 2157 }
2158 else 2158 else
2159 { 2159 {
2160 v63 = 206; 2160 v63 = 206;
2161 } 2161 }
2162 if ( !(unsigned __int16)_449B57_test_bit(pParty->_award_bits, v63) ) 2162 if ( !(unsigned __int16)_449B57_test_bit(pParty->_quest_bits, v63) )
2163 return; 2163 return;
2164 goto LABEL_486; 2164 goto LABEL_486;
2165 case UIMSG_B6: 2165 case UIMSG_B6:
2166 if ( uMessageParam ) 2166 if ( uMessageParam )
2167 { 2167 {
2225 } 2225 }
2226 else 2226 else
2227 { 2227 {
2228 v68 = 206; 2228 v68 = 206;
2229 } 2229 }
2230 if ( !(unsigned __int16)_449B57_test_bit(pParty->_award_bits, v68) ) 2230 if ( !(unsigned __int16)_449B57_test_bit(pParty->_quest_bits, v68) )
2231 { 2231 {
2232 pRenderer->DrawTextureRGB(0, 0x160u, pTexture_StatusBar); 2232 pRenderer->DrawTextureRGB(0, 0x160u, pTexture_StatusBar);
2233 continue; 2233 continue;
2234 } 2234 }
2235 //LABEL_506: 2235 //LABEL_506:
12091 v5 = 0; 12091 v5 = 0;
12092 if ( !_strcmpi(pCurrentMapName, "d25.blv") ) 12092 if ( !_strcmpi(pCurrentMapName, "d25.blv") )
12093 v8 = 1; 12093 v8 = 1;
12094 if ( !_strcmpi(pCurrentMapName, "d26.blv") ) 12094 if ( !_strcmpi(pCurrentMapName, "d26.blv") )
12095 v6 = 1; 12095 v6 = 1;
12096 if (_449B57_test_bit(pParty->_award_bits, 99)) 12096 if (_449B57_test_bit(pParty->_quest_bits, 99))
12097 v7 = 1; 12097 v7 = 1;
12098 if (_449B57_test_bit(pParty->_award_bits, 100)) 12098 if (_449B57_test_bit(pParty->_quest_bits, 100))
12099 v5 = 1; 12099 v5 = 1;
12100 12100
12101 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 12101 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
12102 for (uint i = 0; i < uNumActors; ++i) 12102 for (uint i = 0; i < uNumActors; ++i)
12103 { 12103 {
13150 { 13150 {
13151 if ( !v0 ) 13151 if ( !v0 )
13152 { 13152 {
13153 v1 = 206; 13153 v1 = 206;
13154 LABEL_14: 13154 LABEL_14:
13155 if ( !(unsigned __int16)_449B57_test_bit(pParty->_award_bits, v1) ) 13155 if ( !(unsigned __int16)_449B57_test_bit(pParty->_quest_bits, v1) )
13156 goto LABEL_16; 13156 goto LABEL_16;
13157 goto LABEL_15; 13157 goto LABEL_15;
13158 } 13158 }
13159 if ( v0 == 1 ) 13159 if ( v0 == 1 )
13160 { 13160 {
13197 return v6.DrawTitleText(pBook2Font, 0, 22u, 0, pGlobalTXT_LocalizationStrings[10], 3u); 13197 return v6.DrawTitleText(pBook2Font, 0, 22u, 0, pGlobalTXT_LocalizationStrings[10], 3u);
13198 if ( v3 == 1 ) 13198 if ( v3 == 1 )
13199 { 13199 {
13200 v4 = 206; 13200 v4 = 206;
13201 LABEL_30: 13201 LABEL_30:
13202 if ( (unsigned __int16)_449B57_test_bit(pParty->_award_bits, v4) ) 13202 if ( (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, v4) )
13203 goto LABEL_31; 13203 goto LABEL_31;
13204 return v6.DrawTitleText(pBook2Font, 0, 22u, 0, pGlobalTXT_LocalizationStrings[10], 3u); 13204 return v6.DrawTitleText(pBook2Font, 0, 22u, 0, pGlobalTXT_LocalizationStrings[10], 3u);
13205 } 13205 }
13206 if ( v3 == 2 ) 13206 if ( v3 == 2 )
13207 { 13207 {
13419 v4 = 1; 13419 v4 = 1;
13420 if ( __OFSUB__(v1, v1 + 11) ^ 1 ) 13420 if ( __OFSUB__(v1, v1 + 11) ^ 1 )
13421 { 13421 {
13422 do 13422 do
13423 { 13423 {
13424 if ( *(&v0->field_152[v1 + 63] + v4) ) 13424 if ( *(&v0->_guilds_member_bits[v1 + 63] + v4) )
13425 { 13425 {
13426 v5 = (Texture *)dword_506408[v4]; 13426 v5 = (Texture *)dword_506408[v4];
13427 if ( v5 != v3 ) 13427 if ( v5 != v3 )
13428 { 13428 {
13429 if ( dword_50654C == v4 ) 13429 if ( dword_50654C == v4 )
13677 pStorylineText->StoreLine[v6].pText, 13677 pStorylineText->StoreLine[v6].pText,
13678 uActiveCharacter - 1, 13678 uActiveCharacter - 1,
13679 0, 13679 0,
13680 0, 13680 0,
13681 0, 13681 0,
13682 (__int64 *)&pParty->field_3C.field_440[2 * v6 + 42]); 13682 (__int64 *)&pParty->field_3C._s_times[ v6 + 21]);
13683 if ( v7 ) 13683 if ( v7 )
13684 { 13684 {
13685 v9 = pAutonoteFont->_44C6C2(v8, &a1, 1u, (unsigned __int8)byte_5C6D50[dword_506528]); 13685 v9 = pAutonoteFont->_44C6C2(v8, &a1, 1u, (unsigned __int8)byte_5C6D50[dword_506528]);
13686 LOBYTE(v8) = a1.DrawText(pAutonoteFont, 1, 0, 0, (const char *)v9, 0, a1.uFrameY + a1.uFrameHeight, 0); 13686 LOBYTE(v8) = a1.DrawText(pAutonoteFont, 1, 0, 0, (const char *)v9, 0, a1.uFrameY + a1.uFrameHeight, 0);
13687 ++dword_506520; 13687 ++dword_506520;
13777 a1.DrawText(pAutonoteFont, 1, 0, 0, pQuestTable[v4-1], 0, 0, 0);//(&dword_722F10)[4 * v4], 0, 0, 0); 13777 a1.DrawText(pAutonoteFont, 1, 0, 0, pQuestTable[v4-1], 0, 0, 0);//(&dword_722F10)[4 * v4], 0, 0, 0);
13778 v6 = pAutonoteFont->CalcTextHeight(v5, &a1, 1, 0); 13778 v6 = pAutonoteFont->CalcTextHeight(v5, &a1, 1, 0);
13779 v7 = a1.uFrameY + v6; 13779 v7 = a1.uFrameY + v6;
13780 if ( (signed int)(a1.uFrameY + v6) > (signed int)a1.uFrameHeight ) 13780 if ( (signed int)(a1.uFrameY + v6) > (signed int)a1.uFrameHeight )
13781 break; 13781 break;
13782 pRenderer->DrawTextureTransparent(0x64u, v7 + 12, pTextures_5064A0[10]); 13782 pRenderer->DrawTextureTransparent(100, v7 + 12, pTextures_5064A0[10]);
13783 ++v3; 13783 ++v3;
13784 a1.uFrameY = v7 + 24; 13784 a1.uFrameY = v7 + 24;
13785 } 13785 }
13786 } 13786 }
13787 13787
15526 if ( !window_SpeakInHouse ) 15526 if ( !window_SpeakInHouse )
15527 continue; 15527 continue;
15528 v10 = window_SpeakInHouse->ptr_1C; 15528 v10 = window_SpeakInHouse->ptr_1C;
15529 if ( (signed int)v10 >= 53 ) 15529 if ( (signed int)v10 >= 53 )
15530 continue; 15530 continue;
15531 v11 = pParty->field_3C._shop_ban_times[2 * (_DWORD)v10 + 1]; 15531 if ( pParty->field_3C._shop_ban_times[(signed int)v10] <=pParty->uTimePlayed )
15532 if ( !__PAIR__(v11, pParty->field_3C._shop_ban_times[2 * (_DWORD)v10])
15533 || v11 < SHIDWORD(pParty->uTimePlayed)
15534 || v11 <= SHIDWORD(pParty->uTimePlayed)
15535 && (unsigned int)pParty->field_3C._shop_ban_times[2 * (_DWORD)v10] <= LODWORD(pParty->uTimePlayed) )
15536 { 15532 {
15537 if ( (signed int)v10 < 53 ) 15533 if ( (signed int)v10 < 53 )
15538 { 15534 {
15539 pParty->field_3C._shop_ban_times[2 * (_DWORD)v10] = 0; 15535
15540 pParty->field_3C._shop_ban_times[2 * (_DWORD)v10 + 1] = 0; 15536
15537 pParty->field_3C._shop_ban_times[(signed int)v10] = 0;
15538
15541 } 15539 }
15542 continue; 15540 continue;
15543 } 15541 }
15544 //goto LABEL_142; 15542 //goto LABEL_142;
15545 pNumMessages = pMessageQueue_50CBD0->uNumMessages; 15543 pNumMessages = pMessageQueue_50CBD0->uNumMessages;
17698 dword_506544 = 0; 17696 dword_506544 = 0;
17699 dword_506548 = 0; 17697 dword_506548 = 0;
17700 dword_506520 = 0; 17698 dword_506520 = 0;
17701 dword_50651C = 0; 17699 dword_50651C = 0;
17702 dword_506528 = 0; 17700 dword_506528 = 0;
17703 v2 = (unsigned __int8 *)pPlayer->field_152; 17701 v2 = (unsigned __int8 *)pPlayer->_guilds_member_bits;
17704 do 17702 do
17705 { 17703 {
17706 v13 = (char *)pAwards[v1-1].pText;//dword_723E80_award_related[2 * v1]; 17704 v13 = (char *)pAwards[v1-1].pText;//dword_723E80_award_related[2 * v1];
17707 if ( (unsigned __int16)_449B57_test_bit(v2, v1) && v13 ) 17705 if ( (unsigned __int16)_449B57_test_bit(v2, v1) && v13 )
17708 { 17706 {