X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGlobals.cpp;h=c5cb64cc371766471c4e44c3806479086b0f10ce;hb=9248d1455aa434112b5ddd771fd69b8df02d44ee;hp=f272cc9cd98b47021e3f3bfb36d29df6c45e2308;hpb=cd46cab54acd39ff8c02b204844f1ce53fd2edbc;p=lugaru.git diff --git a/Source/Globals.cpp b/Source/Globals.cpp index f272cc9..c5cb64c 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,14 @@ 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 +76,6 @@ Animation animation[animation_count]; Skeleton testskeleton; int numsounds = 0; Terrain terrain; -Sprites sprites; float sps = 0; SDL_Surface *sdlscreen;