X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGame.hpp;h=159cbe78fc3c5dfdbf508a0093500f92990175c1;hb=b9a46d8e2b7e7e22c706e7dd3734f31015db4408;hp=2a0f874be549aa749b8a941ad842fe78ba62691b;hpb=487fc31578d1fa8d0d2b11fdb59aaca074bce6e2;p=lugaru.git

diff --git a/Source/Game.hpp b/Source/Game.hpp
index 2a0f874..159cbe7 100644
--- a/Source/Game.hpp
+++ b/Source/Game.hpp
@@ -32,7 +32,7 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include "Graphic/Stereo.hpp"
 #include "Graphic/Text.hpp"
 #include "Graphic/Texture.hpp"
-#include "Objects/Objects.hpp"
+#include "Objects/Object.hpp"
 #include "Objects/Person.hpp"
 #include "Objects/Weapons.hpp"
 #include "Thirdparty/optionparser.h"
@@ -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;
@@ -98,6 +98,7 @@ extern XYZ mapcenter;
 extern float mapradius;
 
 extern Text *text;
+extern Text *textmono;
 extern float fps;
 
 extern bool editorenabled;
@@ -120,11 +121,6 @@ extern int numchallengelevels;
 
 extern bool console;
 extern std::string consoletext[15];
-extern std::string displaytext[15];
-extern float displaytime[15];
-extern float displayblinkdelay;
-extern bool displayblink;
-extern unsigned displayselected;
 extern float consoleblinkdelay;
 extern bool consoleblink;
 extern unsigned consoleselected;
@@ -148,21 +144,23 @@ void LoadingScreen();
 int DrawGLScene(StereoSide side);
 void playdialoguescenesound();
 int findClosestPlayer();
-void Loadlevel(int which);
-void Loadlevel(const std::string& name);
+bool LoadLevel(int which);
+bool 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);
 
 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__