]> git.jsancho.org Git - lugaru.git/blobdiff - Source/GameInitDispose.cpp
projects / lugaru.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Make animation types an enum, move to a separate file
[lugaru.git] / Source / GameInitDispose.cpp
diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index 402c76113e8f21bb07c1814ba84994378d17986a..e936228c4ab54993ea905400284c8cc60c52511b 100644 (file)
--- a/Source/GameInitDispose.cpp
+++ b/Source/GameInitDispose.cpp
@@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "Game.h"
 #include "openal_wrapper.h"
+#include "Animation.h"
 
 extern float screenwidth,screenheight;
 extern float viewdistance;
@@ -37,7 +38,7 @@ extern int numsounds;
 extern OPENAL_SAMPLE   *samp[100];
 extern int channels[100];
 extern Terrain terrain;
-extern Sprites sprites;
+//extern Sprites sprites;
 extern int kTextureSize;
 extern float texdetail;
 extern float realtexdetail;
@@ -393,7 +394,8 @@ void Game::LoadTexture(const char *fileName, GLuint *textureid,int mipmap, bool
 
                glPixelStorei( GL_UNPACK_ALIGNMENT, 1 );
 
-               if(!*textureid)glGenTextures( 1, textureid );
+               if(!*textureid)
+                       glGenTextures( 1, textureid );
                glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
 
                glBindTexture( GL_TEXTURE_2D, *textureid);
@@ -401,20 +403,9 @@ void Game::LoadTexture(const char *fileName, GLuint *textureid,int mipmap, bool
                if(trilinear)if(mipmap)glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR );
                if(!trilinear)if(mipmap)glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST );
                if(!mipmap)glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
-
-               //glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture.sizeX, texture.sizeY, 0,
-               //          GL_BGRA_EXT, GL_UNSIGNED_INT_8_8_8_8_REV, texture.data);
-
-               //gluBuild2DMipmaps( GL_TEXTURE_2D, type, texture.sizeX, texture.sizeY, GL_BGRA_EXT, GL_UNSIGNED_INT_8_8_8_8_REV, texture.data );
-
+               
                gluBuild2DMipmaps( GL_TEXTURE_2D, type, texture.sizeX, texture.sizeY, type, GL_UNSIGNED_BYTE, texture.data );
-
-//             textures.insert(std::make_pair(fname, *textureid));
        }
-//     else
-//     {
-//             *textureid = it->second;
-//     }
 }
 
 void Game::LoadTextureSave(const char *fileName, GLuint *textureid,int mipmap,GLubyte *array, int *skinsize)
@@ -1338,19 +1329,19 @@ void Game::LoadStuff()
 
        LoadTexture(":Data:Textures:bodyprint.png",&terrain.bodyprinttexture,0,1);
 
-       /*LoadTexture(":Data:Textures:cloud.png",&sprites.cloudtexture,1);
+       /*LoadTexture(":Data:Textures:cloud.png",&Sprite::cloudtexture,1);
 
-       LoadTexture(":Data:Textures:cloudimpact.png",&sprites.cloudimpacttexture,1);
+       LoadTexture(":Data:Textures:cloudimpact.png",&Sprite::cloudimpacttexture,1);
 
-       LoadTexture(":Data:Textures:bloodparticle.png",&sprites.bloodtexture,1);
+       LoadTexture(":Data:Textures:bloodparticle.png",&Sprite::bloodtexture,1);
 
-       LoadTexture(":Data:Textures:snowflake.png",&sprites.snowflaketexture,1);
+       LoadTexture(":Data:Textures:snowflake.png",&Sprite::snowflaketexture,1);
 
-       LoadTexture(":Data:Textures:flame.png",&sprites.flametexture,1);
+       LoadTexture(":Data:Textures:flame.png",&Sprite::flametexture,1);
 
-       LoadTexture(":Data:Textures:smoke.png",&sprites.smoketexture,1);
+       LoadTexture(":Data:Textures:smoke.png",&Sprite::smoketexture,1);
        //texdetail=temptexdetail;
-       LoadTexture(":Data:Textures:shine.png",&sprites.shinetexture,1);*/
+       LoadTexture(":Data:Textures:shine.png",&Sprite::shinetexture,1);*/
 
 
 
@@ -1362,17 +1353,17 @@ void Game::LoadStuff()
        //LoadTexture(":Data:Textures:box.jpg",&objects.boxtextureptr,1,0);
 
 
