X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGame.h;h=56b65c257773b5510c9ec39ad6f4db4a3300398b;hb=bbf8873b80baf3cb468ac12b3f62b0938320fef1;hp=63bb0a6468bfcbf60863b6055005c8ab0a90edd4;hpb=ce5a0f8dd7372931070554e6a963d6e715ea69b7;p=lugaru.git

diff --git a/Source/Game.h b/Source/Game.h
index 63bb0a6..56b65c2 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;
@@ -118,13 +117,8 @@ class Game
 		float rotation,rotation2;
 		SkyBox skybox;
 		bool cameramode;
-		bool cameratogglekeydown;
-		bool chattogglekeydown;
 		int olddrawmode;
 		int drawmode;
-		bool drawmodetogglekeydown;
-		bool explodetogglekeydown;
-		bool detailtogglekeydown;
 		bool firstload;
 		bool oldbutton;
 
@@ -180,10 +174,6 @@ class Game
 		XYZ cameraloc;
 		float cameradist;
 
-		bool envtogglekeydown;
-		bool slomotogglekeydown;
-		bool texturesizetogglekeydown;
-		bool freezetogglekeydown;
 		int drawtoggle;
 
 		bool editorenabled;
@@ -219,12 +209,9 @@ class Game
 		bool displayblink;
 		int displayselected;
 		bool consolekeydown;
-		bool consoletogglekeydown;
 		float consoleblinkdelay;
 		bool consoleblink;
 		int consoleselected;
-		//int togglekey[140];
-		//float togglekeydelay[140];
 		bool autocam;
 
 		unsigned short crouchkey,jumpkey,forwardkey,chatkey,backkey,leftkey,rightkey,drawkey,throwkey,attackkey;
@@ -232,15 +219,28 @@ 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 FadeLoadingScreen(float howmuch);
 		void Dispose();
 		int DrawGLScene(StereoSide side);
 		void DrawGL();
+        //factored from Tick() -sf17k
+		void MenuTick();
+        void doTutorial();
+        void doDebugKeys();
+		void doJumpReversals();
+		void doAerialAcrobatics();
+		void doAttacks();
+		void doPlayerCollisions();
+		void doAI(int i);
+        //end factored
 		void Tick();
 		void TickOnce();
 		void TickOnceAfter();
@@ -296,11 +296,37 @@ class Game
 		void inputText(char* str, int* charselected, int* nb_chars);
 		void flash();
 		bool waiting;
-		bool mainmenutogglekeydown;
 		//int mainmenu;
 		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))