Mercurial > mm7

comparison VideoPlayer.cpp @ 506:9b4bdf6089af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 26 Feb 2013 18:48:05 +0600
parents 5b6e2021c6fe
children 59713bb36033
comparison
equal deleted inserted replaced
505:81410c3feebc 506:9b4bdf6089af
11 #include "GUIWindow.h" 11 #include "GUIWindow.h"
12 #include "Allocator.h" 12 #include "Allocator.h"
13 #include "Time.h" 13 #include "Time.h"
14 #include "Log.h" 14 #include "Log.h"
15 15
16 #include "MM7.h"
16 #include "mm7_data.h" 17 #include "mm7_data.h"
17 18
18 19
19 VideoPlayer *pVideoPlayer = nullptr; 20 VideoPlayer *pVideoPlayer = nullptr;
20 21
1121 { 1122 {
1122 bGameoverLoop = 1; 1123 bGameoverLoop = 1;
1123 sub_4BD8B5(); 1124 sub_4BD8B5();
1124 window_SpeakInHouse->Release(); 1125 window_SpeakInHouse->Release();
1125 pParty->uFlags &= 0xFFFFFFFDu; 1126 pParty->uFlags &= 0xFFFFFFFDu;
1126 if ( EnterHouse((enum HOUSE_TYPE)165) ) 1127 if ( EnterHouse(HOUSE_BODY_GUILD_ERATHIA) )
1127 { 1128 {
1128 pAudioPlayer->PlaySound(SOUND_Invalid, 0, 0, -1, 0, 0, 0, 0); 1129 pAudioPlayer->PlaySound(SOUND_Invalid, 0, 0, -1, 0, 0, 0, 0);
1129 window_SpeakInHouse = GUIWindow::Create(0, 0, 640, 480, WINDOW_HouseInterior, 165, 0); 1130 window_SpeakInHouse = GUIWindow::Create(0, 0, 640, 480, WINDOW_HouseInterior, 165, 0);
1130 window_SpeakInHouse->CreateButton(0x3Du, 0x1A8u, 0x1Fu, 0, 2, 94, 0x6Eu, 1u, 0x31u, "", 0); 1131 window_SpeakInHouse->CreateButton(0x3Du, 0x1A8u, 0x1Fu, 0, 2, 94, 0x6Eu, 1u, 0x31u, "", 0);
1131 window_SpeakInHouse->CreateButton(0xB1u, 0x1A8u, 0x1Fu, 0, 2, 94, 0x6Eu, 2u, 0x32u, "", 0); 1132 window_SpeakInHouse->CreateButton(0xB1u, 0x1A8u, 0x1Fu, 0, 2, 94, 0x6Eu, 2u, 0x32u, "", 0);