X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=Source%2FGame.h;h=337b0bfe71f82fa6986559ef995872705a2ccde2;hb=54cbb28b51da68b2280068a41e7964f78dec6858;hp=92a6945f7ad290109030dbee4d474976881b7fbd;hpb=6bd4d8e827e8e47b78db4a1f236cba2eed7032b4;p=lugaru.git

diff --git a/Source/Game.h b/Source/Game.h
index 92a6945..337b0bf 100644
--- a/Source/Game.h
+++ b/Source/Game.h
@@ -61,13 +61,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern GLuint rabbittexture;
 
+struct TextureInfo;
+
 class Game
 {
 	public:
-		typedef std::map<std::string, GLuint> TextureList;
-		typedef std::map<GLuint, std::string> GLTextureList;
-		typedef TextureList::iterator TexIter;
-		static TextureList textures;
+		static std::vector<TextureInfo> textures;
 
 		GLuint terraintexture;
 		GLuint terraintexture2;
@@ -90,13 +89,8 @@ class Game
 		float selectedlong[100];
 		float offsetx[100];
 		float offsety[100];
-		float movex[100];
-		float movey[100];
-		float transition;
-		int anim;
 		int selected;
 		int keyselect;
-		int loaddistrib;
 		int indemo;
 
 		bool won;
@@ -145,8 +139,6 @@ class Game
 		int campaignchoosenext[50];
 		int campaignnumnext[50];
 		int campaignnextlevel[50][10];
-		int campaignchoicesmade;
-		int campaignchoices[5000];
 		int campaignlocationx[50];
 		int campaignlocationy[50];
 		int campaignchoicenum;
@@ -220,14 +212,19 @@ class Game
 
 		static void LoadTexture(const char *fileName, GLuint *textureid,int mipmap, bool hasalpha);
 		static void LoadTextureSave(const char *fileName, GLuint *textureid,int mipmap,GLubyte *array, int *skinsize);
+		static void LoadTextureData(const char *fileName, GLuint *textureid,int mipmap, bool hasalpha);
+		static void LoadTextureSaveData(const char *fileName, GLuint *textureid,int mipmap,GLubyte *array, int *skinsize, bool reload);
 		void LoadSave(const char *fileName, GLuint *textureid,bool mipmap,GLubyte *array, int *skinsize);
-		bool AddClothes(const char *fileName, GLuint *textureid,bool mipmap,GLubyte *array, int *skinsize);
+        bool AddClothes(const char *fileName, GLubyte *array);
 		void InitGame();
+		void LoadScreenTexture();
 		void LoadStuff();
 		void LoadingScreen();
+		void LoadCampaign();
 		void FadeLoadingScreen(float howmuch);
 		void Dispose();
 		int DrawGLScene(StereoSide side);
+		void DrawMenu();
 		void DrawGL();
         //factored from Tick() -sf17k
 		void MenuTick();
@@ -298,6 +295,33 @@ class Game
 		Account* accountactive;
 };
 
+//keeps track of which textures are loaded
+//TODO: delete them properly
+struct TextureInfo{
+    bool isLoaded;
+    bool isSkin;
+    const char* fileName;
+    GLuint* ptextureid;
+    int mipmap;
+    bool hasalpha;
+    GLubyte* array;
+    int* skinsize;
+
+    void load(){
+        if(isSkin)
+            Game::LoadTextureSaveData(fileName,ptextureid,mipmap,array,skinsize,isLoaded);
+        else
+            Game::LoadTextureData(fileName,ptextureid,mipmap,hasalpha);
+        isLoaded=true;
+    }
+    TextureInfo(const char *_fileName, GLuint *_ptextureid,int _mipmap, bool _hasalpha):
+        isLoaded(false), isSkin(false), array(NULL), skinsize(NULL),
+        fileName(_fileName), ptextureid(_ptextureid), mipmap(_mipmap), hasalpha(_hasalpha) { }
+    TextureInfo(const char *_fileName, GLuint *_ptextureid, int _mipmap, GLubyte *_array, int *_skinsize):
+        isLoaded(false), isSkin(true), hasalpha(false),
+        fileName(_fileName), ptextureid(_ptextureid), mipmap(_mipmap), array(_array), skinsize(_skinsize) { }
+};
+
 #ifndef __forceinline
 #  ifdef __GNUC__
 #    define __forceinline inline __attribute__((always_inline))