Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

New viewport number now passed to SetViewportMode() as an argument.

Browse source
This commit is contained in:
latimerius 2002-05-23 22:22:35 +00:00
parent 535fffa78a
commit 50301b2eaf
2 changed files with 15 additions and 16 deletions

4
src/ui/interface.cpp
View file

@ -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;

27
src/ui/ui.cpp
View file

@ -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 */