diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-09-27 19:21:16 +0300 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-09-27 19:22:21 +0300 |
| commit | 70aac0f460a9e57956de00ae5d84d8bb4bf4643c (patch) | |
| tree | 92e3d8073b6e9e4ad8ae3ee7d8a2460c7e079cca /src/skel | |
| parent | 9b7642454006f4c6b93d57297f88b2899e3f0077 (diff) | |
Fixes: PS2/PS2-like menu, Hud, new sliding text found
Diffstat (limited to 'src/skel')
| -rw-r--r-- | src/skel/glfw/glfw.cpp | 3 | ||||
| -rw-r--r-- | src/skel/win/win.cpp | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp index d7feb885..b9dbf5ac 100644 --- a/src/skel/glfw/glfw.cpp +++ b/src/skel/glfw/glfw.cpp @@ -1721,7 +1721,6 @@ main(int argc, char *argv[]) #else LoadingScreen(nil, nil, "loadsc0"); #endif - if ( !CGame::InitialiseOnceAfterRW() ) RsGlobal.quit = TRUE; @@ -1734,6 +1733,7 @@ main(int argc, char *argv[]) break; } +#ifndef PS2_MENU case GS_INIT_FRONTEND: { LoadingScreen(nil, nil, "loadsc0"); @@ -1754,7 +1754,6 @@ main(int argc, char *argv[]) break; } -#ifndef PS2_MENU case GS_FRONTEND: { if(!glfwGetWindowAttrib(PSGLOBAL(window), GLFW_ICONIFIED)) diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp index 03eb0d09..119e666e 100644 --- a/src/skel/win/win.cpp +++ b/src/skel/win/win.cpp @@ -2513,8 +2513,10 @@ WinMain(HINSTANCE instance, { if ( gGameState == GS_PLAYING_GAME ) CGame::ShutDown(); +#ifndef MASTER else if ( gGameState == GS_ANIMVIEWER ) CAnimViewer::Shutdown(); +#endif CTimer::Stop(); @@ -2538,8 +2540,10 @@ WinMain(HINSTANCE instance, if ( gGameState == GS_PLAYING_GAME ) CGame::ShutDown(); +#ifndef MASTER else if ( gGameState == GS_ANIMVIEWER ) CAnimViewer::Shutdown(); +#endif DMAudio.Terminate(); |