From 5791d5e0688a8448139ad894877e71cb128f31c0 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Sun, 4 Mar 2012 20:13:47 +0000 Subject: [PATCH] Clamp ud.camerahoriz after EVENT_DISPLAYROOMS (instead of before). git-svn-id: https://svn.eduke32.com/eduke32@2410 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/game.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index fd9644df2..c8e319a9d 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -3623,12 +3623,11 @@ void G_DrawRooms(int32_t snum, int32_t smoothratio) break; } - if (ud.camerahoriz > HORIZ_MAX) ud.camerahoriz = HORIZ_MAX; - else if (ud.camerahoriz < HORIZ_MIN) ud.camerahoriz = HORIZ_MIN; - if (apScriptGameEvent[EVENT_DISPLAYROOMS]) VM_OnEvent(EVENT_DISPLAYROOMS, g_player[screenpeek].ps->i, screenpeek, -1); + ud.camerahoriz = clamp(ud.camerahoriz, HORIZ_MIN, HORIZ_MAX); + G_HandleMirror(ud.camera.x, ud.camera.y, ud.camera.z, ud.cameraang, ud.camerahoriz, smoothratio); G_SE40(smoothratio);