X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGlobals.cpp;h=bf622bf128de9c0d712caf8fc235acd19a62539f;hb=14d27ff7369d8892e08b520309c90ece4ab883a7;hp=f272cc9cd98b47021e3f3bfb36d29df6c45e2308;hpb=cd46cab54acd39ff8c02b204844f1ce53fd2edbc;p=lugaru.git diff --git a/Source/Globals.cpp b/Source/Globals.cpp index f272cc9..bf622bf 100644 --- a/Source/Globals.cpp +++ b/Source/Globals.cpp @@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "Lights.h" #include "Skeleton.h" #include "Terrain.h" -#include "Sprites.h" +#include "Sprite.h" #include "Frustum.h" #include "Objects.h" #include "Weapons.h" @@ -36,14 +36,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "Stereo.h" #include "Constants.h" +#include "Animation.h" bool visibleloading = 0; -OPENAL_SAMPLE *samp[100] = {0}; -OPENAL_STREAM * strm[20] = {0}; int channels[100] = {0}; -float volume = 0;bool buttons[3] = {0}; -bool oldbuttons[3] = {0}; +float volume = 0; bool ismotionblur = 0; float usermousesensitivity = 0; bool floatjump = 0; @@ -76,7 +74,6 @@ Animation animation[animation_count]; Skeleton testskeleton; int numsounds = 0; Terrain terrain; -Sprites sprites; float sps = 0; SDL_Surface *sdlscreen; @@ -184,7 +181,6 @@ float tutorialsuccess = 0; bool againbonus = 0; float damagedealt = 0; -float damagetaken = 0; int maptype = 0; @@ -234,23 +230,6 @@ bool won = 0; bool campaign = 0; -int numfalls = 0; -int numflipfail = 0; -int numseen = 0; -int numresponded = 0; -int numstaffattack = 0; -int numswordattack = 0; -int numknifeattack = 0; -int numunarmedattack = 0; -int numescaped = 0; -int numflipped = 0; -int numwallflipped = 0; -int numthrowkill = 0; -int numafterkill = 0; -int numreversals = 0; -int numattacks = 0; -int maxalarmed = 0; - bool gamestarted = 0; //TextureList textures;