diff VideoPlayer.cpp @ 506:9b4bdf6089af

Слияние
author Ritor1
date Tue, 26 Feb 2013 18:48:05 +0600
parents 5b6e2021c6fe
children 59713bb36033
line wrap: on
line diff
--- a/VideoPlayer.cpp	Tue Feb 26 18:47:30 2013 +0600
+++ b/VideoPlayer.cpp	Tue Feb 26 18:48:05 2013 +0600
@@ -13,6 +13,7 @@
 #include "Time.h"
 #include "Log.h"
 
+#include "MM7.h"
 #include "mm7_data.h"
 
 
@@ -1123,7 +1124,7 @@
     sub_4BD8B5();
     window_SpeakInHouse->Release();
     pParty->uFlags &= 0xFFFFFFFDu;
-    if ( EnterHouse((enum HOUSE_TYPE)165) )
+    if ( EnterHouse(HOUSE_BODY_GUILD_ERATHIA) )
     {
       pAudioPlayer->PlaySound(SOUND_Invalid, 0, 0, -1, 0, 0, 0, 0);
       window_SpeakInHouse = GUIWindow::Create(0, 0, 640, 480, WINDOW_HouseInterior, 165, 0);