comparison Render.cpp @ 1633:384a6b9d1333

Merge
author Nomad
date Tue, 17 Sep 2013 12:40:37 +0200
parents 8094f1706b1f c24e91e9a108
children 2c71fa8913d2
comparison
equal deleted inserted replaced
1632:69ab7593e7af 1633:384a6b9d1333
8468 pMouse->SetCurrentCursorBitmap(); 8468 pMouse->SetCurrentCursorBitmap();
8469 if ( pRenderer->bWindowMode ) 8469 if ( pRenderer->bWindowMode )
8470 { 8470 {
8471 InvalidateRect(0, 0, 0); 8471 InvalidateRect(0, 0, 0);
8472 MoveWindow(hWnd, uWindowX, uWindowY, uWindowWidth, uWindowHeight, 0); 8472 MoveWindow(hWnd, uWindowX, uWindowY, uWindowWidth, uWindowHeight, 0);
8473 ShowWindow(hWnd, 1); 8473 ShowWindow(hWnd, SW_SHOWNORMAL);
8474 } 8474 }
8475 pMouse->bActive = 1; 8475 pMouse->bActive = 1;
8476 if ( pVideoPlayer->AnyMovieLoaded() ) 8476 if ( pVideoPlayer->AnyMovieLoaded() )
8477 pVideoPlayer->SelectMovieType(); 8477 pVideoPlayer->SelectMovieType();
8478 if ( BYTE1(dword_6BE364_game_settings_1) & 8 ) 8478 if ( BYTE1(dword_6BE364_game_settings_1) & 8 )