Mercurial > mm7

comparison UI/UIHouses.cpp @ 2450:90349b8048a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove VideoPlayer.cpp/.h
author Ritor1
date Fri, 25 Jul 2014 14:17:57 +0600
parents f4af3b203f65
children 2a8010d99cf8
comparison
equal deleted inserted replaced
2447:45dcf81c5b1c 2450:90349b8048a5
23 #include "..\GUIFont.h" 23 #include "..\GUIFont.h"
24 #include "..\Overlays.h" 24 #include "..\Overlays.h"
25 #include "..\Outdoor.h" 25 #include "..\Outdoor.h"
26 #include "..\Outdoor_stuff.h" 26 #include "..\Outdoor_stuff.h"
27 #include "..\AudioPlayer.h" 27 #include "..\AudioPlayer.h"
28 #include "..\VideoPlayer.h" 28 #include "..\MediaPlayer.h"
29 #include "..\Monsters.h" 29 #include "..\Monsters.h"
30 #include "..\Viewport.h" 30 #include "..\Viewport.h"
31 #include "..\Keyboard.h" 31 #include "..\Keyboard.h"
32 #include "..\MapInfo.h" 32 #include "..\MapInfo.h"
33 #include "..\Log.h" 33 #include "..\Log.h"
891 PrepareHouse(uHouseID); 891 PrepareHouse(uHouseID);
892 v18 = 1; 892 v18 = 1;
893 uTextureID_right_panel_loop = uTextureID_right_panel; 893 uTextureID_right_panel_loop = uTextureID_right_panel;
894 if ( uNumDialogueNPCPortraits == 1 ) 894 if ( uNumDialogueNPCPortraits == 1 )
895 pDialogueNPCCount = 1; 895 pDialogueNPCCount = 1;
896 pVideoPlayer->OpenHouseMovie(pAnimatedRooms[uCurrentHouse_Animation].video_name, 1u); 896 pMediaPlayer->OpenHouseMovie(pAnimatedRooms[uCurrentHouse_Animation].video_name, 1u);
897 dword_5C35D4 = 1; 897 dword_5C35D4 = 1;
898 if ( (signed int)uHouseID < 139 || (signed int)uHouseID > 172 ) 898 if ( (signed int)uHouseID < 139 || (signed int)uHouseID > 172 )
899 { 899 {
900 if ( (signed int)uHouseID >= HOUSE_STABLES_HARMONDALE && (signed int)uHouseID <= 73 && !IsTravelAvailable(uHouseID - HOUSE_STABLES_HARMONDALE) ) 900 if ( (signed int)uHouseID >= HOUSE_STABLES_HARMONDALE && (signed int)uHouseID <= 73 && !IsTravelAvailable(uHouseID - HOUSE_STABLES_HARMONDALE) )
901 { 901 {
2057 Party::TakeGold(pPriceRoom); 2057 Party::TakeGold(pPriceRoom);
2058 PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_NotEnoughMoney_TrainingSuccessful); 2058 PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_NotEnoughMoney_TrainingSuccessful);
2059 dialog_menu_id = HOUSE_DIALOGUE_NULL; 2059 dialog_menu_id = HOUSE_DIALOGUE_NULL;
2060 HouseDialogPressCloseBtn(); 2060 HouseDialogPressCloseBtn();
2061 GetHouseGoodbyeSpeech(); 2061 GetHouseGoodbyeSpeech();
2062 pVideoPlayer->Unload(); 2062 pMediaPlayer->Unload();
2063 /*if ( pMessageQueue_50CBD0->uNumMessages ) 2063 /*if ( pMessageQueue_50CBD0->uNumMessages )
2064 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; 2064 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
2065 pMessageQueue_50CBD0->pMessages[0].eType = UIMSG_RentRoom; 2065 pMessageQueue_50CBD0->pMessages[0].eType = UIMSG_RentRoom;
2066 pMessageQueue_50CBD0->pMessages[0].param = (int)window_SpeakInHouse->ptr_1C;//107 2066 pMessageQueue_50CBD0->pMessages[0].param = (int)window_SpeakInHouse->ptr_1C;//107
2067 pMessageQueue_50CBD0->pMessages[0].field_8 = 1; 2067 pMessageQueue_50CBD0->pMessages[0].field_8 = 1;
3327 3327
3328 switch(dialog_menu_id) 3328 switch(dialog_menu_id)
3329 { 3329 {
3330 case -1: 3330 case -1:
3331 _4B4224_UpdateNPCTopics((int)((char *)pDialogueNPCCount - 1)); 3331 _4B4224_UpdateNPCTopics((int)((char *)pDialogueNPCCount - 1));
3332 pVideoPlayer->_4BF5B2(); 3332 pMediaPlayer->_4BF5B2();
3333 break; 3333 break;
3334 3334
3335 case HOUSE_DIALOGUE_SHOP_DISPLAY_EQUIPMENT: 3335 case HOUSE_DIALOGUE_SHOP_DISPLAY_EQUIPMENT:
3336 case HOUSE_DIALOGUE_LEARN_SKILLS: 3336 case HOUSE_DIALOGUE_LEARN_SKILLS:
3337 case HOUSE_DIALOGUE_TAVERN_ARCOMAGE_MAIN: 3337 case HOUSE_DIALOGUE_TAVERN_ARCOMAGE_MAIN:
3338 pVideoPlayer->_4BF5B2(); 3338 pMediaPlayer->_4BF5B2();
3339 UI_CreateEndConversationButton(); 3339 UI_CreateEndConversationButton();
3340 dialog_menu_id = HOUSE_DIALOGUE_MAIN; 3340 dialog_menu_id = HOUSE_DIALOGUE_MAIN;
3341 InitializaDialogueOptions(in_current_building_type); 3341 InitializaDialogueOptions(in_current_building_type);
3342 break; 3342 break;
3343 3343
3350 break; 3350 break;
3351 3351
3352 case HOUSE_DIALOGUE_TAVERN_ARCOMAGE_RULES: 3352 case HOUSE_DIALOGUE_TAVERN_ARCOMAGE_RULES:
3353 case HOUSE_DIALOGUE_TAVERN_ARCOMAGE_VICTORY_CONDITIONS: 3353 case HOUSE_DIALOGUE_TAVERN_ARCOMAGE_VICTORY_CONDITIONS:
3354 case HOUSE_DIALOGUE_TAVERN_ARCOMAGE_RESULT: 3354 case HOUSE_DIALOGUE_TAVERN_ARCOMAGE_RESULT:
3355 pVideoPlayer->_4BF5B2(); 3355 pMediaPlayer->_4BF5B2();
3356 UI_CreateEndConversationButton(); 3356 UI_CreateEndConversationButton();
3357 dialog_menu_id = HOUSE_DIALOGUE_TAVERN_ARCOMAGE_MAIN; 3357 dialog_menu_id = HOUSE_DIALOGUE_TAVERN_ARCOMAGE_MAIN;
3358 InitializaDialogueOptions_Tavern(in_current_building_type); 3358 InitializaDialogueOptions_Tavern(in_current_building_type);
3359 break; 3359 break;
3360 3360
3378 pNPCPortraits_y[uNumDialogueNPCPortraits - 1][i], 3378 pNPCPortraits_y[uNumDialogueNPCPortraits - 1][i],
3379 63, 73, 1, 0, UIMSG_ClickHouseNPCPortrait, i, 0, byte_591180[i].data(), 0, 0, 0); 3379 63, 73, 1, 0, UIMSG_ClickHouseNPCPortrait, i, 0, byte_591180[i].data(), 0, 0, 0);
3380 } 3380 }
3381 } 3381 }
3382 3382
3383 pVideoPlayer->_4BF5B2(); 3383 pMediaPlayer->_4BF5B2();
3384 break; 3384 break;
3385 3385
3386 default: 3386 default:
3387 pVideoPlayer->_4BF5B2(); 3387 pMediaPlayer->_4BF5B2();
3388 dialog_menu_id = HOUSE_DIALOGUE_MAIN; 3388 dialog_menu_id = HOUSE_DIALOGUE_MAIN;
3389 InitializaDialogueOptions(in_current_building_type); 3389 InitializaDialogueOptions(in_current_building_type);
3390 break; 3390 break;
3391 } 3391 }
3392 return 1; 3392 return 1;