Mercurial > mm7

comparison UIHouses.cpp @ 1033:3a5c8df8381d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* UI cleans and moves * Deleted many junk global variables.
author Nomad
date Tue, 21 May 2013 23:44:51 +0200
parents 3413ad40cc88
children 7f8be9f9769e 39f42990698f
comparison
equal deleted inserted replaced
1031:f93d17337113 1033:3a5c8df8381d
2095 { 2095 {
2096 v5 = &pMonsterStats->pInfos[word_F8B1A0]; 2096 v5 = &pMonsterStats->pInfos[word_F8B1A0];
2097 v6 = TargetColor(0xFFu, 0xFFu, 0xFFu); 2097 v6 = TargetColor(0xFFu, 0xFFu, 0xFFu);
2098 v7 = v5->pName; 2098 v7 = v5->pName;
2099 v8 = TargetColor(0xFFu, 0xFFu, 0x9Bu); 2099 v8 = TargetColor(0xFFu, 0xFFu, 0x9Bu);
2100 sprintf(pTmpBuf, &byte_4F0F98, v8, v7, v6); 2100 sprintf(pTmpBuf, "\f%05d%s\f%05d", v8, v7, v6);
2101 sprintf(pTmpBuf2, dword_F8B1A4, pTmpBuf, 100 * v5->uLevel); 2101 sprintf(pTmpBuf2, dword_F8B1A4, pTmpBuf, 100 * v5->uLevel);
2102 current_npc_text = pTmpBuf2; 2102 current_npc_text = pTmpBuf2;
2103 memcpy(&a1, pDialogueWindow, sizeof(a1)); 2103 memcpy(&a1, pDialogueWindow, sizeof(a1));
2104 w.uFrameWidth = 458; 2104 w.uFrameWidth = 458;
2105 w.uFrameZ = 457; 2105 w.uFrameZ = 457;
2121 case HOUSE_DIALOGUE_TOWNHALL_100: 2121 case HOUSE_DIALOGUE_TOWNHALL_100:
2122 { 2122 {
2123 v0 = window_SpeakInHouse; 2123 v0 = window_SpeakInHouse;
2124 if ( window_SpeakInHouse->field_40 == 1 ) 2124 if ( window_SpeakInHouse->field_40 == 1 )
2125 { 2125 {
2126 sprintf(pTmpBuf, "%s\n%s", pGlobalTXT_LocalizationStrings[606], pGlobalTXT_LocalizationStrings[112]); 2126 sprintf(pTmpBuf, "%s\n%s", pGlobalTXT_LocalizationStrings[606], pGlobalTXT_LocalizationStrings[112]); // "Pay" "How Much?"
2127 _this.DrawTitleText(pFontArrus, 0, 0x92u, v30, pTmpBuf, 3u); 2127 _this.DrawTitleText(pFontArrus, 0, 0x92u, v30, pTmpBuf, 3u);
2128 _this.DrawTitleText(pFontArrus, 0, 0xBAu, v28, (const char *)pKeyActionMap->pPressedKeysBuffer, 3u); 2128 _this.DrawTitleText(pFontArrus, 0, 0xBAu, v28, (const char *)pKeyActionMap->pPressedKeysBuffer, 3);
2129 v3 = pFontArrus; 2129 v3 = pFontArrus;
2130 v4 = pFontArrus->GetLineWidth((const char *)pKeyActionMap->pPressedKeysBuffer); 2130 v4 = pFontArrus->GetLineWidth((const char *)pKeyActionMap->pPressedKeysBuffer);
2131 _this.DrawFlashingInputCursor(v4 / 2 + 80, 185, v3); 2131 _this.DrawFlashingInputCursor(v4 / 2 + 80, 185, v3);
2132 return; 2132 return;
2133 } 2133 }
2135 { 2135 {
2136 v1 = atoi((const char *)pKeyActionMap->pPressedKeysBuffer); 2136 v1 = atoi((const char *)pKeyActionMap->pPressedKeysBuffer);
2137 v2 = v1; 2137 v2 = v1;
2138 if ( v1 <= 0 ) 2138 if ( v1 <= 0 )
2139 { 2139 {
2140 //LABEL_8:
2141 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); 2140 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
2142 /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
2143 {
2144 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = UIMSG_Escape;
2145 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = 1;
2146 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
2147 ++pMessageQueue_50CBD0->uNumMessages;
2148 }*/
2149 return; 2141 return;
2150 } 2142 }
2151 if ( v1 > pParty->uNumGold ) 2143 if ( v1 > pParty->uNumGold )
2152 { 2144 {
2153 PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_NotEnoughMoney_TrainingSuccessful); 2145 PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_NotEnoughMoney_TrainingSuccessful);
2175 break; 2167 break;
2176 } 2168 }
2177 } 2169 }
2178 return; 2170 return;
2179 } 2171 }
2180 // F8B19C: using guessed type int dword_F8B19C; 2172
2181 // F8B1A0: using guessed type __int16 word_F8B1A0; 2173
2182 2174
2183 //----- (004B7D7E) -------------------------------------------------------- 2175 //----- (004B7D7E) --------------------------------------------------------
2184 void __cdecl BankDialog() 2176 void __cdecl BankDialog()
2185 { 2177 {
2186 GUIWindow *v0; // eax@4 2178 GUIWindow *v0; // eax@4