Mercurial > might-and-magic-trilogy
comparison Game.cpp @ 42:7071e4688db6
Слияние
author | Ritor1 |
---|---|
date | Fri, 19 Oct 2012 23:29:04 +0600 |
parents | f4450ff595fe |
children | 916bec351934 bcc051713d20 |
comparison
equal
deleted
inserted
replaced
41:fd64b06a39a8 | 42:7071e4688db6 |
---|---|
255 dword_6BE364_game_settings_1 |= 0x80; | 255 dword_6BE364_game_settings_1 |= 0x80; |
256 dword_6BE340 = 2; | 256 dword_6BE340 = 2; |
257 uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions = 0; | 257 uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions = 0; |
258 if (pAsyncMouse) | 258 if (pAsyncMouse) |
259 pAsyncMouse->Resume(); | 259 pAsyncMouse->Resume(); |
260 if ( LOBYTE(pGame->pKeyboardInstance->bUsingAsynKeyboard) && pAsyncKeyboard ) | 260 if (pGame->pKeyboardInstance->bUsingAsynKeyboard && pAsyncKeyboard ) |
261 pAsyncKeyboard->Resume(); | 261 pAsyncKeyboard->Resume(); |
262 if ( pRenderer->pRenderD3D ) | 262 if ( pRenderer->pRenderD3D ) |
263 pGame->pVisInstance->_4C1A02(); | 263 pGame->pVisInstance->_4C1A02(); |
264 bLoadinga = 0; | 264 bLoadinga = 0; |
265 do | 265 do |
269 if ( Msg.message == WM_QUIT ) | 269 if ( Msg.message == WM_QUIT ) |
270 Game_DeinitializeAndTerminate(0); | 270 Game_DeinitializeAndTerminate(0); |
271 TranslateMessage(&Msg); | 271 TranslateMessage(&Msg); |
272 DispatchMessageA(&Msg); | 272 DispatchMessageA(&Msg); |
273 } | 273 } |
274 if ( BYTE1(dword_6BE364_game_settings_1) & 1 ) | 274 if (dword_6BE364_game_settings_1 & 0x0100 ) |
275 { | 275 { |
276 WaitMessage(); | 276 WaitMessage(); |
277 continue; | 277 continue; |
278 } | 278 } |
279 pGame->_44EEA7(); | 279 pGame->_44EEA7(); |