X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameTick.cpp;h=476b5aaaa996a0bedb32f7a911e10e62e4b39988;hb=4692ec6888b3a2eb166fd1693cb583d2c53e346c;hp=6ea23c2e87d01d1d27e4e8191fbd8b533d69ba5e;hpb=782cd2fc8113bcc923c14f49c43b2951e1bb2d6d;p=lugaru.git diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp index 6ea23c2..476b5aa 100644 --- a/Source/GameTick.cpp +++ b/Source/GameTick.cpp @@ -32,6 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "openal_wrapper.h" #include "Settings.h" #include "Input.h" +#include "Animation.h" using namespace std; @@ -59,7 +60,6 @@ extern int slomo; extern float slomodelay; extern bool floatjump; extern float volume; -extern Animation animation[animation_count]; extern Light light; extern float texdetail; extern GLubyte bloodText[512*512*3]; @@ -2726,7 +2726,7 @@ void Game::Tick() gameon=1; OPENAL_SetPaused(channels[stream_music3], true); } - if(Input::Button()&&!oldbutton&&(selected-7>=accountactive->getCampaignChoicesMade())){//selected>=7&&(selected-7<=campaignnumchoices)){ + if(Input::Button()&&!oldbutton&&(selected-7>=accountactive->getCampaignChoicesMade())){ fireSound(); flash();