Attempt at fixing LoadStuff calling logic

[lugaru.git] / Source / Game.hpp

diff --git a/Source/Game.hpp b/Source/Game.hpp
index 32f094d9cddfaae6fbe41e342b4bb67a62b3b25b..0dcee30ea483ab7778362cb009228c09d8bdf1ac 100644 (file)
--- a/Source/Game.hpp
+++ b/Source/Game.hpp
@@ -72,7 +72,7 @@ extern int oldmousecoordh, oldmousecoordv;
 extern float yaw, pitch;
 extern SkyBox *skybox;
 extern bool cameramode;
-extern bool firstload;
+extern bool firstLoadDone;
 
 extern float leveltime;
 extern float wonleveltime;
@@ -144,21 +144,22 @@ int DrawGLScene(StereoSide side);
 void playdialoguescenesound();
 int findClosestPlayer();
 void Loadlevel(int which);
-void Loadlevel(const std::string& name);
+void Loadlevel(const std::string& name, bool tutorial = false);
 void Tick();
 void TickOnce();
 void TickOnceAfter();
 void SetUpLighting();
 GLvoid ReSizeGLScene(float fov, float near);
-int checkcollide(XYZ startpoint, XYZ endpoint);
-int checkcollide(XYZ startpoint, XYZ endpoint, int what);
-int checkcollide(XYZ startpoint, XYZ endpoint, float minx, float miny, float minz, float maxx, float maxy, float maxz, int what);
 
 void fireSound(int sound = fireendsound);
 
 void inputText(std::string& str, unsigned* charselected);
 void flash(float amount = 1, int delay = 1);
 }
+float roughDirection(XYZ vec);
+float roughDirectionTo(XYZ start, XYZ end);
+float pitchTo(XYZ start, XYZ end);
+float sq(float n);
 
 #ifndef __forceinline
 #  ifdef __GNUC__