summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-02 10:08:58 +0200
committeraap <aap@papnet.eu>2020-05-02 10:08:58 +0200
commit339365806a80802d237f535807652ad496f488b3 (patch)
tree6f7fe8ffa00d18effbfccc828d9a1fce082815fb
parentCreate unique names for artifacs (diff)
downloadre3-339365806a80802d237f535807652ad496f488b3.tar
re3-339365806a80802d237f535807652ad496f488b3.tar.gz
re3-339365806a80802d237f535807652ad496f488b3.tar.bz2
re3-339365806a80802d237f535807652ad496f488b3.tar.lz
re3-339365806a80802d237f535807652ad496f488b3.tar.xz
re3-339365806a80802d237f535807652ad496f488b3.tar.zst
re3-339365806a80802d237f535807652ad496f488b3.zip
m---------librw0
-rw-r--r--src/core/re3.cpp4
-rw-r--r--src/fakerw/fake.cpp4
3 files changed, 6 insertions, 2 deletions
diff --git a/librw b/librw
-Subproject dfedaee353ccbf4dcfcfd3eb4024e0dd8e9b4b6
+Subproject b3ad490d1be3c1f41b416d3ceeaff3453bd2d28
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index 7bb18688..5ef3c036 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -26,6 +26,7 @@
#include "PlayerPed.h"
#include "Radar.h"
#include "debugmenu.h"
+#include "Frontend.h"
#include <list>
@@ -325,6 +326,9 @@ DebugMenuPopulate(void)
#ifdef LIBRW
DebugMenuAddVarBool8("Render", "PS2 Alpha test Emu", &gPS2alphaTest, nil);
#endif
+ DebugMenuAddVarBool8("Render", "Frame limiter", &FrontEndMenuManager.m_PrefsFrameLimiter, nil);
+ DebugMenuAddVarBool8("Render", "VSynch", &FrontEndMenuManager.m_PrefsVsync, nil);
+ DebugMenuAddVar("Render", "Max FPS", &RsGlobal.maxFPS, nil, 1, 1, 1000, nil);
DebugMenuAddVarBool8("Debug", "Draw hud", &CHud::m_Wants_To_Draw_Hud, nil);
DebugMenuAddVarBool8("Debug", "Edit on", &CSceneEdit::m_bEditOn, nil);
diff --git a/src/fakerw/fake.cpp b/src/fakerw/fake.cpp
index d2547815..9cee41c7 100644
--- a/src/fakerw/fake.cpp
+++ b/src/fakerw/fake.cpp
@@ -126,8 +126,8 @@ rwFrameList *rwFrameListStreamRead(RwStream *stream, rwFrameList *fl) { return f
RwCamera *RwCameraBeginUpdate(RwCamera * camera) { camera->beginUpdate(); return camera; }
RwCamera *RwCameraEndUpdate(RwCamera * camera) { camera->endUpdate(); return camera; }
RwCamera *RwCameraClear(RwCamera * camera, RwRGBA * colour, RwInt32 clearMode) { camera->clear(colour, clearMode); return camera; }
-// WARNING: ignored arguments
-RwCamera *RwCameraShowRaster(RwCamera * camera, void *pDev, RwUInt32 flags) { camera->showRaster(); return camera; }
+// WARNING: ignored argument
+RwCamera *RwCameraShowRaster(RwCamera * camera, void *pDev, RwUInt32 flags) { camera->showRaster(flags); return camera; }
RwBool RwCameraDestroy(RwCamera * camera) { camera->destroy(); return true; }
RwCamera *RwCameraCreate(void) { return rw::Camera::create(); }
RwCamera *RwCameraClone(RwCamera * camera) { return camera->clone(); }