Mercurial > mm7
diff UI/UIHouses.cpp @ 2402:8cee51ce4382
included directx 11
author | Ritor1 |
---|---|
date | Mon, 14 Jul 2014 10:03:44 +0600 |
parents | 6a7309a847ea |
children | f4af3b203f65 |
line wrap: on
line diff
--- a/UI/UIHouses.cpp Thu Jul 10 01:48:39 2014 +0200 +++ b/UI/UIHouses.cpp Mon Jul 14 10:03:44 2014 +0600 @@ -1291,7 +1291,7 @@ } case HOUSE_DIALOGUE_TAVERN_ARCOMAGE_RESULT: { - pMessageQueue_50CBD0->AddMessage(UIMSG_PlayArcomage, 0, 0); + pMessageQueue_50CBD0->AddGUIMessage(UIMSG_PlayArcomage, 0, 0); dialog_menu_id = HOUSE_DIALOGUE_TAVERN_ARCOMAGE_RESULT; break; } @@ -1536,7 +1536,7 @@ { ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2);//"У вас не хватает золота" PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_Greeting_2); - pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); + pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 1, 0); return; } @@ -1606,7 +1606,7 @@ sqrt(3.1415926); while ( HouseDialogPressCloseBtn() ) ; - pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); + pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 0, 0); return; } else @@ -1731,7 +1731,7 @@ v2 = atoi(pKeyActionMap->pPressedKeysBuffer); if ( v1 <= 0 ) { - pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); + pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 1, 0); return; } if ( v1 > pParty->uNumGold ) @@ -1751,7 +1751,7 @@ if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_CANCELLED) { window_SpeakInHouse->receives_keyboard_input_2 = WINDOW_INPUT_NONE; - pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); + pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 1, 0); } break; } @@ -1805,7 +1805,7 @@ takes_sum = entered_sum; if ( !entered_sum ) { - pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); + pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 1, 0); return; } if ( entered_sum > pParty->uNumGold ) @@ -1821,13 +1821,13 @@ pPlayers[uActiveCharacter]->PlaySound(SPEECH_81, 0); } window_SpeakInHouse->receives_keyboard_input_2 = WINDOW_INPUT_NONE; - pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); + pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 1, 0); return; } if (window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_CANCELLED) { window_SpeakInHouse->receives_keyboard_input_2 = WINDOW_INPUT_NONE; - pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); + pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 1, 0); } return; } @@ -1860,13 +1860,13 @@ } } window_SpeakInHouse->receives_keyboard_input_2 = WINDOW_INPUT_NONE; - pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); + pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 1, 0); return; } if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_CANCELLED) { window_SpeakInHouse->receives_keyboard_input_2 = WINDOW_INPUT_NONE; - pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); + pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 1, 0); } return; } @@ -2062,14 +2062,14 @@ pMessageQueue_50CBD0->pMessages[0].param = (int)window_SpeakInHouse->ptr_1C;//107 pMessageQueue_50CBD0->pMessages[0].field_8 = 1; ++pMessageQueue_50CBD0->uNumMessages;*/ - pMessageQueue_50CBD0->AddMessage(UIMSG_RentRoom, (int)window_SpeakInHouse->ptr_1C, 1); + pMessageQueue_50CBD0->AddGUIMessage(UIMSG_RentRoom, (int)window_SpeakInHouse->ptr_1C, 1); window_SpeakInHouse->Release(); window_SpeakInHouse = 0; return; } ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2);//У вас не хватает золота PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_Goodbye); - pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); + pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 1, 0); break; } @@ -2143,7 +2143,7 @@ ShowStatusBarString(pGlobalTXT_LocalizationStrings[140], 2);//Вы уже купили еду! if ( uActiveCharacter ) pPlayers[uActiveCharacter]->PlaySound(SPEECH_67, 0); - pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); + pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 1, 0); return; } if ( pParty->uNumGold >= pPriceFood ) @@ -2151,12 +2151,12 @@ Party::TakeGold(pPriceFood); pParty->uNumFoodRations = (signed __int64)p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].fPriceMultiplier; PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_Greeting_2); - pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); + pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 1, 0); return; } ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2); // "You don't have enough gold" PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_Goodbye); - pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); + pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 1, 0); break; } @@ -2284,7 +2284,7 @@ { ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2);//"У вас не хватает золота" PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_NotEnoughMoney_TrainingSuccessful); - pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); + pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 1, 0); return; } Party::TakeGold(pPrice); @@ -2303,7 +2303,7 @@ pAudioPlayer->PlaySound((SoundID)(SOUND_GoldReceived|0x2), -1, 0, -1, 0, 0, 0, 0); pPlayers[uActiveCharacter]->PlaySound(SPEECH_82, 0); pOtherOverlayList->_4418B1(20, uActiveCharacter + 99, 0, 65536); - pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); + pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 1, 0); return; } if ( (unsigned int)pPlayers[uActiveCharacter]->pConditions[Condition_Zombie] | v35 ) @@ -2316,7 +2316,7 @@ pAudioPlayer->PlaySound((SoundID)(SOUND_GoldReceived|0x2), -1, 0, -1, 0, 0, 0, 0); pPlayers[uActiveCharacter]->PlaySound(SPEECH_82, 0); pOtherOverlayList->_4418B1(20, uActiveCharacter + 99, 0, 65536); - pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); + pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 1, 0); return; } pPlayers[uActiveCharacter]->uPrevFace = pPlayers[uActiveCharacter]->uCurrentFace; @@ -2333,7 +2333,7 @@ pAudioPlayer->PlaySound((SoundID)(SOUND_GoldReceived|0x2), -1, 0, -1, 0, 0, 0, 0); pPlayers[uActiveCharacter]->PlaySound(SPEECH_82, 0); pOtherOverlayList->_4418B1(20, uActiveCharacter + 99, 0, 65536); - pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); + pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 1, 0); return; } //--------------------------------------------------- @@ -2388,12 +2388,12 @@ ++byte_F8B1EF[uActiveCharacter]; pPlayers[uActiveCharacter]->PlaySound(SPEECH_83, 0); ShowStatusBarString(pGlobalTXT_LocalizationStrings[527], 2); // "Thank You!" - pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); + pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 1, 0); return; } ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2);//"У вас не хватает золота" PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_NotEnoughMoney_TrainingSuccessful); - pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); + pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 1, 0); return; } //------------------------------------------------ @@ -2607,12 +2607,12 @@ sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[430], pPlayers[uActiveCharacter]->pName, pPlayers[uActiveCharacter]->uLevel, pPlayers[uActiveCharacter]->uLevel / 10 + 5);// // "%s is now Level %lu and has earned %lu Skill Points!" ShowStatusBarString(pTmpBuf.data(), 2); - pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); + pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 1, 0); return; } ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2);// "You don't have enough gold" PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, (HouseSoundID)4); - pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); + pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 1, 0); return; } sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[538], (unsigned int)(v5 - pPlayers[uActiveCharacter]->uExperience), pPlayers[uActiveCharacter]->uLevel + 1);// @@ -2628,7 +2628,7 @@ } training_dialog_window.DrawTitleText(pFontArrus, 0, v36, Color16(0xE1u, 0xCDu, 0x23u), pTmpBuf.data(), 3); PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, (HouseSoundID)3); - pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); + pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 1, 0); return; } } @@ -2836,7 +2836,7 @@ { v5 = 0; } - pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, v5); + pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 1, v5); return; // void func }