From: Patrik Gornicz Date: Wed, 20 Aug 2008 15:26:54 +0000 (-0400) Subject: paused key control moved to config X-Git-Tag: physics-premerge~148 X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=commitdiff_plain;h=8f8b6693595f6e3be9f43369e898e12539892e88;p=libbear.git paused key control moved to config --- diff --git a/deps/configs/.tmp b/deps/configs/.tmp new file mode 100644 index 0000000..69d9e5c --- /dev/null +++ b/deps/configs/.tmp @@ -0,0 +1,2 @@ +# This file is needed for git to include the current directory into the +# repository ... ideas? diff --git a/objs/configs/.tmp b/objs/configs/.tmp new file mode 100644 index 0000000..69d9e5c --- /dev/null +++ b/objs/configs/.tmp @@ -0,0 +1,2 @@ +# This file is needed for git to include the current directory into the +# repository ... ideas? diff --git a/src/GameStates/Paused.cpp b/src/GameStates/Paused.cpp index 166ac2f..8f35c70 100644 --- a/src/GameStates/Paused.cpp +++ b/src/GameStates/Paused.cpp @@ -16,8 +16,7 @@ */ #include "Paused.h" -#include "../input/inputManager.h" - +#include "../configs/paused_cfg.h" /// ***** Constructors/Destructors ***** @@ -47,15 +46,9 @@ void Paused::draw(bool on_top) const bool Paused::pushMe() const { - if (input::wasPressed(SDLK_p)) - return true; - - return false; + return CFG::pause(); } bool Paused::popMe() const { - if (input::wasPressed(SDLK_p)) - return true; - - return false; + return CFG::unPause(); } diff --git a/src/Makefile b/src/Makefile index aca5527..1e11991 100644 --- a/src/Makefile +++ b/src/Makefile @@ -45,6 +45,8 @@ SRCS += Effects/Effect.cpp SRCS += Effects/Gravity.cpp SRCS += Effects/Screen.cpp +SRCS += configs/paused_cfg.cpp + SRCS += input/inputManager.cpp SRCS += graphics/graphics.cpp diff --git a/src/configs/paused_cfg.cpp b/src/configs/paused_cfg.cpp new file mode 100644 index 0000000..4b2b001 --- /dev/null +++ b/src/configs/paused_cfg.cpp @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2008 Patrik Gornicz, Gornicz_P (at) hotmail (dot) com. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "paused_cfg.h" +#include "../input/inputManager.h" + +/// ***** Private Method Headers ***** +/// ***** Private Variables ***** + +/// ***** Initializers/Cleaners ***** + +/// ***** Public Methods ***** + +bool CFG::pause() +{ + return input::wasPressed(SDLK_p); +} +bool CFG::unPause() +{ + return input::wasPressed(SDLK_p); +} + +/// ***** Private Methods ***** diff --git a/src/configs/paused_cfg.h b/src/configs/paused_cfg.h new file mode 100644 index 0000000..753a250 --- /dev/null +++ b/src/configs/paused_cfg.h @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2008 Patrik Gornicz, Gornicz_P (at) hotmail (dot) com. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + +#ifndef PAUSED_CFG_H +#define PAUSED_CFG_H + +/// ***** Header Methods ***** + +namespace CFG +{ + bool pause(); + bool unPause(); +} + +#endif // PAUSED_CFG_H