Refactor of the texture system

[lugaru.git] / Source / Game.cpp

diff --git a/Source/Game.cpp b/Source/Game.cpp
index 9cdf9eb1ca3a5164dd904b29c2a4b7cc6c6c3c20..77b9a5b21cda64a480dc3f230f8c129fba868934 100644 (file)
--- a/Source/Game.cpp
+++ b/Source/Game.cpp
@@ -26,8 +26,6 @@ int directing;
 float dialoguetime;
 int dialoguegonethrough[20];
 
-std::vector<TextureInfo> Game::textures;
-
 Game::Game()
 {
        terraintexture = 0;
@@ -52,16 +50,8 @@ Game::Game()
        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;
 
@@ -109,30 +99,8 @@ Game::Game()
 */
        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));
+       actuallevel = 0;
 
        minimap = 0;
 
@@ -174,7 +142,7 @@ Game::Game()
        scoreadded = 0;
        numchallengelevels = 0;
 
-       console = 0;
+       console = false;
        archiveselected = 0;
 
        memset(consoletext, 0, sizeof(consoletext));