mm7: UI/UIHouses.cpp comparison

comparison UI/UIHouses.cpp @ 1588:e6ac4919b22c

小谢懈褟薪懈械

author	Ritor1
date	Mon, 09 Sep 2013 09:13:40 +0600
parents	b42e6f35e03d 6d759814a817
children	f408fbf3d9cc

comparison

equal deleted inserted replaced

-:b42e6f35e03d
+:e6ac4919b22c
 case BuildingType_House:
 case BuildingType_Jail:
 break;
 default:
-assert(false && "Invalid enumeration value");
+Error("Invalid enumeration value: %u", type);
 }
 /*  if ( a1 > 13 )
 {
 if ( a1 > 22 )
 			}
 		++pIcons_LOD->uTexturePacksCount;
 		if ( !pIcons_LOD->uNumPrevLoadedFiles )
 			pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles;
 		switch (pParty->alignment)
-			{
+{
 		case PartyAlignment_Good:    sprintf(pContainer, "evt%02d-b", const_2()); break;
 		case PartyAlignment_Neutral: sprintf(pContainer, "evt%02d", const_2()); break;
 		case PartyAlignment_Evil:    sprintf(pContainer, "evt%02d-c", const_2()); break;
-		default: assert(false);
+default: Error("Invalid alignment type: %u", pParty->alignment);
-			}
+}
 		v17 = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE);
 		pDialogueNPCCount = 0;
 		pTexture_Dialogue_Background = &pIcons_LOD->pTextures[v17];
 		uTextureID_right_panel_loop = uTextureID_right_panel;
 }
 //----- (004B7D7E) --------------------------------------------------------
 void  BankDialog()
 {
-GUIWindow *v0; // eax@4
+int entered_sum; // eax@19
-//int v1; // ecx@5
+unsigned int takes_sum; // esi@19
-int v2; // eax@6
+unsigned __int16 pColorText; // ax@27
-unsigned int v3; // esi@6
+GUIWindow bank_window; // [sp+Ch] [bp-5Ch]@1
-GUIFont *v4; // ST10_4@12
-int v5; // eax@12
+memcpy(&bank_window, window_SpeakInHouse, sizeof(bank_window));
-int v6; // eax@19
+bank_window.uFrameX = 483;
-unsigned int v7; // esi@19
+bank_window.uFrameWidth = 148;
-unsigned __int16 v8; // ax@27
+bank_window.uFrameZ = 334;
-unsigned __int16 v9; // ax@29
+sprintf(pTmpBuf.data(), "%s: %d", pGlobalTXT_LocalizationStrings[25], pParty->uNumGoldInBank);//拎豚眈
-char *v10; // [sp-8h] [bp-70h]@11
+bank_window.DrawTitleText(pFontArrus, 0, 220, TargetColor(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3);
-char *v11; // [sp-4h] [bp-6Ch]@11
-GUIWindow _this; // [sp+Ch] [bp-5Ch]@1
-__int16 v13[2]; // [sp+60h] [bp-8h]@1
-__int16 v14[2]; // [sp+64h] [bp-4h]@1
-memcpy(&_this, window_SpeakInHouse, sizeof(_this));
-_this.uFrameX = 483;
-_this.uFrameWidth = 148;
-_this.uFrameZ = 334;
-*(int *)v13 = TargetColor(0xFFu, 0xFFu, 0xFFu);
-*(int *)v14 = TargetColor(0xFFu, 0xFFu, 0x9Bu);
-sprintf(pTmpBuf.data(), "%s: %d", pGlobalTXT_LocalizationStrings[25], pParty->uNumGoldInBank);
-_this.DrawTitleText(pFontArrus, 0, 0xDCu, v14[0], pTmpBuf.data(), 3u);
 switch(dialog_menu_id)
 {
-	case HOUSE_DIALOGUE_MAIN:
+case HOUSE_DIALOGUE_MAIN:
-		{
+{
-		v8 = v14[0];
+pColorText = TargetColor(0xFFu, 0xFFu, 0x9Bu);
-		if ( pDialogueWindow->pCurrentPosActiveItem != 2 )
+if ( pDialogueWindow->pCurrentPosActiveItem != 2 )
-			v8 = v13[0];
+pColorText = TargetColor(0xFFu, 0xFFu, 0xFFu);
-		_this.DrawTitleText(pFontArrus, 0, 0x92u, v8, pGlobalTXT_LocalizationStrings[60], 3u);
+bank_window.DrawTitleText(pFontArrus, 0, 146, pColorText, pGlobalTXT_LocalizationStrings[60], 3);
-		v9 = v14[0];
+pColorText = TargetColor(0xFFu, 0xFFu, 0x9Bu);
-		if ( pDialogueWindow->pCurrentPosActiveItem != 3 )
+if ( pDialogueWindow->pCurrentPosActiveItem != 3 )
-			v9 = v13[0];
+pColorText = TargetColor(0xFFu, 0xFFu, 0xFFu);
-		_this.DrawTitleText(pFontArrus, 0, 0xB0u, v9, pGlobalTXT_LocalizationStrings[244], 3u);
+bank_window.DrawTitleText(pFontArrus, 0, 176, pColorText, pGlobalTXT_LocalizationStrings[244], 3);
-		break;
+break;
-		}
+}
-	case HOUSE_DIALOGUE_BANK_7:
+case HOUSE_DIALOGUE_BANK_PUT_GOLD:
-		{
+{
-		v0 = window_SpeakInHouse;
+if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_IN_PROGRESS)
-		if ( window_SpeakInHouse->receives_keyboard_input_2 != WINDOW_INPUT_IN_PROGRESS)
+{
-		{
+sprintf(pTmpBuf.data(), "%s\n%s", pGlobalTXT_LocalizationStrings[60], pGlobalTXT_LocalizationStrings[112]);//"项腩骅螯" "殃铍�?"
-			if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_CONFIRMED)
+bank_window.DrawTitleText(pFontArrus, 0, 146, TargetColor(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3);
-			{
+bank_window.DrawTitleText(pFontArrus, 0, 186, TargetColor(0xFFu, 0xFFu, 0xFFu), (const char *)pKeyActionMap->pPressedKeysBuffer, 3);
-				v6 = atoi((const char *)pKeyActionMap->pPressedKeysBuffer);
+bank_window.DrawFlashingInputCursor(pFontArrus->GetLineWidth((const char *)pKeyActionMap->pPressedKeysBuffer) / 2 + 80, 185, pFontArrus);
-				v7 = v6;
+return;
-				if ( !v6 )
+}
-				{
+if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_CONFIRMED)
-					pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
+{
-					return;
+entered_sum = atoi((const char *)pKeyActionMap->pPressedKeysBuffer);
-				}
+takes_sum = entered_sum;
-				if ( v6 > pParty->uNumGold )
+if ( !entered_sum )
-				{
+{
-					PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_NotEnoughMoney_TrainingSuccessful);
+pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
-					v7 = pParty->uNumGold;
+return;
-				}
+}
-				if ( v7 )
+if ( entered_sum > pParty->uNumGold )
-				{
+{
-					Party::TakeGold(v7);
+PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_NotEnoughMoney_TrainingSuccessful);
-					pParty->uNumGoldInBank += v7;
+takes_sum = pParty->uNumGold;
-					if ( uActiveCharacter )
+}
-						pPlayers[uActiveCharacter]->PlaySound(SPEECH_81, 0);
+if ( takes_sum )
-				}
+{
-				v0 = window_SpeakInHouse;
+Party::TakeGold(takes_sum);
-				v0->receives_keyboard_input_2 = WINDOW_INPUT_NONE;
+pParty->uNumGoldInBank += takes_sum;
-				pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
+if ( uActiveCharacter )
-				return;
+pPlayers[uActiveCharacter]->PlaySound(SPEECH_81, 0);
-			}
+}
-			if (window_SpeakInHouse->receives_keyboard_input_2 != WINDOW_INPUT_CANCELLED)
+window_SpeakInHouse->receives_keyboard_input_2 = WINDOW_INPUT_NONE;
-				return;
+pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
-			v0->receives_keyboard_input_2 = WINDOW_INPUT_NONE;
+return;
-			pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
+}
-			return;
+if (window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_CANCELLED)
-		}
+{
-		v11 = pGlobalTXT_LocalizationStrings[112];
+window_SpeakInHouse->receives_keyboard_input_2 = WINDOW_INPUT_NONE;
-		v10 = pGlobalTXT_LocalizationStrings[60];
+pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
-		sprintf(pTmpBuf.data(), "%s\n%s", v10, v11);
+}
-		_this.DrawTitleText(pFontArrus, 0, 0x92u, v14[0], pTmpBuf.data(), 3u);
+return;
-		_this.DrawTitleText(pFontArrus, 0, 0xBAu, v13[0], (const char *)pKeyActionMap->pPressedKeysBuffer, 3u);
+}
-		v4 = pFontArrus;
+case HOUSE_DIALOGUE_BANK_GET_GOLD:
-		v5 = pFontArrus->GetLineWidth((const char *)pKeyActionMap->pPressedKeysBuffer);
+{
-		_this.DrawFlashingInputCursor(v5 / 2 + 80, 185, v4);
+if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_IN_PROGRESS)
-		break;
+{
-		}
+sprintfex(pTmpBuf.data(), "%s\n%s", pGlobalTXT_LocalizationStrings[244], pGlobalTXT_LocalizationStrings[112]);//"秧�螯" "殃铍�?"
+bank_window.DrawTitleText(pFontArrus, 0, 146, TargetColor(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3);
-	case HOUSE_DIALOGUE_BANK_8:
+bank_window.DrawTitleText(pFontArrus, 0, 186, TargetColor(0xFFu, 0xFFu, 0xFFu), (const char *)pKeyActionMap->pPressedKeysBuffer, 3);
-		{
+bank_window.DrawFlashingInputCursor(pFontArrus->GetLineWidth((const char *)pKeyActionMap->pPressedKeysBuffer) / 2 + 80, 185, pFontArrus);
-		v0 = window_SpeakInHouse;
+return;
-		if ( window_SpeakInHouse->receives_keyboard_input_2 != WINDOW_INPUT_IN_PROGRESS)
+}
-		{
+if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_CONFIRMED)
-			if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_CONFIRMED)
+{
-			{
+window_SpeakInHouse->receives_keyboard_input_2 = WINDOW_INPUT_NONE;
-				window_SpeakInHouse->receives_keyboard_input_2 = WINDOW_INPUT_NONE;
+entered_sum = atoi((const char *)pKeyActionMap->pPressedKeysBuffer);
-				v2 = atoi((const char *)pKeyActionMap->pPressedKeysBuffer);
+takes_sum = entered_sum;
-				v3 = v2;
+if ( entered_sum )
-				if ( v2 )
+{
-				{
+if ( entered_sum > pParty->uNumGoldInBank )
-					if ( v2 > pParty->uNumGoldInBank )
+{
-					{
+PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_NotEnoughMoney_TrainingSuccessful);
-						PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_NotEnoughMoney_TrainingSuccessful);
+takes_sum = pParty->uNumGoldInBank;
-						v3 = pParty->uNumGoldInBank;
+}
-					}
+if ( takes_sum )
-					if ( v3 )
+{
-					{
+Party::SetGold(pParty->uNumGold + takes_sum);
-						Party::SetGold(pParty->uNumGold + v3);
+pParty->uNumGoldInBank -= takes_sum;
-						pParty->uNumGoldInBank -= v3;
+}
-					}
+}
-				}
+window_SpeakInHouse->receives_keyboard_input_2 = WINDOW_INPUT_NONE;
-v0->receives_keyboard_input_2 = WINDOW_INPUT_NONE;
+pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
-				pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
+return;
-				return;
+}
-			}
+if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_CANCELLED)
-			if ( window_SpeakInHouse->receives_keyboard_input_2 != WINDOW_INPUT_CANCELLED)
+{
-				return;
+window_SpeakInHouse->receives_keyboard_input_2 = WINDOW_INPUT_NONE;
-			v0->receives_keyboard_input_2 = WINDOW_INPUT_NONE;
+pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
-			pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
+}
-			return;
+return;
-		}
+}
-		v11 = pGlobalTXT_LocalizationStrings[112];
+default:
-		v10 = pGlobalTXT_LocalizationStrings[244];
+{
-		sprintfex(pTmpBuf.data(), "%s\n%s", v10, v11);
+break;
-		_this.DrawTitleText(pFontArrus, 0, 0x92u, v14[0], pTmpBuf.data(), 3u);
+}
-		_this.DrawTitleText(pFontArrus, 0, 0xBAu, v13[0], (const char *)pKeyActionMap->pPressedKeysBuffer, 3u);
-		v4 = pFontArrus;
-		v5 = pFontArrus->GetLineWidth((const char *)pKeyActionMap->pPressedKeysBuffer);
-		_this.DrawFlashingInputCursor(v5 / 2 + 80, 185, v4);
-		return;
-		break;
-		}
-	default:
-		{
-		break;
-		}
 }
 }
 // F8B19C: using guessed type int dword_F8B19C;
 //----- (004B8285) --------------------------------------------------------
 v15 = "";
 v16 = (GUIButton *)pInString;
 goto LABEL_49;
 }
 if ( v28 != 10 )
-goto LABEL_41;
+{
+v15 = "";
+goto LABEL_49;
+}
 }
 else
 {
 if ( v17 == 24 )
 {

Mercurial > mm7

comparison UI/UIHouses.cpp @ 1588:e6ac4919b22c