diff UI/UIHouses.cpp @ 2450:90349b8048a5

remove VideoPlayer.cpp/.h
author Ritor1
date Fri, 25 Jul 2014 14:17:57 +0600
parents f4af3b203f65
children 2a8010d99cf8
line wrap: on
line diff
--- a/UI/UIHouses.cpp	Thu Jul 24 12:50:24 2014 +0600
+++ b/UI/UIHouses.cpp	Fri Jul 25 14:17:57 2014 +0600
@@ -25,7 +25,7 @@
 #include "..\Outdoor.h"
 #include "..\Outdoor_stuff.h"
 #include "..\AudioPlayer.h"
-#include "..\VideoPlayer.h"
+#include "..\MediaPlayer.h"
 #include "..\Monsters.h"
 #include "..\Viewport.h"
 #include "..\Keyboard.h"
@@ -893,7 +893,7 @@
 		uTextureID_right_panel_loop = uTextureID_right_panel;
 		if ( uNumDialogueNPCPortraits == 1 )
 			pDialogueNPCCount = 1;
-		pVideoPlayer->OpenHouseMovie(pAnimatedRooms[uCurrentHouse_Animation].video_name, 1u);
+		pMediaPlayer->OpenHouseMovie(pAnimatedRooms[uCurrentHouse_Animation].video_name, 1u);
 		dword_5C35D4 = 1;
 		if ( (signed int)uHouseID < 139 || (signed int)uHouseID > 172 )
         {
@@ -2059,7 +2059,7 @@
         dialog_menu_id = HOUSE_DIALOGUE_NULL;
         HouseDialogPressCloseBtn();
         GetHouseGoodbyeSpeech();
-        pVideoPlayer->Unload();
+        pMediaPlayer->Unload();
         /*if ( pMessageQueue_50CBD0->uNumMessages )
           pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
         pMessageQueue_50CBD0->pMessages[0].eType = UIMSG_RentRoom;
@@ -3329,13 +3329,13 @@
   {
     case -1:
       _4B4224_UpdateNPCTopics((int)((char *)pDialogueNPCCount - 1));
-      pVideoPlayer->_4BF5B2();
+      pMediaPlayer->_4BF5B2();
       break;
 
     case HOUSE_DIALOGUE_SHOP_DISPLAY_EQUIPMENT:
     case HOUSE_DIALOGUE_LEARN_SKILLS:
     case HOUSE_DIALOGUE_TAVERN_ARCOMAGE_MAIN:
-      pVideoPlayer->_4BF5B2();
+      pMediaPlayer->_4BF5B2();
       UI_CreateEndConversationButton();
       dialog_menu_id = HOUSE_DIALOGUE_MAIN;
       InitializaDialogueOptions(in_current_building_type);
@@ -3352,7 +3352,7 @@
     case HOUSE_DIALOGUE_TAVERN_ARCOMAGE_RULES:
     case HOUSE_DIALOGUE_TAVERN_ARCOMAGE_VICTORY_CONDITIONS:
     case HOUSE_DIALOGUE_TAVERN_ARCOMAGE_RESULT:
-      pVideoPlayer->_4BF5B2();
+      pMediaPlayer->_4BF5B2();
       UI_CreateEndConversationButton();
       dialog_menu_id = HOUSE_DIALOGUE_TAVERN_ARCOMAGE_MAIN;
       InitializaDialogueOptions_Tavern(in_current_building_type);
@@ -3380,11 +3380,11 @@
         }
       }
 
-      pVideoPlayer->_4BF5B2();
+      pMediaPlayer->_4BF5B2();
       break;
 
     default:
-      pVideoPlayer->_4BF5B2();
+      pMediaPlayer->_4BF5B2();
       dialog_menu_id = HOUSE_DIALOGUE_MAIN;
       InitializaDialogueOptions(in_current_building_type);
       break;