no message

This was SVN commit r43.

source/terrain/Renderer.cpp

@@ -23,7 +23,7 @@ CRenderer::~CRenderer ()
 }
 
 	
-bool CRenderer::Initialize (HWND hwnd, int width, int height, int depth)
+bool CRenderer::Initialize (int width, int height, int depth)
 {
 	m_Width = width;
 	m_Height = height;

source/terrain/Renderer.h

@@ -1,7 +1,6 @@
 #ifndef RENDERER_H
 #define RENDERER_H
 
-#include <windows.h>
 #include "ogl.h"
 
 #include "Terrain.H"
@@ -15,7 +14,7 @@ class CRenderer
 		CRenderer();
 		~CRenderer();
 
-		bool Initialize (HWND hwnd, int width, int height, int depth);
+		bool Initialize (int width, int height, int depth);
 		void Shutdown ();
 
 		void RenderTerrain (CTerrain *terrain, CCamera *camera);

source/terrain/Types.h

@@ -11,28 +11,8 @@
 #ifndef TYPES_H
 #define TYPES_H
 
-#include <windows.h>
 #include <stdio.h>
 
-//basic return types
-enum FRESULT
-{
-	R_OK = 0,
-	R_FAIL,				//use if nothing else matches the return type
-	
-	R_BADPARAMS,		//one or more of the parameters were invalid
-
-	R_NOMEMORY,			//not enough memory for an operation
-
-	R_FILE_NOOPEN,		//file could not be opened
-	R_FILE_NOREAD,		//file could not be read
-	R_FILE_INVALID		//file is corrupt or not supported
-};
-
-//string related
-#define MAX_NAME_LENGTH		(50)
-#define MAX_PATH_LENGTH		(100)
-
 //color structures
 struct SColor4ub
 {
@@ -51,14 +31,9 @@ struct SColor4f
 };
 
 //all the major classes:
-class CBitmap;
 
 class CCamera;
 
-class CDiesel3DVertex;
-
-class CGameResource;
-
 class CEngine;
 class CEntity;
 
@@ -78,7 +53,6 @@ class CPlane;
 class CRenderer;
 
 class CTerrain;
-class CTexture;
 
 class CVector3D;
 

source/terrain/terrainMain.cpp

@@ -1,5 +1,3 @@
-#include <windows.h>
-
 #include "Matrix3D.H"
 #include "Renderer.H"
 #include "Terrain.H"
@@ -8,9 +6,9 @@
 #include "wsdl.h"
 #include "tex.h"
 
+// TODO: fix scrolling hack - framerate independent, use SDL
+#include "win.h"	// REMOVEME
 
-HWND InitializeGame (HINSTANCE hInstance);
-void DestroyGame();
 
 void InitScene ();
 void InitResources ();
@@ -19,8 +17,6 @@ void RenderScene ();
 extern bool keys[256];
 
 
-HWND				GameWindow;
-
 CMatrix3D			g_WorldMat;
 CRenderer			g_Renderer;
 CTerrain			g_Terrain;
@@ -50,7 +46,7 @@ extern int xres, yres;
 
 void terr_init()
 {
-	g_Renderer.Initialize (GameWindow, 1280, 1024, 32);
+	g_Renderer.Initialize (1280, 1024, 32);
 
 	InitResources ();
 	InitScene ();