summaryrefslogtreecommitdiffstats
path: root/src/skel
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-09-29 21:53:12 +0200
committereray orçunus <erayorcunus@gmail.com>2020-09-30 01:41:42 +0200
commitf71953077d2412c4542e616cc9748217dfe046c7 (patch)
tree3a3adac3c9d143686d198fff3360f8a9945cff67 /src/skel
parentMerge pull request #727 from erorcun/miami (diff)
downloadre3-f71953077d2412c4542e616cc9748217dfe046c7.tar
re3-f71953077d2412c4542e616cc9748217dfe046c7.tar.gz
re3-f71953077d2412c4542e616cc9748217dfe046c7.tar.bz2
re3-f71953077d2412c4542e616cc9748217dfe046c7.tar.lz
re3-f71953077d2412c4542e616cc9748217dfe046c7.tar.xz
re3-f71953077d2412c4542e616cc9748217dfe046c7.tar.zst
re3-f71953077d2412c4542e616cc9748217dfe046c7.zip
Diffstat (limited to '')
-rw-r--r--src/skel/glfw/glfw.cpp4
-rw-r--r--src/skel/win/win.cpp6
2 files changed, 6 insertions, 4 deletions
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index 26208ebf..b40130c4 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -1736,7 +1736,6 @@ main(int argc, char *argv[])
#else
LoadingScreen(nil, nil, "loadsc0");
#endif
-
if ( !CGame::InitialiseOnceAfterRW() )
RsGlobal.quit = TRUE;
@@ -1748,7 +1747,7 @@ main(int argc, char *argv[])
#endif
break;
}
-
+#ifndef PS2_MENU
case GS_INIT_FRONTEND:
{
LoadingScreen(nil, nil, "loadsc0");
@@ -1769,7 +1768,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 cc106e39..d8e54d80 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -2508,9 +2508,11 @@ WinMain(HINSTANCE instance,
{
if ( gGameState == GS_PLAYING_GAME )
CGame::ShutDown();
+#ifndef MASTER
else if ( gGameState == GS_ANIMVIEWER )
CAnimViewer::Shutdown();
-
+#endif
+
CTimer::Stop();
if ( FrontEndMenuManager.m_bFirstTime == true )
@@ -2533,8 +2535,10 @@ WinMain(HINSTANCE instance,
if ( gGameState == GS_PLAYING_GAME )
CGame::ShutDown();
+#ifndef MASTER
else if ( gGameState == GS_ANIMVIEWER )
CAnimViewer::Shutdown();
+#endif
DMAudio.Terminate();