major refactor of texture system

[lugaru.git] / Source / Game.cpp

diff --git a/Source/Game.cpp b/Source/Game.cpp
index 2beac5a342b9d21beff4582ae6b9318a3fdebab2..debf51a872ea7cf40714da3f7967b693593e4253 100644 (file)
--- a/Source/Game.cpp
+++ b/Source/Game.cpp
@@ -27,18 +27,16 @@ float dialoguetime;
 int dialoguegonethrough[20];
 
 namespace Game{
-    GLuint terraintexture = 0;
-    GLuint terraintexture2 = 0;
-    GLuint terraintexture3 = 0;
+    Texture terraintexture;
+    Texture terraintexture2;
+    Texture loadscreentexture;
+    Texture Maparrowtexture;
+    Texture Mapboxtexture;
+    Texture Mapcircletexture;
+    Texture cursortexture;
     GLuint screentexture = 0;
     GLuint screentexture2 = 0;
-    GLuint logotexture = 0;
-    GLuint loadscreentexture = 0;
-    GLuint Maparrowtexture = 0;
-    GLuint Mapboxtexture = 0;
-    GLuint Mapcircletexture = 0;
-    GLuint cursortexture = 0;
-    GLuint Mainmenuitems[10] = {};
+    Texture Mainmenuitems[10];
 
     int selected = 0;
     int keyselect = 0;
@@ -60,7 +58,7 @@ namespace Game{
     bool cameramode = 0;
     bool firstload = 0;
 
-       GLuint hawktexture = 0;
+       Texture hawktexture;
        float hawkyaw = 0;
        float hawkcalldelay = 0;
     float leveltime = 0;