diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-02-26 10:07:32 +0100 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-02-26 10:07:32 +0100 |
| commit | f6910d35f702e7767e6b52d5e7b3edd80fe85f96 (patch) | |
| tree | 3968c943b721813f6880765e11a8ae2ade07da23 /src/skel/win | |
| parent | rename error strings to RELCS (diff) | |
| parent | PoliceRadio -> PolRadio (original name) (diff) | |
| download | re3-f6910d35f702e7767e6b52d5e7b3edd80fe85f96.tar re3-f6910d35f702e7767e6b52d5e7b3edd80fe85f96.tar.gz re3-f6910d35f702e7767e6b52d5e7b3edd80fe85f96.tar.bz2 re3-f6910d35f702e7767e6b52d5e7b3edd80fe85f96.tar.lz re3-f6910d35f702e7767e6b52d5e7b3edd80fe85f96.tar.xz re3-f6910d35f702e7767e6b52d5e7b3edd80fe85f96.tar.zst re3-f6910d35f702e7767e6b52d5e7b3edd80fe85f96.zip | |
Diffstat (limited to 'src/skel/win')
| -rw-r--r-- | src/skel/win/win.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp index 9fdfb1e7..9597e9c2 100644 --- a/src/skel/win/win.cpp +++ b/src/skel/win/win.cpp @@ -915,14 +915,14 @@ void WaitForState(FILTER_STATE State) */ void HandleGraphEvent(void) { - LONG evCode, evParam1, evParam2; + LONG evCode; + LONG_PTR evParam1, evParam2; HRESULT hr=S_OK; ASSERT(pME != nil); // Process all queued events - while (SUCCEEDED(pME->GetEvent(&evCode, (LONG_PTR *)&evParam1, - (LONG_PTR *)&evParam2, 0))) + while (SUCCEEDED(pME->GetEvent(&evCode, &evParam1, &evParam2, 0))) { // Free memory associated with callback, since we're not using it hr = pME->FreeEventParams(evCode, evParam1, evParam2); @@ -2273,7 +2273,7 @@ WinMain(HINSTANCE instance, case GS_START_UP: { #ifdef NO_MOVIES - gGameState = GS_INIT_ONCE; + gGameState = gbNoMovies ? GS_INIT_ONCE : GS_INIT_LOGO_MPEG; #else gGameState = GS_INIT_LOGO_MPEG; #endif @@ -2314,8 +2314,11 @@ WinMain(HINSTANCE instance, case GS_INIT_INTRO_MPEG: { -#ifndef NO_MOVIES +#ifdef NO_MOVIES + if (!gbNoMovies) +#endif CloseClip(); +#ifndef FIX_BUGS CoUninitialize(); #endif @@ -2353,8 +2356,11 @@ WinMain(HINSTANCE instance, case GS_INIT_ONCE: { -#ifndef NO_MOVIES +#ifdef NO_MOVIES + if (!gbNoMovies) +#endif CloseClip(); +#ifndef FIX_BUGS CoUninitialize(); #endif |