aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2013-09-18 19:14:56 +0400
committerEugene Sandulenko2013-09-18 19:39:53 +0400
commitc354981037621fd1bc7b44381d0e7d24d984d5a6 (patch)
treef6568e071c150bf813911152965e313d40f61c68 /engines
parent3bd3431ad421ba2832d79080b9e26c7967e8a50e (diff)
downloadscummvm-rg350-c354981037621fd1bc7b44381d0e7d24d984d5a6.tar.gz
scummvm-rg350-c354981037621fd1bc7b44381d0e7d24d984d5a6.tar.bz2
scummvm-rg350-c354981037621fd1bc7b44381d0e7d24d984d5a6.zip
FULLPIPE: Remove C* prefix from input classes
Diffstat (limited to 'engines')
-rw-r--r--engines/fullpipe/fullpipe.h6
-rw-r--r--engines/fullpipe/gameloader.cpp4
-rw-r--r--engines/fullpipe/gameloader.h4
-rw-r--r--engines/fullpipe/input.cpp14
-rw-r--r--engines/fullpipe/input.h6
5 files changed, 17 insertions, 17 deletions
diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h
index 348ac2c9c5..7cc1397394 100644
--- a/engines/fullpipe/fullpipe.h
+++ b/engines/fullpipe/fullpipe.h
@@ -47,7 +47,7 @@ class BehaviorManager;
class CBaseModalObject;
class CGameLoader;
class CGameVar;
-class CInputController;
+class InputController;
class CInventory2;
struct CursorInfo;
struct EntranceInfo;
@@ -103,7 +103,7 @@ public:
bool loadGam(const char *fname, int scene = 0);
CGameVar *getGameLoaderGameVar();
- CInputController *getGameLoaderInputController();
+ InputController *getGameLoaderInputController();
int _gameProjectVersion;
int _pictureScale;
@@ -124,7 +124,7 @@ public:
StaticANIObject *_aniMan2;
byte *_globalPalette;
- CInputController *_inputController;
+ InputController *_inputController;
bool _inputDisabled;
int _currentCheat;
diff --git a/engines/fullpipe/gameloader.cpp b/engines/fullpipe/gameloader.cpp
index d130539c33..7b68ff51ed 100644
--- a/engines/fullpipe/gameloader.cpp
+++ b/engines/fullpipe/gameloader.cpp
@@ -49,7 +49,7 @@ InteractionController *getGameLoaderInteractionController() {
CGameLoader::CGameLoader() {
_interactionController = new InteractionController();
- _inputController = new CInputController();
+ _inputController = new InputController();
_gameProject = 0;
_gameName = 0;
@@ -503,7 +503,7 @@ CGameVar *FullpipeEngine::getGameLoaderGameVar() {
return 0;
}
-CInputController *FullpipeEngine::getGameLoaderInputController() {
+InputController *FullpipeEngine::getGameLoaderInputController() {
if (_gameLoader)
return _gameLoader->_inputController;
else
diff --git a/engines/fullpipe/gameloader.h b/engines/fullpipe/gameloader.h
index 99f263e2d5..fe0ec95c4c 100644
--- a/engines/fullpipe/gameloader.h
+++ b/engines/fullpipe/gameloader.h
@@ -31,7 +31,7 @@ namespace Fullpipe {
class SceneTag;
class MctlCompound;
-class CInputController;
+class InputController;
class InteractionController;
class MotionController;
@@ -91,7 +91,7 @@ class CGameLoader : public CObject {
GameProject *_gameProject;
InteractionController *_interactionController;
- CInputController *_inputController;
+ InputController *_inputController;
CInventory2 _inventory;
Sc2Array _sc2array;
void *_sceneSwitcher;
diff --git a/engines/fullpipe/input.cpp b/engines/fullpipe/input.cpp
index dfd8d32168..4db0ffb49f 100644
--- a/engines/fullpipe/input.cpp
+++ b/engines/fullpipe/input.cpp
@@ -33,7 +33,7 @@
namespace Fullpipe {
-CInputController::CInputController() {
+InputController::InputController() {
g_fullpipe->_inputController = this;
_flag = 0;
@@ -52,13 +52,13 @@ CInputController::CInputController() {
_cursorItemPicture = 0;
}
-CInputController::~CInputController() {
+InputController::~InputController() {
removeMessageHandler(126, -1);
g_fullpipe->_inputController = 0;
}
-void CInputController::setInputDisabled(bool state) {
+void InputController::setInputDisabled(bool state) {
_flag = state;
g_fullpipe->_inputDisabled = state;
}
@@ -67,7 +67,7 @@ void setInputDisabled(bool state) {
g_fullpipe->_inputController->setInputDisabled(state);
}
-void CInputController::addCursor(CursorInfo *cursor) {
+void InputController::addCursor(CursorInfo *cursor) {
CursorInfo *newc = new CursorInfo(cursor);
Common::Point p;
@@ -82,14 +82,14 @@ void CInputController::addCursor(CursorInfo *cursor) {
_cursorsArray.push_back(newc);
}
-void CInputController::setCursorMode(bool enabled) {
+void InputController::setCursorMode(bool enabled) {
if (enabled)
_inputFlags |= 1;
else
_inputFlags &= ~1;
}
-void CInputController::drawCursor(int x, int y) {
+void InputController::drawCursor(int x, int y) {
if (_cursorIndex == -1)
return;
@@ -105,7 +105,7 @@ void CInputController::drawCursor(int x, int y) {
_cursorBounds.top + _cursorsArray[_cursorIndex]->itemPictureOffsY, 0, 0);
}
-void CInputController::setCursor(int cursorId) {
+void InputController::setCursor(int cursorId) {
if (_cursorIndex == -1 || _cursorsArray[_cursorIndex]->pictureId != cursorId) {
_cursorIndex = -1;
diff --git a/engines/fullpipe/input.h b/engines/fullpipe/input.h
index 4b32e510e3..bfd547ae2f 100644
--- a/engines/fullpipe/input.h
+++ b/engines/fullpipe/input.h
@@ -45,7 +45,7 @@ struct CursorInfo {
typedef Common::Array<CursorInfo *> CursorsArray;
-class CInputController {
+class InputController {
//CObject obj;
int _flag;
int _inputFlags;
@@ -59,8 +59,8 @@ class CInputController {
Picture *_cursorItemPicture;
public:
- CInputController();
- ~CInputController();
+ InputController();
+ ~InputController();
void setInputDisabled(bool state);
void addCursor(CursorInfo *cursor);