Merge

[lugaru.git] / Source / Globals.cpp

diff --git a/Source/Globals.cpp b/Source/Globals.cpp
index f272cc9cd98b47021e3f3bfb36d29df6c45e2308..b3b7eee8e2c4463e23dc0deb8555492fb398c227 100644 (file)
--- 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"
@@ -42,8 +42,7 @@ 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 +75,6 @@ Animation animation[animation_count];
 Skeleton testskeleton;
 int numsounds = 0;
 Terrain terrain;
-Sprites sprites;
 float sps = 0;
 
 SDL_Surface *sdlscreen;