Moved Weapon model and texture loading in Weapon class

[lugaru.git] / Source / Globals.cpp

diff --git a/Source/Globals.cpp b/Source/Globals.cpp
index 074a78faf647a340c1eb825d4d61e8b5a38e2036..90549550120b77c016b8ec2831d2937c0bdd7604 100644 (file)
--- a/Source/Globals.cpp
+++ b/Source/Globals.cpp
@@ -19,13 +19,13 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "Graphic/Stereo.hpp"
-#include "Math/Quaternions.hpp"
+#include "Math/XYZ.hpp"
 #include "Objects/Weapons.hpp"
 
 #include <SDL.h>
 #include <string>
 
-bool visibleloading = 0;
+bool visibleloading = false;
 
 float volume = 0;
 bool ismotionblur = false;
@@ -33,7 +33,7 @@ float usermousesensitivity = 0;
 bool floatjump = false;
 bool cellophane = false;
 bool autoslomo = false;
-bool decals = false;
+bool decalstoggle = false;
 bool invertmouse = false;
 bool texttoggle = false;
 float blurness = 0;
@@ -101,12 +101,6 @@ float smoketex = 0;
 float slomospeed = 0;
 float slomofreq = 0;
 
-int tutoriallevel = 0;
-int tutorialstage = 0;
-float tutorialstagetime = 0;
-float tutorialmaxtime = 0;
-float tutorialsuccess = 0;
-
 bool againbonus = false;
 
 float damagedealt = 0;