X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGlobals.cpp;h=bf622bf128de9c0d712caf8fc235acd19a62539f;hb=14d27ff7369d8892e08b520309c90ece4ab883a7;hp=01d883915679b2c3cd23bee90779b715367bbde7;hpb=c0a6dc9211fd7855250be34151a70ec4bceb5126;p=lugaru.git

diff --git a/Source/Globals.cpp b/Source/Globals.cpp
index 01d8839..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;
@@ -120,6 +117,7 @@ char mapname[256] = {0};
 bool loadingstuff = 0;
 bool stillloading = 0;
 bool showpoints = 0;
+bool showdamagebar = 0;
 bool alwaysblur = 0;
 bool immediate = 0;
 bool velocityblur = 0;
@@ -183,7 +181,6 @@ float tutorialsuccess = 0;
 bool againbonus = 0;
 
 float damagedealt = 0;
-float damagetaken = 0;
 
 int maptype = 0;
 
@@ -228,42 +225,11 @@ float bonustotal = 0;
 float startbonustotal = 0;
 float bonustime = 0;
 
-int numaccounts = 0;
-int accountactive = 0;
-int accountdifficulty[10] = {0};
-int accountprogress[10] = {0};
-float accountpoints[10] = {0};
-float accounthighscore[10][50] = {0};
-float accountfasttime[10][50] = {0};
-bool accountunlocked[10][60] = {0};
-char accountname[10][256] = {0};
-float accountcampaignhighscore[10] = {0};
-float accountcampaignfasttime[10] = {0};
-float accountcampaignscore[10] = {0};
-float accountcampaigntime[10] = {0};
-int accountcampaignchoicesmade[10] = {0};int accountcampaignchoices[10][5000] = {0};
 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;
@@ -271,4 +237,4 @@ bool gamestarted = 0;
 StereoMode stereomode =  stereoNone;
 StereoMode newstereomode = stereoNone;
 float stereoseparation = 0.05;
-bool  stereoreverse = false;
\ No newline at end of file
+bool  stereoreverse = false;