griffkid4/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

xres/yres is now g_xres/g_yres and in Prometheus.h

Browse Source 
This was SVN commit r72.
This commit is contained in:
Gee 2003-11-24 02:17:09 +00:00
parent b095ca8176
commit 79055b7d88
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/terrain/Camera.cpp
View File

@ -11,8 +11,7 @@
//***********************************************************
#include "Camera.H"
extern int xres, yres;
#include "../ps/Prometheus.h"
CCamera::CCamera ()
{

2
source/terrain/Renderer.cpp
View File

@ -128,7 +128,7 @@ void CRenderer::RenderTerrain (CTerrain *terrain, CCamera *camera)
glLoadMatrixf (gl_proj);
SViewPort vp = camera->GetViewPort();
glViewport (vp.m_X, vp.m_Y, vp.m_Width, vp.m_Height);
//glViewport (vp.m_X, vp.m_Y, vp.m_Width, vp.m_Height);
if (g_WireFrame)
glPolygonMode (GL_FRONT_AND_BACK, GL_LINE);

7
source/terrain/terrainMain.cpp
View File

@ -1,6 +1,7 @@
#include "Matrix3D.H"
#include "Renderer.H"
#include "Terrain.H"
#include "../ps/Prometheus.h"
#include "time.h"
#include "wsdl.h"
@ -40,8 +41,6 @@ Handle AlphaMaps[NUM_ALPHA_MAPS];
int mouse_x=50, mouse_y=50;
extern int xres, yres;
void terr_init()
{
@ -68,12 +67,12 @@ g_FrameCounter++;
right.Normalize ();
up.Normalize ();
if (mouse_x >= xres-2)
if (mouse_x >= g_xres-2)
g_Camera.m_Orientation.Translate (right);
if (mouse_x <= 3)
g_Camera.m_Orientation.Translate (right*-1);
if (mouse_y >= yres-2)
if (mouse_y >= g_yres-2)
g_Camera.m_Orientation.Translate (up);
if (mouse_y <= 3)
g_Camera.m_Orientation.Translate (up*-1);