thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FULLPIPE: Remove C* prefix from input classes

Browse source
This commit is contained in:
Eugene Sandulenko 2013-09-18 19:14:56 +04:00
parent 3bd3431ad4
commit c354981037
5 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/fullpipe/fullpipe.h
View file

@ -47,7 +47,7 @@ class BehaviorManager;
class CBaseModalObject; class CBaseModalObject;
class CGameLoader; class CGameLoader;
class CGameVar; class CGameVar;
class CInputController; class InputController;
class CInventory2; class CInventory2;
struct CursorInfo; struct CursorInfo;
struct EntranceInfo; struct EntranceInfo;
@ -103,7 +103,7 @@ public:
bool loadGam(const char *fname, int scene = 0); bool loadGam(const char *fname, int scene = 0);
CGameVar *getGameLoaderGameVar(); CGameVar *getGameLoaderGameVar();
CInputController *getGameLoaderInputController(); InputController *getGameLoaderInputController();
int _gameProjectVersion; int _gameProjectVersion;
int _pictureScale; int _pictureScale;
@ -124,7 +124,7 @@ public:
StaticANIObject *_aniMan2; StaticANIObject *_aniMan2;
byte *_globalPalette; byte *_globalPalette;
CInputController *_inputController; InputController *_inputController;
bool _inputDisabled; bool _inputDisabled;
int _currentCheat; int _currentCheat;

4
engines/fullpipe/gameloader.cpp
View file

@ -49,7 +49,7 @@ InteractionController *getGameLoaderInteractionController() {
CGameLoader::CGameLoader() { CGameLoader::CGameLoader() {
_interactionController = new InteractionController(); _interactionController = new InteractionController();
_inputController = new CInputController(); _inputController = new InputController();
_gameProject = 0; _gameProject = 0;
_gameName = 0; _gameName = 0;
@ -503,7 +503,7 @@ CGameVar *FullpipeEngine::getGameLoaderGameVar() {
return 0; return 0;
} }
CInputController *FullpipeEngine::getGameLoaderInputController() { InputController *FullpipeEngine::getGameLoaderInputController() {
if (_gameLoader) if (_gameLoader)
return _gameLoader->_inputController; return _gameLoader->_inputController;
else else

4
engines/fullpipe/gameloader.h
View file

@ -31,7 +31,7 @@ namespace Fullpipe {
class SceneTag; class SceneTag;
class MctlCompound; class MctlCompound;
class CInputController; class InputController;
class InteractionController; class InteractionController;
class MotionController; class MotionController;
@ -91,7 +91,7 @@ class CGameLoader : public CObject {
GameProject *_gameProject; GameProject *_gameProject;
InteractionController *_interactionController; InteractionController *_interactionController;
CInputController *_inputController; InputController *_inputController;
CInventory2 _inventory; CInventory2 _inventory;
Sc2Array _sc2array; Sc2Array _sc2array;
void *_sceneSwitcher; void *_sceneSwitcher;

14
engines/fullpipe/input.cpp
View file

@ -33,7 +33,7 @@
namespace Fullpipe { namespace Fullpipe {
CInputController::CInputController() { InputController::InputController() {
g_fullpipe->_inputController = this; g_fullpipe->_inputController = this;
_flag = 0; _flag = 0;
@ -52,13 +52,13 @@ CInputController::CInputController() {
_cursorItemPicture = 0; _cursorItemPicture = 0;
} }
CInputController::~CInputController() { InputController::~InputController() {
removeMessageHandler(126, -1); removeMessageHandler(126, -1);
g_fullpipe->_inputController = 0; g_fullpipe->_inputController = 0;
} }
void CInputController::setInputDisabled(bool state) { void InputController::setInputDisabled(bool state) {
_flag = state; _flag = state;
g_fullpipe->_inputDisabled = state; g_fullpipe->_inputDisabled = state;
} }
@ -67,7 +67,7 @@ void setInputDisabled(bool state) {
g_fullpipe->_inputController->setInputDisabled(state); g_fullpipe->_inputController->setInputDisabled(state);
} }
void CInputController::addCursor(CursorInfo *cursor) { void InputController::addCursor(CursorInfo *cursor) {
CursorInfo *newc = new CursorInfo(cursor); CursorInfo *newc = new CursorInfo(cursor);
Common::Point p; Common::Point p;
@ -82,14 +82,14 @@ void CInputController::addCursor(CursorInfo *cursor) {
_cursorsArray.push_back(newc); _cursorsArray.push_back(newc);
} }
void CInputController::setCursorMode(bool enabled) { void InputController::setCursorMode(bool enabled) {
if (enabled) if (enabled)
_inputFlags |= 1; _inputFlags |= 1;
else else
_inputFlags &= ~1; _inputFlags &= ~1;
} }
void CInputController::drawCursor(int x, int y) { void InputController::drawCursor(int x, int y) {
if (_cursorIndex == -1) if (_cursorIndex == -1)
return; return;
@ -105,7 +105,7 @@ void CInputController::drawCursor(int x, int y) {
_cursorBounds.top + _cursorsArray[_cursorIndex]->itemPictureOffsY, 0, 0); _cursorBounds.top + _cursorsArray[_cursorIndex]->itemPictureOffsY, 0, 0);
} }
void CInputController::setCursor(int cursorId) { void InputController::setCursor(int cursorId) {
if (_cursorIndex == -1 || _cursorsArray[_cursorIndex]->pictureId != cursorId) { if (_cursorIndex == -1 || _cursorsArray[_cursorIndex]->pictureId != cursorId) {
_cursorIndex = -1; _cursorIndex = -1;

6
engines/fullpipe/input.h
View file

@ -45,7 +45,7 @@ struct CursorInfo {
typedef Common::Array<CursorInfo *> CursorsArray; typedef Common::Array<CursorInfo *> CursorsArray;
class CInputController { class InputController {
//CObject obj; //CObject obj;
int _flag; int _flag;
int _inputFlags; int _inputFlags;
@ -59,8 +59,8 @@ class CInputController {
Picture *_cursorItemPicture; Picture *_cursorItemPicture;
public: public:
CInputController(); InputController();
~CInputController(); ~InputController();
void setInputDisabled(bool state); void setInputDisabled(bool state);
void addCursor(CursorInfo *cursor); void addCursor(CursorInfo *cursor);