FULLPIPE: Remove C* prefixes from interaction classes

5 files changed, 37 insertions, 37 deletions

diff --git a/engines/fullpipe/gameloader.cpp b/engines/fullpipe/gameloader.cpp
index 6abe26743f..d130539c33 100644
--- a/engines/fullpipe/gameloader.cpp
+++ b/engines/fullpipe/gameloader.cpp
@@ -43,12 +43,12 @@ MctlCompound *getSc2MctlCompoundBySceneId(int16 sceneId) {
 	return 0;
 }
 
-CInteractionController *getGameLoaderInteractionController() {
+InteractionController *getGameLoaderInteractionController() {
 	return g_fullpipe->_gameLoader->_interactionController;
 }
 
 CGameLoader::CGameLoader() {
-	_interactionController = new CInteractionController();
+	_interactionController = new InteractionController();
 	_inputController = new CInputController();
 
 	_gameProject = 0;
diff --git a/engines/fullpipe/gameloader.h b/engines/fullpipe/gameloader.h
index db691005f9..99f263e2d5 100644
--- a/engines/fullpipe/gameloader.h
+++ b/engines/fullpipe/gameloader.h
@@ -32,7 +32,7 @@ namespace Fullpipe {
 class SceneTag;
 class MctlCompound;
 class CInputController;
-class CInteractionController;
+class InteractionController;
 class MotionController;
 
 class Sc2 : public CObject {
@@ -90,7 +90,7 @@ class CGameLoader : public CObject {
 	void saveScenePicAniInfos(int sceneId);
 
 	GameProject *_gameProject;
-	CInteractionController *_interactionController;
+	InteractionController *_interactionController;
 	CInputController *_inputController;
 	CInventory2 _inventory;
 	Sc2Array _sc2array;
@@ -109,7 +109,7 @@ class CGameLoader : public CObject {
 };
 
 CInventory2 *getGameLoaderInventory();
-CInteractionController *getGameLoaderInteractionController();
+InteractionController *getGameLoaderInteractionController();
 MctlCompound *getSc2MctlCompoundBySceneId(int16 sceneId);
 
 } // End of namespace Fullpipe
diff --git a/engines/fullpipe/interaction.cpp b/engines/fullpipe/interaction.cpp
index cdcbf2ec16..9fd42c15ae 100644
--- a/engines/fullpipe/interaction.cpp
+++ b/engines/fullpipe/interaction.cpp
@@ -39,9 +39,9 @@ bool canInteractAny(GameObject *obj1, GameObject *obj2, int invId) {
 	if (g_fullpipe->_currentScene)
 		sceneId = g_fullpipe->_currentScene->_sceneId;
 
-	CInteractionController *intC = getGameLoaderInteractionController();
+	InteractionController *intC = getGameLoaderInteractionController();
 	for (ObList::iterator i = intC->_interactions.begin(); i != intC->_interactions.end(); ++i) {
-		CInteraction *intr = (CInteraction *)*i;
+		Interaction *intr = (Interaction *)*i;
 
 		if (intr->_sceneId > 0 && intr->_sceneId != sceneId)
 			break;
@@ -55,17 +55,17 @@ bool canInteractAny(GameObject *obj1, GameObject *obj2, int invId) {
 	return false;
 }
 
-bool CInteractionController::load(MfcArchive &file) {
-	debug(5, "CInteractionController::load()");
+bool InteractionController::load(MfcArchive &file) {
+	debug(5, "InteractionController::load()");
 
 	return _interactions.load(file);
 }
 
 int static_compSceneId = 0;
 
-bool CInteractionController::compareInteractions(const void *p1, const void *p2) {
-	const CInteraction *i1 = (const CInteraction *)p1;
-	const CInteraction *i2 = (const CInteraction *)p2;
+bool InteractionController::compareInteractions(const void *p1, const void *p2) {
+	const Interaction *i1 = (const Interaction *)p1;
+	const Interaction *i2 = (const Interaction *)p2;
 
 	if (i2->_sceneId < i1->_sceneId) {
 		if (i1->_sceneId != static_compSceneId)
@@ -89,13 +89,13 @@ bool CInteractionController::compareInteractions(const void *p1, const void *p2)
 	return true;
 }
 
-void CInteractionController::sortInteractions(int sceneId) {
+void InteractionController::sortInteractions(int sceneId) {
 	static_compSceneId = sceneId;
 
-	Common::sort(_interactions.begin(), _interactions.end(), CInteractionController::compareInteractions);
+	Common::sort(_interactions.begin(), _interactions.end(), InteractionController::compareInteractions);
 }
 
-bool CInteractionController::handleInteraction(StaticANIObject *subj, GameObject *obj, int invId) {
+bool InteractionController::handleInteraction(StaticANIObject *subj, GameObject *obj, int invId) {
 	if (subj) {
 		if (!subj->isIdle() || (subj->_flags & 0x100))
 			return false;
@@ -104,8 +104,8 @@ bool CInteractionController::handleInteraction(StaticANIObject *subj, GameObject
 	if (!_interactions.size())
 		return false;
 
-	CInteraction *inter = 0;
-	CInteraction *previnter = 0;
+	Interaction *inter = 0;
+	Interaction *previnter = 0;
 	int dur = 0;
 	int mindur = 0xFFFF;
 
@@ -113,7 +113,7 @@ bool CInteractionController::handleInteraction(StaticANIObject *subj, GameObject
 	ExCommand *ex;
 
 	for (ObList::iterator i = _interactions.begin(); i != _interactions.end(); ++i) {
-		CInteraction *cinter = (CInteraction *)*i;
+		Interaction *cinter = (Interaction *)*i;
 
 		if (!cinter->canInteract(subj, obj, invId))
 			continue;
@@ -394,7 +394,7 @@ LABEL_38:
 	return true;
 }
 
-CInteraction::CInteraction() {
+Interaction::Interaction() {
 	_objectId1 = 0;
 	_objectId2 = 0;
 	_staticsId1 = 0;
@@ -411,8 +411,8 @@ CInteraction::CInteraction() {
 	_actionName = 0;
 }
 
-bool CInteraction::load(MfcArchive &file) {
-	debug(5, "CInteraction::load()");
+bool Interaction::load(MfcArchive &file) {
+	debug(5, "Interaction::load()");
 
 	_objectId1 = file.readUint16LE();
 	_objectId2 = file.readUint16LE();
@@ -432,7 +432,7 @@ bool CInteraction::load(MfcArchive &file) {
 	return true;
 }
 
-bool CInteraction::canInteract(GameObject *obj1, GameObject *obj2, int invId) {
+bool Interaction::canInteract(GameObject *obj1, GameObject *obj2, int invId) {
 	if (_sceneId > 0 && g_fullpipe->_currentScene && g_fullpipe->_currentScene->_sceneId != _sceneId)
 		return false;
 
@@ -489,7 +489,7 @@ bool CInteraction::canInteract(GameObject *obj1, GameObject *obj2, int invId) {
 	return true;
 }
 
-bool CInteraction::isOverlapping(StaticANIObject *subj, GameObject *obj) {
+bool Interaction::isOverlapping(StaticANIObject *subj, GameObject *obj) {
 	StaticANIObject *ani = (StaticANIObject *)obj;
 
 	if (abs(_xOffs + obj->_ox - subj->_ox) <= 1
diff --git a/engines/fullpipe/interaction.h b/engines/fullpipe/interaction.h
index 176ec940b9..f968cca8ee 100644
--- a/engines/fullpipe/interaction.h
+++ b/engines/fullpipe/interaction.h
@@ -35,7 +35,7 @@ int handleObjectInteraction(StaticANIObject *subject, GameObject *object, int in
 bool canInteractAny(GameObject *obj1, GameObject *obj2, int invId);
 
 
-class CInteraction : public CObject {
+class Interaction : public CObject {
  public:
 	int16 _objectId1;
 	int16 _objectId2;
@@ -53,13 +53,13 @@ class CInteraction : public CObject {
 	char *_actionName;
 
  public:
-	CInteraction();
+	Interaction();
 	virtual bool load(MfcArchive &file);
 	bool canInteract(GameObject *obj1, GameObject *obj2, int invId);
 	bool isOverlapping(StaticANIObject *subj, GameObject *obj);
 };
 
-class CInteractionController : public CObject {
+class InteractionController : public CObject {
  public:
 	ObList _interactions;
 	int16 _field_20;
@@ -69,7 +69,7 @@ class CInteractionController : public CObject {
 	static bool compareInteractions(const void *p1, const void *p2);
 
  public:
-	CInteractionController() : _field_20(0), _flag24(true) {}
+	InteractionController() : _field_20(0), _flag24(true) {}
 
 	virtual bool load(MfcArchive &file);
 
diff --git a/engines/fullpipe/utils.cpp b/engines/fullpipe/utils.cpp
index f516fb49c5..a35a275c95 100644
--- a/engines/fullpipe/utils.cpp
+++ b/engines/fullpipe/utils.cpp
@@ -262,7 +262,7 @@ double MfcArchive::readDouble() {
 
 enum {
 	kNullObject,
-	kCInteraction,
+	kInteraction,
 	kMessageQueue,
 	kExCommand,
 	kCObjstateCommand,
@@ -279,17 +279,17 @@ const struct {
 	const char *name;
 	int id;
 } classMap[] = {
-	{ "CInteraction",	kCInteraction },
+	{ "CInteraction",	kInteraction },
 	{ "MessageQueue",	kMessageQueue },
 	{ "ExCommand",		kExCommand },
 	{ "CObjstateCommand", kCObjstateCommand },
 	{ "CGameVar",		kCGameVar },
-	{ "MctlCompound",	kMctlCompound },
-	{ "MovGraph",		kMovGraph },
-	{ "MovGraphLink",	kMovGraphLink },
-	{ "MovGraphNode",	kMovGraphNode },
-	{ "ReactParallel",	kReactParallel },
-	{ "ReactPolygonal", kReactPolygonal },
+	{ "CMctlCompound",	kMctlCompound },
+	{ "CMovGraph",		kMovGraph },
+	{ "CMovGraphLink",	kMovGraphLink },
+	{ "CMovGraphNode",	kMovGraphNode },
+	{ "CReactParallel",	kReactParallel },
+	{ "CReactPolygonal", kReactPolygonal },
 	{ 0, 0 }
 };
 
@@ -306,8 +306,8 @@ static CObject *createObject(int objectId) {
 	switch (objectId) {
 	case kNullObject:
 		return 0;
-	case kCInteraction:
-		return new CInteraction();
+	case kInteraction:
+		return new Interaction();
 	case kMessageQueue:
 		return new MessageQueue();
 	case kExCommand: