diff --git a/source/terrain/Camera.cpp b/source/terrain/Camera.cpp index 54f7be10a9..14e34e8530 100755 --- a/source/terrain/Camera.cpp +++ b/source/terrain/Camera.cpp @@ -11,8 +11,7 @@ //*********************************************************** #include "Camera.H" - -extern int xres, yres; +#include "../ps/Prometheus.h" CCamera::CCamera () { diff --git a/source/terrain/Renderer.cpp b/source/terrain/Renderer.cpp index dab5738e50..43782877c7 100755 --- a/source/terrain/Renderer.cpp +++ b/source/terrain/Renderer.cpp @@ -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); diff --git a/source/terrain/terrainMain.cpp b/source/terrain/terrainMain.cpp index 6418bf944b..11ea0f2c81 100755 --- a/source/terrain/terrainMain.cpp +++ b/source/terrain/terrainMain.cpp @@ -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);