-       LoadTexture(":Data:Textures:cloud.png",&sprites.cloudtexture,1,1);
-       LoadTexture(":Data:Textures:cloudimpact.png",&sprites.cloudimpacttexture,1,1);
-       LoadTexture(":Data:Textures:bloodparticle.png",&sprites.bloodtexture,1,1);
-       LoadTexture(":Data:Textures:snowflake.png",&sprites.snowflaketexture,1,1);
-       LoadTexture(":Data:Textures:flame.png",&sprites.flametexture,1,1);
-       LoadTexture(":Data:Textures:bloodflame.png",&sprites.bloodflametexture,1,1);
-       LoadTexture(":Data:Textures:smoke.png",&sprites.smoketexture,1,1);
-       LoadTexture(":Data:Textures:shine.png",&sprites.shinetexture,1,0);
-       LoadTexture(":Data:Textures:splinter.png",&sprites.splintertexture,1,1);
-       LoadTexture(":Data:Textures:leaf.png",&sprites.leaftexture,1,1);
-       LoadTexture(":Data:Textures:tooth.png",&sprites.toothtexture,1,1);
+       LoadTexture(":Data:Textures:cloud.png",&Sprite::cloudtexture,1,1);
+       LoadTexture(":Data:Textures:cloudimpact.png",&Sprite::cloudimpacttexture,1,1);
+       LoadTexture(":Data:Textures:bloodparticle.png",&Sprite::bloodtexture,1,1);
+       LoadTexture(":Data:Textures:snowflake.png",&Sprite::snowflaketexture,1,1);
+       LoadTexture(":Data:Textures:flame.png",&Sprite::flametexture,1,1);
+       LoadTexture(":Data:Textures:bloodflame.png",&Sprite::bloodflametexture,1,1);
+       LoadTexture(":Data:Textures:smoke.png",&Sprite::smoketexture,1,1);
+       LoadTexture(":Data:Textures:shine.png",&Sprite::shinetexture,1,0);
+       LoadTexture(":Data:Textures:splinter.png",&Sprite::splintertexture,1,1);
+       LoadTexture(":Data:Textures:leaf.png",&Sprite::leaftexture,1,1);
+       LoadTexture(":Data:Textures:tooth.png",&Sprite::toothtexture,1,1);
 
        rotation=0;
        rotation2=0;
@@ -1688,200 +1679,3 @@ void Game::LoadStuff()
        visibleloading=0;
 }
 
