X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameInitDispose.cpp;h=984202ffc75fff2d6f7769e749b2b2aa806740b7;hb=188b251d145503cab17680a22cbabf58b24358d5;hp=525b5227663e51bada5bc6bbdb1e6f4a20f97b6b;hpb=22dedb8ee79dd55169b8fdb07f1a12a0d6acd22d;p=lugaru.git

diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index 525b522..984202f 100644
--- a/Source/GameInitDispose.cpp
+++ b/Source/GameInitDispose.cpp
@@ -105,15 +105,15 @@ void Dispose()
 void Game::newGame()
 {
     text = new Text();
+    textmono = new Text();
     skybox = new SkyBox();
 }
 
 void Game::deleteGame()
 {
-    if (skybox)
-        delete skybox;
-    if (text)
-        delete text;
+    delete skybox;
+    delete text;
+    delete textmono;
 
     glDeleteTextures(1, &screentexture);
     glDeleteTextures(1, &screentexture2);
@@ -538,6 +538,8 @@ void Game::InitGame()
     texdetail = 1;
     text->LoadFontTexture("Textures/Font.png");
     text->BuildFont();
+    textmono->LoadFontTexture("Textures/FontMono.png");
+    textmono->BuildFont();
     texdetail = temptexdetail;
 
     FadeLoadingScreen(10);
@@ -639,6 +641,8 @@ void Game::LoadStuff()
     texdetail = 1;
     text->LoadFontTexture("Textures/Font.png");
     text->BuildFont();
+    textmono->LoadFontTexture("Textures/FontMono.png");
+    textmono->BuildFont();
     texdetail = temptexdetail;
 
     viewdistdetail = 2;
@@ -657,38 +661,7 @@ void Game::LoadStuff()
 
     realtexdetail = texdetail;
 
-    LOG("Loading weapon data...");
-
-    Weapon::knifetextureptr.load("Textures/Knife.png", 0);
-    Weapon::bloodknifetextureptr.load("Textures/BloodKnife.png", 0);
-    Weapon::lightbloodknifetextureptr.load("Textures/BloodKnifeLight.png", 0);
-    Weapon::swordtextureptr.load("Textures/Sword.jpg", 1);
-    Weapon::bloodswordtextureptr.load("Textures/SwordBlood.jpg", 1);
-    Weapon::lightbloodswordtextureptr.load("Textures/SwordBloodLight.jpg", 1);
-    Weapon::stafftextureptr.load("Textures/Staff.jpg", 1);
-
-    Weapon::throwingknifemodel.load("Models/ThrowingKnife.solid");
-    Weapon::throwingknifemodel.Scale(.001, .001, .001);
-    Weapon::throwingknifemodel.Rotate(90, 0, 0);
-    Weapon::throwingknifemodel.Rotate(0, 90, 0);
-    Weapon::throwingknifemodel.flat = 0;
-    Weapon::throwingknifemodel.CalculateNormals(1);
-
-    Weapon::swordmodel.load("Models/Sword.solid");
-    Weapon::swordmodel.Scale(.001, .001, .001);
-    Weapon::swordmodel.Rotate(90, 0, 0);
-    Weapon::swordmodel.Rotate(0, 90, 0);
-    Weapon::swordmodel.Rotate(0, 0, 90);
-    Weapon::swordmodel.flat = 1;
-    Weapon::swordmodel.CalculateNormals(1);
-
-    Weapon::staffmodel.load("Models/Staff.solid");
-    Weapon::staffmodel.Scale(.005, .005, .005);
-    Weapon::staffmodel.Rotate(90, 0, 0);
-    Weapon::staffmodel.Rotate(0, 90, 0);
-    Weapon::staffmodel.Rotate(0, 0, 90);
-    Weapon::staffmodel.flat = 1;
-    Weapon::staffmodel.CalculateNormals(1);
+    Weapon::Load();
 
     terrain.shadowtexture.load("Textures/Shadow.png", 0);
     terrain.bloodtexture.load("Textures/Blood.png", 0);