X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGlobals.cpp;h=7184ce2f887d3b0021714f7fec1f997dd76d40db;hb=b32cd80b243d77cd80e026c7ae73e33ec39b1de9;hp=d8d430d0ab7549f2823b54f9e0d51836d1e304d9;hpb=2b4a9af9f7693a7715ae77f491157baac7257b10;p=lugaru.git diff --git a/Source/Globals.cpp b/Source/Globals.cpp index d8d430d..7184ce2 100644 --- a/Source/Globals.cpp +++ b/Source/Globals.cpp @@ -18,25 +18,14 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ -#include "SDL.h" - -#include "gamegl.h" -#include "Quaternions.h" -#include "Lights.h" -#include "Animation/Animation.h" -#include "Animation/Skeleton.h" -#include "Terrain.h" -#include "Sprite.h" -#include "Frustum.h" -#include "Objects.h" -#include "Weapons.h" -#include "Person.h" -#include "ImageIO.h" -#include "openal_wrapper.h" -#include "Stereo.h" - - -bool visibleloading = 0; +#include "Graphic/Stereo.hpp" +#include "Math/Quaternions.hpp" +#include "Objects/Weapons.hpp" + +#include +#include + +bool visibleloading = false; float volume = 0; bool ismotionblur = false; @@ -76,7 +65,6 @@ FRUSTUM frustum; float texdetail = 0; float realtexdetail = 0; float playerdist = 0; -Objects objects; int slomo = 0; float slomodelay = 0; GLubyte bloodText[512 * 512 * 3] = {0}; @@ -113,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;