-Game::Game()
-{
-       terraintexture = 0;
-       terraintexture2 = 0;
-       terraintexture3 = 0;
-       screentexture = 0;
-       screentexture2 = 0;
-       logotexture = 0;
-       loadscreentexture = 0;
-       Maparrowtexture = 0;
-       Mapboxtexture = 0;
-       Mapcircletexture = 0;
-       cursortexture = 0;
-
-       memset(Mainmenuitems, 0, sizeof(Mainmenuitems));
-
-       nummenuitems = 0;
-
-       memset(startx, 0, sizeof(startx));
-       memset(starty, 0, sizeof(starty));
-       memset(endx, 0, sizeof(endx));
-       memset(endy, 0, sizeof(endy));
-
-       memset(selectedlong, 0, sizeof(selectedlong));
-       memset(offsetx, 0, sizeof(offsetx));
-       memset(offsety, 0, sizeof(offsety));
-       memset(movex, 0, sizeof(movex));
-       memset(movey, 0, sizeof(movey));
-       memset(endy, 0, sizeof(endy));
-
-       transition = 0;
-       anim = 0;
-       selected = 0;
-       loaddistrib = 0;
-       keyselect = 0;
-       indemo = 0;
-
-       won = 0;
-
-       entername = 0;
-
-       memset(menustring, 0, sizeof(menustring));
-       memset(registrationname, 0, sizeof(registrationname));
-       registrationnumber = 0;
-
-       newdetail = 0;
-       newscreenwidth = 0;
-       newscreenheight = 0;
-
-       gameon = 0;
-       deltah = 0,deltav = 0;
-       mousecoordh = 0,mousecoordv = 0;
-       oldmousecoordh = 0,oldmousecoordv = 0;
-       rotation = 0,rotation2 = 0;
-
-//     SkyBox skybox;
-
-       cameramode = 0;
-       cameratogglekeydown = 0;
-       chattogglekeydown = 0;
-       olddrawmode = 0;
-       drawmode = 0;
-       drawmodetogglekeydown = 0;
-       explodetogglekeydown = 0;
-       detailtogglekeydown = 0;
-       firstload = 0;
-       oldbutton = 0;
-
-       leveltime = 0;
-       loadtime = 0;
-
-//     Model hawk;
-
-//     XYZ hawkcoords;
-//     XYZ realhawkcoords;
-
-       hawktexture = 0;
-       hawkrotation = 0;
-       hawkcalldelay = 0;
-/*
-       Model eye;
-       Model iris;
-       Model cornea;
-*/
-       stealthloading = 0;
-
-       campaignnumlevels = 0;
-
-       memset(campaignmapname, 0, sizeof(campaignmapname));
-       memset(campaigndescription, 0, sizeof(campaigndescription));
-       memset(campaignchoosenext, 0, sizeof(campaignchoosenext));
-       memset(campaignnumnext, 0, sizeof(campaignnumnext));
-       memset(campaignnextlevel, 0, sizeof(campaignnextlevel));
-       int campaignchoicesmade;
-       memset(campaignchoices, 0, sizeof(campaignchoices));
-       memset(campaignlocationx, 0, sizeof(campaignlocationx));
-       memset(campaignlocationy, 0, sizeof(campaignlocationy));
-       memset(campaignlocationy, 0, sizeof(campaignlocationy));
-
-       campaignchoicenum = 0;
-
-       memset(campaignchoicewhich, 0, sizeof(campaignchoicewhich));
-
-       whichchoice = 0;
-
-       numlevelspassed = 0;
-
-       memset(levelorder, 0, sizeof(levelorder));
-       memset(levelvisible, 0, sizeof(levelvisible));
-       memset(levelhighlight, 0, sizeof(levelhighlight));
-
-       minimap = 0;
-
-       musictype = 0,oldmusictype = 0,oldoldmusictype = 0;
-       realthreat = 0;
-
-//     Model rabbit;
-//     XYZ rabbitcoords;
-
-//     XYZ mapcenter;
-       mapradius = 0;
-
-//     Text text;
-       fps = 0;
-
-//     XYZ cameraloc;
-       cameradist = 0;
-
-       envtogglekeydown = 0;
-       slomotogglekeydown = 0;
-       texturesizetogglekeydown = 0;
-       freezetogglekeydown = 0;
-       drawtoggle = 0;
-
-       editorenabled = 0;
-       editortype = 0;
-       editorsize = 0;
-       editorrotation = 0;
-       editorrotation2 = 0;
-
-       brightness = 0;
-
-       quit = 0;
-       tryquit = 0;
-
-//     XYZ pathpoint[30];
-       numpathpoints = 0;
-       memset(numpathpointconnect, 0, sizeof(numpathpointconnect));
-       memset(pathpointconnect, 0, sizeof(pathpointconnect));
-       pathpointselected = 0;
-
-       endgame = 0;
-       scoreadded = 0;
-       numchallengelevels = 0;
-
-       console = 0;
-       archiveselected = 0;
-
-       memset(consoletext, 0, sizeof(consoletext));
-       memset(consolechars, 0, sizeof(consolechars));
-       chatting = 0;
-       memset(displaytext, 0, sizeof(displaytext));
-       memset(displaychars, 0, sizeof(displaychars));
-       memset(displaytime, 0, sizeof(displaytime));
-       displayblinkdelay = 0;
-       displayblink = 0;
-       displayselected = 0;
-       consolekeydown = 0;
-       consoletogglekeydown = 0;
-       consoleblinkdelay = 0;
-       consoleblink = 0;
-       consoleselected = 0;
-       memset(togglekey, 0, sizeof(togglekey));
-       memset(togglekeydelay, 0, sizeof(togglekeydelay));
-       registernow = 0;
-       autocam = 0;
-
-       crouchkey = 0,jumpkey = 0,forwardkey = 0,chatkey = 0,backkey = 0,leftkey = 0,rightkey = 0,drawkey = 0,throwkey = 0,attackkey = 0;
-       oldattackkey = 0;
-
-       loading = 0;
-       talkdelay = 0;
-
-       numboundaries = 0;
-//     XYZ boundary[360];
-
-       whichlevel = 0;
-       oldenvironment = 0;
-       targetlevel = 0;
-       changedelay = 0;
-
-       memset(musicvolume, 0, sizeof(musicvolume));
-       memset(oldmusicvolume, 0, sizeof(oldmusicvolume));
-       musicselected = 0;
-       change = 0;
-}
-
Lugaru Customization