X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGame.hpp;h=efa119e073b07a2b236a681af2dd017cc32dc616;hb=b32cd80b243d77cd80e026c7ae73e33ec39b1de9;hp=48294146d3a45476ac3eba286aa4fb06fd687e5c;hpb=11fc7bb36280c27d231753a9b3b3e95210351144;p=lugaru.git diff --git a/Source/Game.hpp b/Source/Game.hpp index 4829414..efa119e 100644 --- a/Source/Game.hpp +++ b/Source/Game.hpp @@ -32,7 +32,7 @@ along with Lugaru. If not, see . #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" @@ -144,14 +144,12 @@ 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); void fireSound(int sound = fireendsound);