mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove global g_xres and x_yres

Browse Source 
Instead query g_VideoMode where needed. As both g_xres and g_yres aren't
global anymore remove static from UpdateRenderer. While at it use more
desicriptive names: GetXRes -> GetWindowWidth, GetYRes ->
GetWindowHeight.

This reduces the amount of variables tracking width and height by one
each.

Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
This commit is contained in:
Ralph Sennhauser
2026-07-07 19:03:08 +02:00
parent b588b62304
commit 99bbc24265
17 changed files with 50 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/CameraController.cpp
+5 -6
View File
@@ -32,6 +32,7 @@
#include "ps/Game.h"
#include "ps/Globals.h"
#include "ps/Hotkey.h"
#include "ps/VideoMode.h"
#include "ps/World.h"
#include "renderer/Renderer.h"
#include "renderer/SceneRenderer.h"
@@ -47,8 +48,6 @@
#include <functional>
#include <string>
extern int g_xres, g_yres;
// Maximum distance outside the edge of the map that the camera's
// focus point can be moved
static const float CAMERA_EDGE_MARGIN = 2.0f * TERRAIN_TILE_SIZE;
@@ -105,8 +104,8 @@ CCameraController::CCameraController(CCamera& camera)
SViewPort vp;
vp.m_X = 0;
vp.m_Y = 0;
vp.m_Width = g_xres;
vp.m_Height = g_yres;
vp.m_Width = g_VideoMode.GetWindowWidth();
vp.m_Height = g_VideoMode.GetWindowHeight();
m_Camera.SetViewPort(vp);
SetCameraProjection();
@@ -206,12 +205,12 @@ void CCameraController::Update(const float deltaRealTime)
if (g_mouse_active && m_ViewScrollMouseDetectDistance > 0)
{
if (g_mouse_x >= g_xres - m_ViewScrollMouseDetectDistance && g_mouse_x < g_xres)
if (g_mouse_x >= g_VideoMode.GetWindowWidth() - m_ViewScrollMouseDetectDistance && g_mouse_x < g_VideoMode.GetWindowWidth())
moveRightward += m_ViewScrollSpeed * deltaRealTime;
else if (g_mouse_x < m_ViewScrollMouseDetectDistance && g_mouse_x >= 0)
moveRightward -= m_ViewScrollSpeed * deltaRealTime;
if (g_mouse_y >= g_yres - m_ViewScrollMouseDetectDistance && g_mouse_y < g_yres)
if (g_mouse_y >= g_VideoMode.GetWindowHeight() - m_ViewScrollMouseDetectDistance && g_mouse_y < g_VideoMode.GetWindowHeight())
moveForward -= m_ViewScrollSpeed * deltaRealTime;
else if (g_mouse_y < m_ViewScrollMouseDetectDistance && g_mouse_y >= 0)
moveForward += m_ViewScrollSpeed * deltaRealTime;