diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-07-06 15:38:00 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-07-06 15:38:00 +0200 |
| commit | 70fa4ab79c331bd20b872ca4bc578248d5f42971 (patch) | |
| tree | 090f3c726dce81ce3be63ffc250673dc81c35e0b /src/skel | |
| parent | fixes from master, menu helper text (diff) | |
| download | re3-70fa4ab79c331bd20b872ca4bc578248d5f42971.tar re3-70fa4ab79c331bd20b872ca4bc578248d5f42971.tar.gz re3-70fa4ab79c331bd20b872ca4bc578248d5f42971.tar.bz2 re3-70fa4ab79c331bd20b872ca4bc578248d5f42971.tar.lz re3-70fa4ab79c331bd20b872ca4bc578248d5f42971.tar.xz re3-70fa4ab79c331bd20b872ca4bc578248d5f42971.tar.zst re3-70fa4ab79c331bd20b872ca4bc578248d5f42971.zip | |
Diffstat (limited to 'src/skel')
| -rw-r--r-- | src/skel/glfw/glfw.cpp | 8 | ||||
| -rw-r--r-- | src/skel/win/win.cpp | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp index 5a2d2667..d01e05b5 100644 --- a/src/skel/glfw/glfw.cpp +++ b/src/skel/glfw/glfw.cpp @@ -178,7 +178,11 @@ psCameraBeginUpdate(RwCamera *camera) void psCameraShowRaster(RwCamera *camera) { - if (FrontEndMenuManager.m_PrefsVsync) +#ifdef LEGACY_MENU_OPTIONS + if (FrontEndMenuManager.m_PrefsVsync || FrontEndMenuManager.m_bMenuActive) +#else + if (FrontEndMenuManager.m_PrefsFrameLimiter || FrontEndMenuManager.m_bMenuActive) +#endif RwCameraShowRaster(camera, PSGLOBAL(window), rwRASTERFLIPWAITVSYNC); else RwCameraShowRaster(camera, PSGLOBAL(window), rwRASTERFLIPDONTWAIT); @@ -1488,7 +1492,7 @@ main(int argc, char *argv[]) { CFileMgr::SetDirMyDocuments(); - int32 gta3set = CFileMgr::OpenFile("gta3.set", "r"); + int32 gta3set = CFileMgr::OpenFile("gta_vc.set", "r"); if ( gta3set ) { diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp index 77475ca5..e70a1054 100644 --- a/src/skel/win/win.cpp +++ b/src/skel/win/win.cpp @@ -223,7 +223,11 @@ psCameraBeginUpdate(RwCamera *camera) void psCameraShowRaster(RwCamera *camera) { - if (FrontEndMenuManager.m_PrefsVsync) +#ifdef LEGACY_MENU_OPTIONS + if (FrontEndMenuManager.m_PrefsVsync || FrontEndMenuManager.m_bMenuActive) +#else + if (FrontEndMenuManager.m_PrefsFrameLimiter || FrontEndMenuManager.m_bMenuActive) +#endif RwCameraShowRaster(camera, PSGLOBAL(window), rwRASTERFLIPWAITVSYNC); else RwCameraShowRaster(camera, PSGLOBAL(window), rwRASTERFLIPDONTWAIT); @@ -2073,7 +2077,7 @@ WinMain(HINSTANCE instance, { CFileMgr::SetDirMyDocuments(); - int32 gta3set = CFileMgr::OpenFile("gta3.set", "r"); + int32 gta3set = CFileMgr::OpenFile("gta_vc.set", "r"); if ( gta3set ) { |