summaryrefslogtreecommitdiffstats
path: root/src/extras
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-05-27 23:59:03 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-05-27 23:59:03 +0200
commit7e4ef2162a027f2df96eddddc8d3fca7d5082df8 (patch)
tree6c7078b119efcedc89b1e7f08e344ed087cb89b1 /src/extras
parentMerge remote-tracking branch 'upstream/master' (diff)
parentbla (diff)
downloadre3-7e4ef2162a027f2df96eddddc8d3fca7d5082df8.tar
re3-7e4ef2162a027f2df96eddddc8d3fca7d5082df8.tar.gz
re3-7e4ef2162a027f2df96eddddc8d3fca7d5082df8.tar.bz2
re3-7e4ef2162a027f2df96eddddc8d3fca7d5082df8.tar.lz
re3-7e4ef2162a027f2df96eddddc8d3fca7d5082df8.tar.xz
re3-7e4ef2162a027f2df96eddddc8d3fca7d5082df8.tar.zst
re3-7e4ef2162a027f2df96eddddc8d3fca7d5082df8.zip
Diffstat (limited to '')
-rw-r--r--src/extras/debugmenu.cpp12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/extras/debugmenu.cpp b/src/extras/debugmenu.cpp
index f6b6eeb8..3a4c4175 100644
--- a/src/extras/debugmenu.cpp
+++ b/src/extras/debugmenu.cpp
@@ -1028,12 +1028,6 @@ DebugMenuProcess(void)
}
-#ifdef LIBRW
-#define CURRENTCAM (rw::engine->currentCamera)
-#else
-#define CURRENTCAM ((RwCamera*)RWSRCGLOBAL(curCamera))
-#endif
-
void
DebugMenuRender(void)
{
@@ -1048,7 +1042,7 @@ DebugMenuRender(void)
RwRenderStateSet(rwRENDERSTATEFOGENABLE, 0);
RwRenderStateSet(rwRENDERSTATECULLMODE, (void*)rwCULLMODECULLNONE);
- RwCamera *cam = CURRENTCAM;
+ RwCamera *cam = RwCameraGetCurrentCamera();
screenWidth = RwRasterGetWidth(RwCameraGetRaster(cam));
screenHeight = RwRasterGetHeight(RwCameraGetRaster(cam));
@@ -1080,7 +1074,7 @@ drawArrow(RwRect r, int direction, int style)
static RwImVertexIndex indices[] = { 0, 1, 2, 2, 1, 3 };
static RwIm2DVertex arrowVerts[4];
- RwCamera *cam = CURRENTCAM;
+ RwCamera *cam = RwCameraGetCurrentCamera();
float recipz = 1.0f/RwCameraGetNearClipPlane(cam);
int width = RwRasterGetWidth(arrow);
@@ -1183,7 +1177,7 @@ drawMouse(void)
static RwIm2DVertex vertices[4];
RwIm2DVertex *vert;
RwCamera *cam;
- cam = CURRENTCAM;
+ cam = RwCameraGetCurrentCamera();
float x = mouseX;
float y = mouseY;
float w = RwRasterGetWidth(cursor);