From 50301b2eaf129c4070036a9fb9532021cc245891 Mon Sep 17 00:00:00 2001
From: latimerius <>
Date: Thu, 23 May 2002 22:22:35 +0000
Subject: [PATCH] New viewport number now passed to SetViewportMode() as an
argument.
---
src/ui/interface.cpp | 4 ++--
src/ui/ui.cpp | 27 +++++++++++++--------------
2 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index 7c502e63a..ad125ab33 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -408,7 +408,7 @@ local void UiToggleBigMap(void)
TheUI.MapArea.EndX=((VideoWidth/TileSizeX)*TileSizeX)-1;
TheUI.MapArea.EndY=((VideoHeight/TileSizeY)*TileSizeY)-1;
- SetViewportMode ();
+ SetViewportMode (TheUI.ViewportMode);
#else /* SPLIT_SCREEN_SUPPORT */
mapx=TheUI.MapX;
mapy=TheUI.MapY;
@@ -439,7 +439,7 @@ local void UiToggleBigMap(void)
TheUI.MapArea.EndX=mapex;
TheUI.MapArea.EndY=mapey;
- SetViewportMode ();
+ SetViewportMode (TheUI.ViewportMode);
#else /* SPLIT_SCREEN_SUPPORT */
TheUI.MapX=mapx;
TheUI.MapY=mapy;
diff --git a/src/ui/ui.cpp b/src/ui/ui.cpp
index bae8d01ed..8c664137e 100644
--- a/src/ui/ui.cpp
+++ b/src/ui/ui.cpp
@@ -110,8 +110,7 @@ global void InitUserInterface(const char *race_name)
#ifdef SPLIT_SCREEN_SUPPORT
TheUI.LastClickedVP = 0;
- TheUI.ViewportMode = VIEWPORT_SINGLE;
- SetViewportMode ();
+ SetViewportMode (VIEWPORT_SINGLE);
#else /* SPLIT_SCREEN_SUPPORT */
MapWidth=(TheUI.MapEndX-TheUI.MapX+TileSizeX)/TileSizeX;
MapHeight=(TheUI.MapEndY-TheUI.MapY+TileSizeY)/TileSizeY;
@@ -695,15 +694,14 @@ local void SetViewportModeQuad (void)
}
/**
-** Sets (calls geometry setup routines) for a new viewport mode.
-** The new mode's mode number has to be already stored in
-** TheUI.ViewportMode.
+** Sets up (calls geometry setup routines for) a new viewport mode.
**
-** FIXME: it would probably make more sense to pass the new vp mode's
-** number as an argument to SetViewportMode().
+** @param new_mode New mode's number.
*/
-global void SetViewportMode (void)
+global void SetViewportMode (ViewportMode new_mode)
{
+ TheUI.ViewportMode = new_mode;
+
switch (TheUI.ViewportMode) {
case VIEWPORT_SINGLE:
SetViewportModeSingle ();
@@ -741,12 +739,13 @@ global void SetViewportMode (void)
*/
global void CycleViewportMode (int step)
{
- TheUI.ViewportMode += step;
- if ((int )TheUI.ViewportMode >= NUM_VIEWPORT_MODES)
- TheUI.ViewportMode = 0;
- if ((int )TheUI.ViewportMode < 0)
- TheUI.ViewportMode = NUM_VIEWPORT_MODES - 1;
- SetViewportMode ();
+ int new_mode = (int )TheUI.ViewportMode + step;
+
+ if (new_mode >= NUM_VIEWPORT_MODES)
+ new_mode = 0;
+ if (new_mode < 0)
+ new_mode = NUM_VIEWPORT_MODES - 1;
+ SetViewportMode (new_mode);
}
#endif /* SPLIT_SCREEN_SUPPORT */