[Scummvm-cvs-logs] scummvm master -> 4a6ede35e764d60c35e17052414ffbc8682a0a04
sev-
sev at scummvm.org
Wed Sep 18 17:40:43 CEST 2013
This automated email contains information about 11 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
5d25dd3b36 FULLPIPE: Remove C* prefixes from motion classes
f70b737ad9 FULLPIPE: Remove C* prefixes in utils.cpp
3bd3431ad4 FULLPIPE: Remove C* prefixes from interaction classes
c354981037 FULLPIPE: Remove C* prefix from input classes
1ce1712b7b FULLPIPE: Remove C* prefix from inventory classes
fb2d0c02df FULLPIPE: CPtrList -> PtrList
0b358dbdce FULLPIPE: CStepArray -> StepArray
f40787dbbf FULLPIPE: Rename C* modal objects
655054fb37 FULLPIPE: CObjstateCommand -> ObjStateCommand
918d2f175a FULLPIPE: CGameVar -> GameVar
4a6ede35e7 FULLPIPE: CGameLoader -> GameLoader
Commit: 5d25dd3b365d2f74d90f3838013dbb90d3a72f60
https://github.com/scummvm/scummvm/commit/5d25dd3b365d2f74d90f3838013dbb90d3a72f60
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-18T08:39:53-07:00
Commit Message:
FULLPIPE: Remove C* prefixes from motion classes
Changed paths:
engines/fullpipe/gameloader.cpp
engines/fullpipe/gameloader.h
engines/fullpipe/motion.cpp
engines/fullpipe/motion.h
engines/fullpipe/scenes.cpp
engines/fullpipe/utils.cpp
diff --git a/engines/fullpipe/gameloader.cpp b/engines/fullpipe/gameloader.cpp
index 2a8f64d..6abe267 100644
--- a/engines/fullpipe/gameloader.cpp
+++ b/engines/fullpipe/gameloader.cpp
@@ -35,10 +35,10 @@ CInventory2 *getGameLoaderInventory() {
return &g_fullpipe->_gameLoader->_inventory;
}
-CMctlCompound *getSc2MctlCompoundBySceneId(int16 sceneId) {
+MctlCompound *getSc2MctlCompoundBySceneId(int16 sceneId) {
for (uint i = 0; i < g_fullpipe->_gameLoader->_sc2array.size(); i++)
if (g_fullpipe->_gameLoader->_sc2array[i]._sceneId == sceneId)
- return (CMctlCompound *)g_fullpipe->_gameLoader->_sc2array[i]._motionController;
+ return (MctlCompound *)g_fullpipe->_gameLoader->_sc2array[i]._motionController;
return 0;
}
@@ -425,7 +425,7 @@ bool Sc2::load(MfcArchive &file) {
_sceneId = file.readUint16LE();
- _motionController = (CMotionController *)file.readClass();
+ _motionController = (MotionController *)file.readClass();
_count1 = file.readUint32LE();
debug(4, "count1: %d", _count1);
diff --git a/engines/fullpipe/gameloader.h b/engines/fullpipe/gameloader.h
index 2f1f57a..db69100 100644
--- a/engines/fullpipe/gameloader.h
+++ b/engines/fullpipe/gameloader.h
@@ -30,17 +30,17 @@
namespace Fullpipe {
class SceneTag;
-class CMctlCompound;
+class MctlCompound;
class CInputController;
class CInteractionController;
-class CMotionController;
+class MotionController;
class Sc2 : public CObject {
public:
int16 _sceneId;
int16 _field_2;
Scene *_scene;
- CMotionController *_motionController;
+ MotionController *_motionController;
int32 *_data1; // FIXME, could be a struct
int _count1;
PicAniInfo **_defPicAniInfos;
@@ -110,7 +110,7 @@ class CGameLoader : public CObject {
CInventory2 *getGameLoaderInventory();
CInteractionController *getGameLoaderInteractionController();
-CMctlCompound *getSc2MctlCompoundBySceneId(int16 sceneId);
+MctlCompound *getSc2MctlCompoundBySceneId(int16 sceneId);
} // End of namespace Fullpipe
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 1d46f79..022eef8 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -32,31 +32,31 @@
namespace Fullpipe {
-bool CMotionController::load(MfcArchive &file) {
+bool MotionController::load(MfcArchive &file) {
// Is originally empty file.readClass();
- debug(5, "CMotionController::load()");
+ debug(5, "MotionController::load()");
return true;
}
-bool CMctlCompound::load(MfcArchive &file) {
- debug(5, "CMctlCompound::load()");
+bool MctlCompound::load(MfcArchive &file) {
+ debug(5, "MctlCompound::load()");
int count = file.readUint32LE();
- debug(6, "CMctlCompound::count = %d", count);
+ debug(6, "MctlCompound::count = %d", count);
for (int i = 0; i < count; i++) {
debug(6, "CompoundArray[%d]", i);
- CMctlCompoundArrayItem *obj = (CMctlCompoundArrayItem *)file.readClass();
+ MctlCompoundArrayItem *obj = (MctlCompoundArrayItem *)file.readClass();
int count1 = file.readUint32LE();
debug(6, "ConnectionPoint::count: %d", count1);
for (int j = 0; j < count1; j++) {
debug(6, "ConnectionPoint[%d]", j);
- CMctlConnectionPoint *obj1 = (CMctlConnectionPoint *)file.readClass();
+ MctlConnectionPoint *obj1 = (MctlConnectionPoint *)file.readClass();
obj->_connectionPoints.push_back(*obj1);
}
@@ -65,7 +65,7 @@ bool CMctlCompound::load(MfcArchive &file) {
obj->_field_24 = file.readUint32LE();
debug(6, "graphReact");
- obj->_movGraphReactObj = (CMovGraphReact *)file.readClass();
+ obj->_movGraphReactObj = (MovGraphReact *)file.readClass();
_motionControllers.push_back(*obj);
}
@@ -73,53 +73,53 @@ bool CMctlCompound::load(MfcArchive &file) {
return true;
}
-void CMctlCompound::addObject(StaticANIObject *obj) {
- warning("STUB: CMctlCompound::addObject()");
+void MctlCompound::addObject(StaticANIObject *obj) {
+ warning("STUB: MctlCompound::addObject()");
}
-void CMctlCompound::initMovGraph2() {
- warning("STUB: CMctlCompound::initMovGraph2()");
+void MctlCompound::initMovGraph2() {
+ warning("STUB: MctlCompound::initMovGraph2()");
}
-MessageQueue *CMctlCompound::method34(StaticANIObject *subj, int xpos, int ypos, int flag, int staticsId) {
- warning("STUB: CMctlCompound::method34()");
+MessageQueue *MctlCompound::method34(StaticANIObject *subj, int xpos, int ypos, int flag, int staticsId) {
+ warning("STUB: MctlCompound::method34()");
return 0;
}
-MessageQueue *CMctlCompound::method4C(StaticANIObject *subj, int xpos, int ypos, int flag, int staticsId) {
- warning("STUB: CMctlCompound::method4C()");
+MessageQueue *MctlCompound::method4C(StaticANIObject *subj, int xpos, int ypos, int flag, int staticsId) {
+ warning("STUB: MctlCompound::method4C()");
return 0;
}
-bool CMctlCompoundArray::load(MfcArchive &file) {
- debug(5, "CMctlCompoundArray::load()");
+bool MctlCompoundArray::load(MfcArchive &file) {
+ debug(5, "MctlCompoundArray::load()");
int count = file.readUint32LE();
- debug(0, "CMctlCompoundArray::count = %d", count);
+ debug(0, "MctlCompoundArray::count = %d", count);
assert(0);
return true;
}
-int CMovGraph_messageHandler(ExCommand *cmd);
+int MovGraph_messageHandler(ExCommand *cmd);
-CMovGraph::CMovGraph() {
- warning("STUB: CMovGraph::CMovGraph()");
+MovGraph::MovGraph() {
+ warning("STUB: MovGraph::MovGraph()");
_itemsCount = 0;
_items = 0;
- //_callback1 = CMovGraphCallback1; // TODO
+ //_callback1 = MovGraphCallback1; // TODO
_field_44 = 0;
- insertMessageHandler(CMovGraph_messageHandler, getMessageHandlersCount() - 1, 129);
+ insertMessageHandler(MovGraph_messageHandler, getMessageHandlersCount() - 1, 129);
_objtype = kObjTypeMovGraph;
}
-bool CMovGraph::load(MfcArchive &file) {
- debug(5, "CMovGraph::load()");
+bool MovGraph::load(MfcArchive &file) {
+ debug(5, "MovGraph::load()");
_links.load(file);
_nodes.load(file);
@@ -127,24 +127,24 @@ bool CMovGraph::load(MfcArchive &file) {
return true;
}
-void CMovGraph::addObject(StaticANIObject *obj) {
- warning("STUB: CMovGraph::addObject()");
+void MovGraph::addObject(StaticANIObject *obj) {
+ warning("STUB: MovGraph::addObject()");
}
-double CMovGraph::calcDistance(Common::Point *point, CMovGraphLink *link, int flag) {
- warning("STUB: CMovGraph::calcDistance()");
+double MovGraph::calcDistance(Common::Point *point, MovGraphLink *link, int flag) {
+ warning("STUB: MovGraph::calcDistance()");
return 0;
}
-CMovGraphNode *CMovGraph::calcOffset(int ox, int oy) {
- warning("STUB: CMovGraph::calcOffset()");
+MovGraphNode *MovGraph::calcOffset(int ox, int oy) {
+ warning("STUB: MovGraph::calcOffset()");
return 0;
}
-CMovGraphLink::CMovGraphLink() {
+MovGraphLink::MovGraphLink() {
_distance = 0;
_angle = 0;
_flags = 0x10000000;
@@ -156,8 +156,8 @@ CMovGraphLink::CMovGraphLink() {
_name = 0;
}
-bool CMovGraphLink::load(MfcArchive &file) {
- debug(5, "CMovGraphLink::load()");
+bool MovGraphLink::load(MfcArchive &file) {
+ debug(5, "MovGraphLink::load()");
_dwordArray1.load(file);
_dwordArray2.load(file);
@@ -165,23 +165,23 @@ bool CMovGraphLink::load(MfcArchive &file) {
_flags = file.readUint32LE();
debug(8, "GraphNode1");
- _movGraphNode1 = (CMovGraphNode *)file.readClass();
+ _movGraphNode1 = (MovGraphNode *)file.readClass();
debug(8, "GraphNode2");
- _movGraphNode2 = (CMovGraphNode *)file.readClass();
+ _movGraphNode2 = (MovGraphNode *)file.readClass();
_distance = file.readDouble();
_angle = file.readDouble();
debug(8, "distance: %g, angle: %g", _distance, _angle);
- _movGraphReact = (CMovGraphReact *)file.readClass();
+ _movGraphReact = (MovGraphReact *)file.readClass();
_name = file.readPascalString();
return true;
}
-bool CMovGraphNode::load(MfcArchive &file) {
- debug(5, "CMovGraphNode::load()");
+bool MovGraphNode::load(MfcArchive &file) {
+ debug(5, "MovGraphNode::load()");
_field_14 = file.readUint32LE();
_x = file.readUint32LE();
@@ -191,7 +191,7 @@ bool CMovGraphNode::load(MfcArchive &file) {
return true;
}
-CReactParallel::CReactParallel() {
+ReactParallel::ReactParallel() {
_x1 = 0;
_x2 = 0;
_dy = 0;
@@ -201,8 +201,8 @@ CReactParallel::CReactParallel() {
_y2 = 0;
}
-bool CReactParallel::load(MfcArchive &file) {
- debug(5, "CReactParallel::load()");
+bool ReactParallel::load(MfcArchive &file) {
+ debug(5, "ReactParallel::load()");
_x1 = file.readUint32LE();
_y1 = file.readUint32LE();
@@ -216,7 +216,7 @@ bool CReactParallel::load(MfcArchive &file) {
return true;
}
-void CReactParallel::createRegion() {
+void ReactParallel::createRegion() {
_points = (Common::Point **)malloc(sizeof(Common::Point *) * 4);
for (int i = 0; i < 4; i++)
@@ -241,15 +241,15 @@ void CReactParallel::createRegion() {
// GdiObject::Attach(_rgn, CreatePolygonRgn(_points, 4, 2);
}
-CReactPolygonal::CReactPolygonal() {
+ReactPolygonal::ReactPolygonal() {
_field_C = 0;
_points = 0;
_pointCount = 0;
_field_10 = 0;
}
-bool CReactPolygonal::load(MfcArchive &file) {
- debug(5, "CReactPolygonal::load()");
+bool ReactPolygonal::load(MfcArchive &file) {
+ debug(5, "ReactPolygonal::load()");
_field_C = file.readUint32LE();
_field_10 = file.readUint32LE();
@@ -272,7 +272,7 @@ bool CReactPolygonal::load(MfcArchive &file) {
return true;
}
-void CReactPolygonal::createRegion() {
+void ReactPolygonal::createRegion() {
if (_points) {
// GdiObject::Attach(_rgn, CreatePolygonRgn(_points, _pointCount, 2);
diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h
index 7973984..332a494 100644
--- a/engines/fullpipe/motion.h
+++ b/engines/fullpipe/motion.h
@@ -29,13 +29,13 @@ int startWalkTo(int objId, int objKey, int x, int y, int a5);
int doSomeAnimation(int objId, int objKey, int a3);
int doSomeAnimation2(int objId, int objKey);
-class CMotionController : public CObject {
+class MotionController : public CObject {
public:
int _field_4;
bool _isEnabled;
public:
- CMotionController() : _isEnabled(true) {}
+ MotionController() : _isEnabled(true) {}
virtual bool load(MfcArchive &file);
void setEnabled() { _isEnabled = true; }
@@ -45,18 +45,18 @@ class CMotionController : public CObject {
virtual void freeItems() {}
};
-class CMctlCompoundArray : public Common::Array<CObject>, public CObject {
+class MctlCompoundArray : public Common::Array<CObject>, public CObject {
public:
virtual bool load(MfcArchive &file);
};
-class CMctlConnectionPointsArray : public Common::Array<CObject>, public CObject {
+class MctlConnectionPointsArray : public Common::Array<CObject>, public CObject {
public:
virtual bool load(MfcArchive &file);
};
-class CMctlCompound : public CMotionController {
- CMctlCompoundArray _motionControllers;
+class MctlCompound : public MotionController {
+ MctlCompoundArray _motionControllers;
public:
virtual bool load(MfcArchive &file);
@@ -76,7 +76,7 @@ class Unk2 : public CObject {
Unk2() : _items(0), _count(0) {}
};
-class CMovGraphNode : public CObject {
+class MovGraphNode : public CObject {
public:
int _x;
int _y;
@@ -85,30 +85,30 @@ class CMovGraphNode : public CObject {
int _field_14;
public:
- CMovGraphNode() : _x(0), _y(0), _distance(0), _field_10(0), _field_14(0) {}
+ MovGraphNode() : _x(0), _y(0), _distance(0), _field_10(0), _field_14(0) {}
virtual bool load(MfcArchive &file);
};
-class CMovGraphReact : public CObject {
+class MovGraphReact : public CObject {
// Empty
};
-class CMctlCompoundArrayItem : public CObject {
- friend class CMctlCompound;
+class MctlCompoundArrayItem : public CObject {
+ friend class MctlCompound;
protected:
- CMotionController *_motionControllerObj;
- CMovGraphReact *_movGraphReactObj;
- CMctlConnectionPointsArray _connectionPoints;
+ MotionController *_motionControllerObj;
+ MovGraphReact *_movGraphReactObj;
+ MctlConnectionPointsArray _connectionPoints;
int _field_20;
int _field_24;
int _field_28;
public:
- CMctlCompoundArrayItem() : _movGraphReactObj(0) {}
+ MctlCompoundArrayItem() : _movGraphReactObj(0) {}
};
-class CReactParallel : public CMovGraphReact {
+class ReactParallel : public MovGraphReact {
//CRgn _rgn;
int _x1;
int _y1;
@@ -119,12 +119,12 @@ class CReactParallel : public CMovGraphReact {
Common::Point **_points;
public:
- CReactParallel();
+ ReactParallel();
virtual bool load(MfcArchive &file);
void createRegion();
};
-class CReactPolygonal : public CMovGraphReact {
+class ReactPolygonal : public MovGraphReact {
//CRgn _rgn;
int _field_C;
int _field_10;
@@ -132,15 +132,15 @@ class CReactPolygonal : public CMovGraphReact {
Common::Point **_points;
public:
- CReactPolygonal();
+ ReactPolygonal();
virtual bool load(MfcArchive &file);
void createRegion();
};
-class CMovGraphLink : public CObject {
+class MovGraphLink : public CObject {
public:
- CMovGraphNode *_movGraphNode1;
- CMovGraphNode *_movGraphNode2;
+ MovGraphNode *_movGraphNode1;
+ MovGraphNode *_movGraphNode2;
CDWordArray _dwordArray1;
CDWordArray _dwordArray2;
int _flags;
@@ -148,15 +148,15 @@ class CMovGraphLink : public CObject {
int _field_3C;
double _distance;
double _angle;
- CMovGraphReact *_movGraphReact;
+ MovGraphReact *_movGraphReact;
char *_name;
public:
- CMovGraphLink();
+ MovGraphLink();
virtual bool load(MfcArchive &file);
};
-class CMovGraph : public CMotionController {
+class MovGraph : public MotionController {
public:
CObList _nodes;
CObList _links;
@@ -167,16 +167,16 @@ class CMovGraph : public CMotionController {
Unk2 _unk2;
public:
- CMovGraph();
+ MovGraph();
virtual bool load(MfcArchive &file);
virtual void addObject(StaticANIObject *obj);
- double calcDistance(Common::Point *point, CMovGraphLink *link, int flag);
- CMovGraphNode *calcOffset(int ox, int oy);
+ double calcDistance(Common::Point *point, MovGraphLink *link, int flag);
+ MovGraphNode *calcOffset(int ox, int oy);
};
-class CMctlConnectionPoint : public CObject {
+class MctlConnectionPoint : public CObject {
int _connectionX;
int _connectionY;
int _field_C;
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 7aec865..a709d35 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -139,7 +139,7 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
if (_aniMan) {
_aniMan2 = _aniMan;
- CMctlCompound *cmp = getSc2MctlCompoundBySceneId(entrance->_sceneId);
+ MctlCompound *cmp = getSc2MctlCompoundBySceneId(entrance->_sceneId);
cmp->initMovGraph2();
cmp->addObject(_aniMan);
cmp->setEnabled();
@@ -1313,7 +1313,7 @@ int global_messageHandler4(ExCommand *cmd) {
return 1;
}
-int CMovGraph_messageHandler(ExCommand *cmd) {
+int MovGraph_messageHandler(ExCommand *cmd) {
if (cmd->_messageKind != 17)
return 0;
@@ -1328,9 +1328,9 @@ int CMovGraph_messageHandler(ExCommand *cmd) {
if (getSc2MctlCompoundBySceneId(g_fullpipe->_currentScene->_sceneId)->_objtype != kObjTypeMovGraph || !ani)
return 0;
- CMovGraph *gr = (CMovGraph *)getSc2MctlCompoundBySceneId(g_fullpipe->_currentScene->_sceneId);
+ MovGraph *gr = (MovGraph *)getSc2MctlCompoundBySceneId(g_fullpipe->_currentScene->_sceneId);
- CMovGraphLink *link = 0;
+ MovGraphLink *link = 0;
double mindistance = 1.0e10;
Common::Point point;
@@ -1338,17 +1338,17 @@ int CMovGraph_messageHandler(ExCommand *cmd) {
point.x = ani->_ox;
point.y = ani->_oy;
- double dst = gr->calcDistance(&point, (CMovGraphLink *)(*i), 0);
+ double dst = gr->calcDistance(&point, (MovGraphLink *)(*i), 0);
if (dst >= 0.0 && dst < mindistance) {
mindistance = dst;
- link = (CMovGraphLink *)(*i);
+ link = (MovGraphLink *)(*i);
}
}
int top;
if (link) {
- CMovGraphNode *node = link->_movGraphNode1;
+ MovGraphNode *node = link->_movGraphNode1;
double sq = (ani->_oy - node->_y) * (ani->_oy - node->_y) + (ani->_ox - node->_x) * (ani->_ox - node->_x);
int off = (node->_field_14 >> 16) & 0xFF;
diff --git a/engines/fullpipe/utils.cpp b/engines/fullpipe/utils.cpp
index 2ba5a85..920c3e2 100644
--- a/engines/fullpipe/utils.cpp
+++ b/engines/fullpipe/utils.cpp
@@ -267,12 +267,12 @@ enum {
kExCommand,
kCObjstateCommand,
kCGameVar,
- kCMctlCompound,
- kCMovGraph,
- kCMovGraphLink,
- kCMovGraphNode,
- kCReactParallel,
- kCReactPolygonal
+ kMctlCompound,
+ kMovGraph,
+ kMovGraphLink,
+ kMovGraphNode,
+ kReactParallel,
+ kReactPolygonal
};
const struct {
@@ -284,12 +284,12 @@ const struct {
{ "ExCommand", kExCommand },
{ "CObjstateCommand", kCObjstateCommand },
{ "CGameVar", kCGameVar },
- { "CMctlCompound", kCMctlCompound },
- { "CMovGraph", kCMovGraph },
- { "CMovGraphLink", kCMovGraphLink },
- { "CMovGraphNode", kCMovGraphNode },
- { "CReactParallel", kCReactParallel },
- { "CReactPolygonal", kCReactPolygonal },
+ { "MctlCompound", kMctlCompound },
+ { "MovGraph", kMovGraph },
+ { "MovGraphLink", kMovGraphLink },
+ { "MovGraphNode", kMovGraphNode },
+ { "ReactParallel", kReactParallel },
+ { "ReactPolygonal", kReactPolygonal },
{ 0, 0 }
};
@@ -316,18 +316,18 @@ static CObject *createObject(int objectId) {
return new CObjstateCommand();
case kCGameVar:
return new CGameVar();
- case kCMctlCompound:
- return new CMctlCompound();
- case kCMovGraph:
- return new CMovGraph();
- case kCMovGraphLink:
- return new CMovGraphLink();
- case kCMovGraphNode:
- return new CMovGraphNode();
- case kCReactParallel:
- return new CReactParallel();
- case kCReactPolygonal:
- return new CReactPolygonal();
+ case kMctlCompound:
+ return new MctlCompound();
+ case kMovGraph:
+ return new MovGraph();
+ case kMovGraphLink:
+ return new MovGraphLink();
+ case kMovGraphNode:
+ return new MovGraphNode();
+ case kReactParallel:
+ return new ReactParallel();
+ case kReactPolygonal:
+ return new ReactPolygonal();
default:
error("Unknown objectId: %d", objectId);
}
Commit: f70b737ad93544a905209ff9e002aad1f0db6050
https://github.com/scummvm/scummvm/commit/f70b737ad93544a905209ff9e002aad1f0db6050
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-18T08:39:53-07:00
Commit Message:
FULLPIPE: Remove C* prefixes in utils.cpp
Changed paths:
engines/fullpipe/interaction.cpp
engines/fullpipe/interaction.h
engines/fullpipe/motion.h
engines/fullpipe/scenes.cpp
engines/fullpipe/utils.cpp
engines/fullpipe/utils.h
diff --git a/engines/fullpipe/interaction.cpp b/engines/fullpipe/interaction.cpp
index dcc7e90..cdcbf2e 100644
--- a/engines/fullpipe/interaction.cpp
+++ b/engines/fullpipe/interaction.cpp
@@ -40,7 +40,7 @@ bool canInteractAny(GameObject *obj1, GameObject *obj2, int invId) {
sceneId = g_fullpipe->_currentScene->_sceneId;
CInteractionController *intC = getGameLoaderInteractionController();
- for (CObList::iterator i = intC->_interactions.begin(); i != intC->_interactions.end(); ++i) {
+ for (ObList::iterator i = intC->_interactions.begin(); i != intC->_interactions.end(); ++i) {
CInteraction *intr = (CInteraction *)*i;
if (intr->_sceneId > 0 && intr->_sceneId != sceneId)
@@ -112,7 +112,7 @@ bool CInteractionController::handleInteraction(StaticANIObject *subj, GameObject
MessageQueue *mq;
ExCommand *ex;
- for (CObList::iterator i = _interactions.begin(); i != _interactions.end(); ++i) {
+ for (ObList::iterator i = _interactions.begin(); i != _interactions.end(); ++i) {
CInteraction *cinter = (CInteraction *)*i;
if (!cinter->canInteract(subj, obj, invId))
diff --git a/engines/fullpipe/interaction.h b/engines/fullpipe/interaction.h
index 28a03fb..176ec94 100644
--- a/engines/fullpipe/interaction.h
+++ b/engines/fullpipe/interaction.h
@@ -61,7 +61,7 @@ class CInteraction : public CObject {
class CInteractionController : public CObject {
public:
- CObList _interactions;
+ ObList _interactions;
int16 _field_20;
bool _flag24;
diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h
index 332a494..e692c01 100644
--- a/engines/fullpipe/motion.h
+++ b/engines/fullpipe/motion.h
@@ -141,8 +141,8 @@ class MovGraphLink : public CObject {
public:
MovGraphNode *_movGraphNode1;
MovGraphNode *_movGraphNode2;
- CDWordArray _dwordArray1;
- CDWordArray _dwordArray2;
+ DWordArray _dwordArray1;
+ DWordArray _dwordArray2;
int _flags;
int _field_38;
int _field_3C;
@@ -158,8 +158,8 @@ class MovGraphLink : public CObject {
class MovGraph : public MotionController {
public:
- CObList _nodes;
- CObList _links;
+ ObList _nodes;
+ ObList _links;
int _field_44;
int _items;
int _itemsCount;
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index a709d35..2195ee7 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -1334,7 +1334,7 @@ int MovGraph_messageHandler(ExCommand *cmd) {
double mindistance = 1.0e10;
Common::Point point;
- for (CObList::iterator i = gr->_links.begin(); i != gr->_links.end(); ++i) {
+ for (ObList::iterator i = gr->_links.begin(); i != gr->_links.end(); ++i) {
point.x = ani->_ox;
point.y = ani->_oy;
diff --git a/engines/fullpipe/utils.cpp b/engines/fullpipe/utils.cpp
index 920c3e2..f516fb4 100644
--- a/engines/fullpipe/utils.cpp
+++ b/engines/fullpipe/utils.cpp
@@ -44,14 +44,14 @@ bool CObject::loadFile(const char *fname) {
return load(archive);
}
-bool CObList::load(MfcArchive &file) {
- debug(5, "CObList::load()");
+bool ObList::load(MfcArchive &file) {
+ debug(5, "ObList::load()");
int count = file.readCount();
- debug(9, "CObList::count: %d:", count);
+ debug(9, "ObList::count: %d:", count);
for (int i = 0; i < count; i++) {
- debug(9, "CObList::[%d]", i);
+ debug(9, "ObList::[%d]", i);
CObject *t = file.readClass();
push_back(t);
@@ -60,8 +60,8 @@ bool CObList::load(MfcArchive &file) {
return true;
}
-bool CObArray::load(MfcArchive &file) {
- debug(5, "CObArray::load()");
+bool ObArray::load(MfcArchive &file) {
+ debug(5, "ObArray::load()");
int count = file.readCount();
resize(count);
@@ -75,11 +75,11 @@ bool CObArray::load(MfcArchive &file) {
return true;
}
-bool CDWordArray::load(MfcArchive &file) {
- debug(5, "CWordArray::load()");
+bool DWordArray::load(MfcArchive &file) {
+ debug(5, "DWordArray::load()");
int count = file.readCount();
- debug(9, "CDWordArray::count: %d", count);
+ debug(9, "DWordArray::count: %d", count);
resize(count);
diff --git a/engines/fullpipe/utils.h b/engines/fullpipe/utils.h
index 2199706..31bfe86 100644
--- a/engines/fullpipe/utils.h
+++ b/engines/fullpipe/utils.h
@@ -83,7 +83,7 @@ class CObject {
bool loadFile(const char *fname);
};
-class CObList : public Common::List<CObject *>, public CObject {
+class ObList : public Common::List<CObject *>, public CObject {
public:
virtual bool load(MfcArchive &file);
};
@@ -135,12 +135,12 @@ class MemoryObject2 : public MemoryObject {
void copyData(byte *src, int dataSize);
};
-class CObArray : public Common::Array<CObject>, public CObject {
+class ObArray : public Common::Array<CObject>, public CObject {
public:
virtual bool load(MfcArchive &file);
};
-class CDWordArray : public Common::Array<int32>, public CObject {
+class DWordArray : public Common::Array<int32>, public CObject {
public:
virtual bool load(MfcArchive &file);
};
Commit: 3bd3431ad421ba2832d79080b9e26c7967e8a50e
https://github.com/scummvm/scummvm/commit/3bd3431ad421ba2832d79080b9e26c7967e8a50e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-18T08:39:53-07:00
Commit Message:
FULLPIPE: Remove C* prefixes from interaction classes
Changed paths:
engines/fullpipe/gameloader.cpp
engines/fullpipe/gameloader.h
engines/fullpipe/interaction.cpp
engines/fullpipe/interaction.h
engines/fullpipe/utils.cpp
diff --git a/engines/fullpipe/gameloader.cpp b/engines/fullpipe/gameloader.cpp
index 6abe267..d130539 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 db69100..99f263e 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 cdcbf2e..9fd42c1 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 176ec94..f968cca 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 f516fb4..a35a275 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:
Commit: c354981037621fd1bc7b44381d0e7d24d984d5a6
https://github.com/scummvm/scummvm/commit/c354981037621fd1bc7b44381d0e7d24d984d5a6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-18T08:39:53-07:00
Commit Message:
FULLPIPE: Remove C* prefix from input classes
Changed paths:
engines/fullpipe/fullpipe.h
engines/fullpipe/gameloader.cpp
engines/fullpipe/gameloader.h
engines/fullpipe/input.cpp
engines/fullpipe/input.h
diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h
index 348ac2c..7cc1397 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 d130539..7b68ff5 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 99f263e..fe0ec95 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 dfd8d32..4db0ffb 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 4b32e51..bfd547a 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);
Commit: 1ce1712b7ba5042ab88d1ad6d825d249836c7d7b
https://github.com/scummvm/scummvm/commit/1ce1712b7ba5042ab88d1ad6d825d249836c7d7b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-18T08:39:53-07:00
Commit Message:
FULLPIPE: Remove C* prefix from inventory classes
Changed paths:
engines/fullpipe/fullpipe.h
engines/fullpipe/gameloader.cpp
engines/fullpipe/gameloader.h
engines/fullpipe/inventory.cpp
engines/fullpipe/inventory.h
diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h
index 7cc1397..24fa9db 100644
--- a/engines/fullpipe/fullpipe.h
+++ b/engines/fullpipe/fullpipe.h
@@ -48,7 +48,7 @@ class CBaseModalObject;
class CGameLoader;
class CGameVar;
class InputController;
-class CInventory2;
+class Inventory2;
struct CursorInfo;
struct EntranceInfo;
class ExCommand;
@@ -190,7 +190,7 @@ public:
int32 _mapTable[200];
Scene *_inventoryScene;
- CInventory2 *_inventory;
+ Inventory2 *_inventory;
int _currSelectedInventoryItemId;
int32 _updateTicks;
diff --git a/engines/fullpipe/gameloader.cpp b/engines/fullpipe/gameloader.cpp
index 7b68ff5..3f8255c 100644
--- a/engines/fullpipe/gameloader.cpp
+++ b/engines/fullpipe/gameloader.cpp
@@ -31,7 +31,7 @@
namespace Fullpipe {
-CInventory2 *getGameLoaderInventory() {
+Inventory2 *getGameLoaderInventory() {
return &g_fullpipe->_gameLoader->_inventory;
}
diff --git a/engines/fullpipe/gameloader.h b/engines/fullpipe/gameloader.h
index fe0ec95..2fe8bf7 100644
--- a/engines/fullpipe/gameloader.h
+++ b/engines/fullpipe/gameloader.h
@@ -92,7 +92,7 @@ class CGameLoader : public CObject {
GameProject *_gameProject;
InteractionController *_interactionController;
InputController *_inputController;
- CInventory2 _inventory;
+ Inventory2 _inventory;
Sc2Array _sc2array;
void *_sceneSwitcher;
bool (*_preloadCallback)(const PreloadItem &pre, int flag);
@@ -108,7 +108,7 @@ class CGameLoader : public CObject {
int _preloadEntranceId;
};
-CInventory2 *getGameLoaderInventory();
+Inventory2 *getGameLoaderInventory();
InteractionController *getGameLoaderInteractionController();
MctlCompound *getSc2MctlCompoundBySceneId(int16 sceneId);
diff --git a/engines/fullpipe/inventory.cpp b/engines/fullpipe/inventory.cpp
index ccedb57..18ef3c4 100644
--- a/engines/fullpipe/inventory.cpp
+++ b/engines/fullpipe/inventory.cpp
@@ -30,8 +30,8 @@
namespace Fullpipe {
-bool CInventory::load(MfcArchive &file) {
- debug(5, "CInventory::load()");
+bool Inventory::load(MfcArchive &file) {
+ debug(5, "Inventory::load()");
_sceneId = file.readUint16LE();
int numInvs = file.readUint32LE();
@@ -52,7 +52,7 @@ bool CInventory::load(MfcArchive &file) {
return true;
}
-int CInventory::getInventoryPoolItemIndexById(int itemId) {
+int Inventory::getInventoryPoolItemIndexById(int itemId) {
if (_itemsPool.size() <= 0)
return -1;
@@ -64,7 +64,7 @@ int CInventory::getInventoryPoolItemIndexById(int itemId) {
return 0;
}
-bool CInventory::setItemFlags(int itemId, int flags) {
+bool Inventory::setItemFlags(int itemId, int flags) {
int idx = getInventoryPoolItemIndexById(itemId);
if (idx < 0)
@@ -75,7 +75,7 @@ bool CInventory::setItemFlags(int itemId, int flags) {
return true;
}
-CInventory2::CInventory2() {
+Inventory2::Inventory2() {
_selectedId = -1;
_field_48 = -1;
_scene = 0;
@@ -85,7 +85,7 @@ CInventory2::CInventory2() {
_topOffset = -65;
}
-bool CInventory2::loadPartial(MfcArchive &file) { // CInventory2_SerializePartially
+bool Inventory2::loadPartial(MfcArchive &file) { // Inventory2_SerializePartially
int numInvs = file.readUint32LE();
for (int i = 0; i < numInvs; i++) {
@@ -98,27 +98,27 @@ bool CInventory2::loadPartial(MfcArchive &file) { // CInventory2_SerializePartia
return true;
}
-void CInventory2::addItem(int itemId, int count) {
+void Inventory2::addItem(int itemId, int count) {
if (getInventoryPoolItemIndexById(itemId) >= 0)
_inventoryItems.push_back(new InventoryItem(itemId, count));
}
-void CInventory2::addItem2(StaticANIObject *obj) {
+void Inventory2::addItem2(StaticANIObject *obj) {
if (getInventoryPoolItemIndexById(obj->_id) >= 0 && getInventoryPoolItemFieldCById(obj->_id) != 2) {
addItem(obj->_id, 1);
obj->hide();
}
}
-void CInventory2::removeItem(int itemId, int count) {
- warning("STUB: CInventory2::removeItem(%d, %d)", itemId, count);
+void Inventory2::removeItem(int itemId, int count) {
+ warning("STUB: Inventory2::removeItem(%d, %d)", itemId, count);
}
-void CInventory2::removeItem2(Scene *sceneObj, int itemId, int x, int y, int priority) {
+void Inventory2::removeItem2(Scene *sceneObj, int itemId, int x, int y, int priority) {
warning("STUB: void removeItem2(sc, %d, %d, %d, %d)", itemId, x, y, priority);
}
-int CInventory2::getCountItemsWithId(int itemId) {
+int Inventory2::getCountItemsWithId(int itemId) {
int res = 0;
for (uint i = 0; i < _inventoryItems.size(); i++) {
@@ -129,7 +129,7 @@ int CInventory2::getCountItemsWithId(int itemId) {
return res;
}
-int CInventory2::getInventoryItemIndexById(int itemId) {
+int Inventory2::getInventoryItemIndexById(int itemId) {
for (uint i = 0; i < _inventoryItems.size(); i++) {
if (_inventoryItems[i]->itemId == itemId)
return i;
@@ -138,11 +138,11 @@ int CInventory2::getInventoryItemIndexById(int itemId) {
return -1;
}
-int CInventory2::getInventoryPoolItemIdAtIndex(int itemId) {
+int Inventory2::getInventoryPoolItemIdAtIndex(int itemId) {
return _itemsPool[itemId]->id;
}
-int CInventory2::getInventoryPoolItemFieldCById(int itemId) {
+int Inventory2::getInventoryPoolItemFieldCById(int itemId) {
for (uint i = 0; i < _itemsPool.size(); i++) {
if (_itemsPool[i]->id == itemId)
return _itemsPool[i]->field_C;
@@ -151,7 +151,7 @@ int CInventory2::getInventoryPoolItemFieldCById(int itemId) {
return 0;
}
-int CInventory2::getItemFlags(int itemId) {
+int Inventory2::getItemFlags(int itemId) {
int idx = getInventoryPoolItemIndexById(itemId);
if (idx < 0)
@@ -160,7 +160,7 @@ int CInventory2::getItemFlags(int itemId) {
return _itemsPool[idx]->flags;
}
-void CInventory2::rebuildItemRects() {
+void Inventory2::rebuildItemRects() {
_scene = g_fullpipe->accessScene(_sceneId);
if (!_scene)
@@ -222,7 +222,7 @@ void CInventory2::rebuildItemRects() {
}
}
-void CInventory2::draw() {
+void Inventory2::draw() {
if (!_scene)
return;
@@ -295,7 +295,7 @@ reset:
}
-void CInventory2::slideIn() {
+void Inventory2::slideIn() {
_isInventoryOut = false;
ExCommand *ex = new ExCommand(0, 17, 65, 0, 0, 0, 1, 0, 0, 0);
@@ -307,7 +307,7 @@ void CInventory2::slideIn() {
ex->postMessage();
}
-void CInventory2::slideOut() {
+void Inventory2::slideOut() {
_isInventoryOut = true;
ExCommand *ex = new ExCommand(0, 17, 65, 0, 0, 0, 1, 0, 0, 0);
@@ -319,7 +319,7 @@ void CInventory2::slideOut() {
ex->postMessage();
}
-bool CInventory2::handleLeftClick(ExCommand *cmd) {
+bool Inventory2::handleLeftClick(ExCommand *cmd) {
if (!_isInventoryOut)
return false;
@@ -353,7 +353,7 @@ bool CInventory2::handleLeftClick(ExCommand *cmd) {
return res;
}
-int CInventory2::selectItem(int itemId) {
+int Inventory2::selectItem(int itemId) {
if (getInventoryItemIndexById(itemId) < 0)
return -1;
@@ -371,7 +371,7 @@ int CInventory2::selectItem(int itemId) {
return _selectedId;
}
-bool CInventory2::unselectItem(bool flag) {
+bool Inventory2::unselectItem(bool flag) {
if (_selectedId < 0)
return false;
@@ -387,7 +387,7 @@ bool CInventory2::unselectItem(bool flag) {
return true;
}
-int CInventory2::getHoveredItem(Common::Point *point) {
+int Inventory2::getHoveredItem(Common::Point *point) {
int selId = getSelectedItemId();
if (point->y <= 20 && !_isInventoryOut && !_isLocked)
@@ -422,7 +422,7 @@ int CInventory2::getHoveredItem(Common::Point *point) {
}
void FullpipeEngine::getAllInventory() {
- CInventory2 *inv = getGameLoaderInventory();
+ Inventory2 *inv = getGameLoaderInventory();
for (uint i = 0; i < inv->getItemsPoolCount(); ++i ) {
int id = inv->getInventoryPoolItemIdAtIndex(i);
diff --git a/engines/fullpipe/inventory.h b/engines/fullpipe/inventory.h
index 5f10303..6d07f06 100644
--- a/engines/fullpipe/inventory.h
+++ b/engines/fullpipe/inventory.h
@@ -42,13 +42,13 @@ struct InventoryPoolItem {
typedef Common::Array<InventoryPoolItem *> InventoryPoolItems;
-class CInventory : public CObject {
+class Inventory : public CObject {
protected:
int16 _sceneId;
InventoryPoolItems _itemsPool;
public:
- CInventory() { _sceneId = 0; }
+ Inventory() { _sceneId = 0; }
virtual bool load(MfcArchive &file);
int getInventoryPoolItemIndexById(int itemId);
@@ -83,7 +83,7 @@ struct InventoryIcon {
typedef Common::Array<InventoryIcon *> InventoryIcons;
-class CInventory2 : public CInventory {
+class Inventory2 : public Inventory {
InventoryItems _inventoryItems;
InventoryIcons _inventoryIcons;
int _selectedId;
@@ -95,7 +95,7 @@ class CInventory2 : public CInventory {
BigPicture *_picture;
public:
- CInventory2();
+ Inventory2();
bool loadPartial(MfcArchive &file);
void addItem(int itemId, int count);
void addItem2(StaticANIObject *obj);
Commit: fb2d0c02dfbabf0f3b17938d3346bb4477bea384
https://github.com/scummvm/scummvm/commit/fb2d0c02dfbabf0f3b17938d3346bb4477bea384
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-18T08:39:53-07:00
Commit Message:
FULLPIPE: CPtrList -> PtrList
Changed paths:
engines/fullpipe/gfx.cpp
engines/fullpipe/gfx.h
engines/fullpipe/scene.cpp
engines/fullpipe/scene.h
engines/fullpipe/scenes.cpp
engines/fullpipe/stateloader.cpp
engines/fullpipe/statics.h
engines/fullpipe/utils.h
diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp
index 2ab038b..2e89bd6 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/fullpipe/gfx.cpp
@@ -171,7 +171,7 @@ bool PictureObject::load(MfcArchive &file, bool bigPicture) {
_picture->load(file);
- _pictureObject2List = new CPtrList();
+ _pictureObject2List = new PtrList();
int count = file.readUint16LE();
@@ -325,7 +325,7 @@ void GameObject::setOXY(int x, int y) {
_oy = y;
}
-void GameObject::renumPictures(CPtrList *lst) {
+void GameObject::renumPictures(PtrList *lst) {
int *buf = (int *)calloc(lst->size() + 2, sizeof(int));
for (uint i = 0; i < lst->size(); i++) {
diff --git a/engines/fullpipe/gfx.h b/engines/fullpipe/gfx.h
index 82e082d..1f7284a 100644
--- a/engines/fullpipe/gfx.h
+++ b/engines/fullpipe/gfx.h
@@ -137,7 +137,7 @@ class GameObject : public CObject {
virtual bool load(MfcArchive &file);
void setOXY(int x, int y);
- void renumPictures(CPtrList *lst);
+ void renumPictures(PtrList *lst);
void setFlags(int16 flags) { _flags = flags; }
void clearFlags() { _flags = 0; }
const char *getName() { return _objectName; }
@@ -149,7 +149,7 @@ class GameObject : public CObject {
class PictureObject : public GameObject {
public:
Picture *_picture;
- CPtrList *_pictureObject2List;
+ PtrList *_pictureObject2List;
int _ox2;
int _oy2;
@@ -169,7 +169,7 @@ class PictureObject : public GameObject {
class Background : public CObject {
public:
- CPtrList _picObjList;
+ PtrList _picObjList;
char *_bgname;
int _x;
diff --git a/engines/fullpipe/scene.cpp b/engines/fullpipe/scene.cpp
index 6ac062f..0f988b0 100644
--- a/engines/fullpipe/scene.cpp
+++ b/engines/fullpipe/scene.cpp
@@ -259,7 +259,7 @@ void Scene::init() {
if (_staticANIObjectList2.size() != _staticANIObjectList1.size()) {
_staticANIObjectList2.clear();
- for (CPtrList::iterator s = _staticANIObjectList1.begin(); s != _staticANIObjectList1.end(); ++s)
+ for (PtrList::iterator s = _staticANIObjectList1.begin(); s != _staticANIObjectList1.end(); ++s)
_staticANIObjectList2.push_back(*s);
}
}
@@ -273,7 +273,7 @@ StaticANIObject *Scene::getAniMan() {
}
StaticANIObject *Scene::getStaticANIObject1ById(int obj, int a3) {
- for (CPtrList::iterator s = _staticANIObjectList1.begin(); s != _staticANIObjectList1.end(); ++s) {
+ for (PtrList::iterator s = _staticANIObjectList1.begin(); s != _staticANIObjectList1.end(); ++s) {
StaticANIObject *o = (StaticANIObject *)*s;
if (o->_id == obj && (a3 == -1 || o->_okeyCode == a3))
return o;
@@ -441,7 +441,7 @@ bool Scene::compareObjPriority(const void *p1, const void *p2) {
return false;
}
-void Scene::objectList_sortByPriority(CPtrList &list) {
+void Scene::objectList_sortByPriority(PtrList &list) {
Common::sort(list.begin(), list.end(), Scene::compareObjPriority);
}
@@ -453,12 +453,12 @@ void Scene::draw() {
objectList_sortByPriority(_staticANIObjectList2);
- for (CPtrList::iterator s = _staticANIObjectList2.begin(); s != _staticANIObjectList2.end(); ++s) {
+ for (PtrList::iterator s = _staticANIObjectList2.begin(); s != _staticANIObjectList2.end(); ++s) {
((StaticANIObject *)*s)->draw2();
}
int priority = -1;
- for (CPtrList::iterator s = _staticANIObjectList2.begin(); s != _staticANIObjectList2.end(); ++s) {
+ for (PtrList::iterator s = _staticANIObjectList2.begin(); s != _staticANIObjectList2.end(); ++s) {
drawContent(((StaticANIObject *)*s)->_priority, priority, false);
((StaticANIObject *)*s)->draw();
@@ -526,7 +526,7 @@ int Scene::getPictureObjectIdAtPos(int x, int y) {
void Scene::update(int counterdiff) {
debug(0, "Scene::update(%d)", counterdiff);
- for (CPtrList::iterator s = _staticANIObjectList2.begin(); s != _staticANIObjectList2.end(); ++s)
+ for (PtrList::iterator s = _staticANIObjectList2.begin(); s != _staticANIObjectList2.end(); ++s)
((StaticANIObject *)*s)->update(counterdiff);
}
diff --git a/engines/fullpipe/scene.h b/engines/fullpipe/scene.h
index c1c8d47..c01df15 100644
--- a/engines/fullpipe/scene.h
+++ b/engines/fullpipe/scene.h
@@ -31,10 +31,10 @@ class MessageQueue;
class Scene : public Background {
public:
- CPtrList _staticANIObjectList1;
- CPtrList _staticANIObjectList2;
- CPtrList _messageQueueList;
- CPtrList _faObjectList;
+ PtrList _staticANIObjectList1;
+ PtrList _staticANIObjectList2;
+ PtrList _messageQueueList;
+ PtrList _faObjectList;
Shadows *_shadows;
SoundList *_soundList;
int16 _sceneId;
@@ -79,7 +79,7 @@ class Scene : public Background {
private:
static bool compareObjPriority(const void *p1, const void *p2);
- void objectList_sortByPriority(CPtrList &list);
+ void objectList_sortByPriority(PtrList &list);
};
class SceneTag : public CObject {
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 2195ee7..670d752 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -151,7 +151,7 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
scene->setPictureObjectsFlag4();
- for (CPtrList::iterator s = scene->_staticANIObjectList1.begin(); s != scene->_staticANIObjectList1.end(); ++s) {
+ for (PtrList::iterator s = scene->_staticANIObjectList1.begin(); s != scene->_staticANIObjectList1.end(); ++s) {
StaticANIObject *o = (StaticANIObject *)*s;
o->setFlags(o->_flags & 0xFE7F);
}
diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp
index 4c58d56..8681347 100644
--- a/engines/fullpipe/stateloader.cpp
+++ b/engines/fullpipe/stateloader.cpp
@@ -54,7 +54,7 @@ bool FullpipeEngine::loadGam(const char *fname, int scene) {
_inventory->rebuildItemRects();
- for (CPtrList::iterator p = _inventory->getScene()->_picObjList.begin(); p != _inventory->getScene()->_picObjList.end(); ++p) {
+ for (PtrList::iterator p = _inventory->getScene()->_picObjList.begin(); p != _inventory->getScene()->_picObjList.end(); ++p) {
((MemoryObject *)((PictureObject *)*p)->_picture)->load();
}
diff --git a/engines/fullpipe/statics.h b/engines/fullpipe/statics.h
index 03d87c8..44ea8b3 100644
--- a/engines/fullpipe/statics.h
+++ b/engines/fullpipe/statics.h
@@ -118,7 +118,7 @@ class Movement : public GameObject {
int _field_50;
int _counterMax;
int _counter;
- CPtrList _dynamicPhases;
+ PtrList _dynamicPhases;
int _field_78;
Common::Point **_framePosOffsets;
Movement *_currMovement;
@@ -172,8 +172,8 @@ class StaticANIObject : public GameObject {
int _initialCounter;
int _callback1;
void (*_callback2)(int *);
- CPtrList _movements;
- CPtrList _staticsList;
+ PtrList _movements;
+ PtrList _staticsList;
CStepArray _stepArray;
int16 _field_96;
int _messageQueueId;
diff --git a/engines/fullpipe/utils.h b/engines/fullpipe/utils.h
index 31bfe86..64631f4 100644
--- a/engines/fullpipe/utils.h
+++ b/engines/fullpipe/utils.h
@@ -145,7 +145,7 @@ class DWordArray : public Common::Array<int32>, public CObject {
virtual bool load(MfcArchive &file);
};
-typedef Common::Array<void *> CPtrList;
+typedef Common::Array<void *> PtrList;
char *genFileName(int superId, int sceneId, const char *ext);
byte *transCyrillic(byte *s);
Commit: 0b358dbdce1be8dcb170a603e359b603ba51e882
https://github.com/scummvm/scummvm/commit/0b358dbdce1be8dcb170a603e359b603ba51e882
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-18T08:39:53-07:00
Commit Message:
FULLPIPE: CStepArray -> StepArray
Changed paths:
engines/fullpipe/statics.cpp
engines/fullpipe/statics.h
diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index ac80e80..0230995 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/fullpipe/statics.cpp
@@ -33,7 +33,7 @@
namespace Fullpipe {
-CStepArray::CStepArray() {
+StepArray::StepArray() {
_points = 0;
_maxPointIndex = 0;
_currPointIndex = 0;
@@ -41,7 +41,7 @@ CStepArray::CStepArray() {
_isEos = 0;
}
-CStepArray::~CStepArray() {
+StepArray::~StepArray() {
if (_pointsCount) {
for (int i = 0; i < _pointsCount; i++)
delete _points[i];
@@ -52,7 +52,7 @@ CStepArray::~CStepArray() {
}
}
-void CStepArray::clear() {
+void StepArray::clear() {
_currPointIndex = 0;
_maxPointIndex = 0;
_isEos = 0;
@@ -63,7 +63,7 @@ void CStepArray::clear() {
}
}
-Common::Point *CStepArray::getCurrPoint(Common::Point *point) {
+Common::Point *StepArray::getCurrPoint(Common::Point *point) {
if (_isEos || _points == 0) {
point->x = 0;
point->y = 0;
@@ -73,7 +73,7 @@ Common::Point *CStepArray::getCurrPoint(Common::Point *point) {
return point;
}
-bool CStepArray::gotoNextPoint() {
+bool StepArray::gotoNextPoint() {
if (_currPointIndex < _maxPointIndex) {
_currPointIndex++;
return true;
diff --git a/engines/fullpipe/statics.h b/engines/fullpipe/statics.h
index 44ea8b3..1767a57 100644
--- a/engines/fullpipe/statics.h
+++ b/engines/fullpipe/statics.h
@@ -29,7 +29,7 @@ namespace Fullpipe {
class ExCommand;
-class CStepArray : public CObject {
+class StepArray : public CObject {
int _currPointIndex;
Common::Point **_points;
int _maxPointIndex;
@@ -37,8 +37,8 @@ class CStepArray : public CObject {
int _isEos;
public:
- CStepArray();
- ~CStepArray();
+ StepArray();
+ ~StepArray();
void clear();
int getCurrPointIndex() { return _currPointIndex; }
@@ -174,7 +174,7 @@ class StaticANIObject : public GameObject {
void (*_callback2)(int *);
PtrList _movements;
PtrList _staticsList;
- CStepArray _stepArray;
+ StepArray _stepArray;
int16 _field_96;
int _messageQueueId;
int _messageNum;
Commit: f40787dbbfa27242d28de2a68b734874ad2a08f4
https://github.com/scummvm/scummvm/commit/f40787dbbfa27242d28de2a68b734874ad2a08f4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-18T08:39:53-07:00
Commit Message:
FULLPIPE: Rename C* modal objects
Changed paths:
engines/fullpipe/fullpipe.cpp
engines/fullpipe/fullpipe.h
engines/fullpipe/modal.cpp
engines/fullpipe/modal.h
engines/fullpipe/scenes.cpp
diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp
index 99de4dc..5b3f178 100644
--- a/engines/fullpipe/fullpipe.cpp
+++ b/engines/fullpipe/fullpipe.cpp
@@ -236,7 +236,7 @@ void FullpipeEngine::updateEvents() {
_modalObject->update();
} else {
_modalObject->saveload();
- CBaseModalObject *obj = _modalObject->_parentObj;
+ BaseModalObject *obj = _modalObject->_parentObj;
if (obj)
delete _modalObject;
_modalObject = obj;
@@ -360,7 +360,7 @@ void FullpipeEngine::updateScreen() {
_modalObject->update();
} else {
_modalObject->saveload();
- CBaseModalObject *tmp = _modalObject->_parentObj;
+ BaseModalObject *tmp = _modalObject->_parentObj;
delete _modalObject;
diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h
index 24fa9db..c950ed5 100644
--- a/engines/fullpipe/fullpipe.h
+++ b/engines/fullpipe/fullpipe.h
@@ -44,7 +44,7 @@ enum FullpipeGameFeatures {
};
class BehaviorManager;
-class CBaseModalObject;
+class BaseModalObject;
class CGameLoader;
class CGameVar;
class InputController;
@@ -197,7 +197,7 @@ public:
int32 _lastInputTicks;
int32 _lastButtonUpTicks;
- CBaseModalObject *_modalObject;
+ BaseModalObject *_modalObject;
int (*_updateScreenCallback)();
int (*_updateCursorCallback)();
diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index 6f1bc0c..26048ce 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -28,30 +28,30 @@
namespace Fullpipe {
-bool CBaseModalObject::handleMessage(ExCommand *message) {
- warning("STUB: CBaseModalObject::handleMessage()");
+bool BaseModalObject::handleMessage(ExCommand *message) {
+ warning("STUB: BaseModalObject::handleMessage()");
return true;
}
-bool CBaseModalObject::init(int counterdiff) {
- warning("STUB: CBaseModalObject::init(%d)", counterdiff);
+bool BaseModalObject::init(int counterdiff) {
+ warning("STUB: BaseModalObject::init(%d)", counterdiff);
return true;
}
-bool CBaseModalObject::update() {
- warning("STUB: CBaseModalObject::update()");
+bool BaseModalObject::update() {
+ warning("STUB: BaseModalObject::update()");
return true;
}
-void CBaseModalObject::saveload() {
- warning("STUB: CBaseModalObject::saveload()");
+void BaseModalObject::saveload() {
+ warning("STUB: BaseModalObject::saveload()");
}
-CModalIntro::CModalIntro() {
+ModalIntro::ModalIntro() {
_field_8 = 0;
_countDown = 0;
_needRedraw = 0;
@@ -68,7 +68,7 @@ CModalIntro::CModalIntro() {
_sfxVolume = g_fullpipe->_sfxVolume;
}
-bool CModalIntro::handleMessage(ExCommand *message) {
+bool ModalIntro::handleMessage(ExCommand *message) {
if (message->_messageKind != 17)
return false;
diff --git a/engines/fullpipe/modal.h b/engines/fullpipe/modal.h
index 73236e8..7d98427 100644
--- a/engines/fullpipe/modal.h
+++ b/engines/fullpipe/modal.h
@@ -25,14 +25,14 @@
namespace Fullpipe {
-class CBaseModalObject {
+class BaseModalObject {
public:
- CBaseModalObject *_parentObj;
+ BaseModalObject *_parentObj;
public:
- CBaseModalObject() : _parentObj(0) {}
- virtual ~CBaseModalObject() {}
+ BaseModalObject() : _parentObj(0) {}
+ virtual ~BaseModalObject() {}
virtual bool handleMessage(ExCommand *message);
virtual bool init(int counterdiff);
@@ -41,7 +41,7 @@ class CBaseModalObject {
void saveload();
};
-class CModalIntro : public CBaseModalObject {
+class ModalIntro : public BaseModalObject {
int _field_8;
int _introFlags;
int _countDown;
@@ -49,7 +49,7 @@ class CModalIntro : public CBaseModalObject {
int _sfxVolume;
public:
- CModalIntro();
+ ModalIntro();
virtual bool handleMessage(ExCommand *message);
};
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 670d752..1ac92c3 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -1406,7 +1406,7 @@ void sceneIntro_initScene(Scene *sc) {
if (g_fullpipe->_recordEvents || g_fullpipe->_inputArFlag)
g_vars->sceneIntro_skipIntro = false;
- g_fullpipe->_modalObject = new CModalIntro;
+ g_fullpipe->_modalObject = new ModalIntro;
}
int sceneHandlerIntro(ExCommand *cmd) {
Commit: 655054fb37eb53b376f63d8cf8839c7bd4550682
https://github.com/scummvm/scummvm/commit/655054fb37eb53b376f63d8cf8839c7bd4550682
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-18T08:39:54-07:00
Commit Message:
FULLPIPE: CObjstateCommand -> ObjStateCommand
Changed paths:
engines/fullpipe/messages.cpp
engines/fullpipe/messages.h
engines/fullpipe/scenes.cpp
engines/fullpipe/utils.cpp
diff --git a/engines/fullpipe/messages.cpp b/engines/fullpipe/messages.cpp
index 36fd139..e74aae0 100644
--- a/engines/fullpipe/messages.cpp
+++ b/engines/fullpipe/messages.cpp
@@ -169,13 +169,13 @@ Message::Message(int16 parentId, int messageKind, int x, int y, int a6, int a7,
_field_34 = 0;
}
-CObjstateCommand::CObjstateCommand() {
+ObjstateCommand::ObjstateCommand() {
_value = 0;
_objCommandName = 0;
}
-bool CObjstateCommand::load(MfcArchive &file) {
- debug(5, "CObjStateCommand::load()");
+bool ObjstateCommand::load(MfcArchive &file) {
+ debug(5, "ObjStateCommand::load()");
_objtype = kObjTypeObjstateCommand;
diff --git a/engines/fullpipe/messages.h b/engines/fullpipe/messages.h
index 7ba9126..5ae94b9 100644
--- a/engines/fullpipe/messages.h
+++ b/engines/fullpipe/messages.h
@@ -82,14 +82,14 @@ class ExCommand2 : public ExCommand {
int _pointsSize;
};
-class CObjstateCommand : public CObject {
+class ObjstateCommand : public CObject {
public:
ExCommand _cmd;
char *_objCommandName;
int _value;
public:
- CObjstateCommand();
+ ObjstateCommand();
virtual bool load(MfcArchive &file);
};
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 1ac92c3..8aed9e7 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -1076,7 +1076,7 @@ int global_messageHandler3(ExCommand *cmd) {
return doSomeAnimation2(cmd->_parentId, cmd->_keyCode);
case 63:
if (cmd->_objtype == kObjTypeObjstateCommand) {
- CObjstateCommand *c = (CObjstateCommand *)cmd;
+ ObjstateCommand *c = (ObjstateCommand *)cmd;
result = 1;
g_fullpipe->setObjectState(c->_objCommandName, c->_value);
}
diff --git a/engines/fullpipe/utils.cpp b/engines/fullpipe/utils.cpp
index a35a275..6042652 100644
--- a/engines/fullpipe/utils.cpp
+++ b/engines/fullpipe/utils.cpp
@@ -265,7 +265,7 @@ enum {
kInteraction,
kMessageQueue,
kExCommand,
- kCObjstateCommand,
+ kObjstateCommand,
kCGameVar,
kMctlCompound,
kMovGraph,
@@ -282,7 +282,7 @@ const struct {
{ "CInteraction", kInteraction },
{ "MessageQueue", kMessageQueue },
{ "ExCommand", kExCommand },
- { "CObjstateCommand", kCObjstateCommand },
+ { "CObjstateCommand", kObjstateCommand },
{ "CGameVar", kCGameVar },
{ "CMctlCompound", kMctlCompound },
{ "CMovGraph", kMovGraph },
@@ -312,8 +312,8 @@ static CObject *createObject(int objectId) {
return new MessageQueue();
case kExCommand:
return new ExCommand();
- case kCObjstateCommand:
- return new CObjstateCommand();
+ case kObjstateCommand:
+ return new ObjstateCommand();
case kCGameVar:
return new CGameVar();
case kMctlCompound:
Commit: 918d2f175a84b8de2255b0df664dd2c792b2c170
https://github.com/scummvm/scummvm/commit/918d2f175a84b8de2255b0df664dd2c792b2c170
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-18T08:39:54-07:00
Commit Message:
FULLPIPE: CGameVar -> GameVar
Changed paths:
engines/fullpipe/behavior.cpp
engines/fullpipe/behavior.h
engines/fullpipe/fullpipe.cpp
engines/fullpipe/fullpipe.h
engines/fullpipe/gameloader.cpp
engines/fullpipe/gameloader.h
engines/fullpipe/init.cpp
engines/fullpipe/objects.h
engines/fullpipe/scene.cpp
engines/fullpipe/scene.h
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
engines/fullpipe/sound.cpp
engines/fullpipe/stateloader.cpp
engines/fullpipe/statics.cpp
engines/fullpipe/utils.cpp
diff --git a/engines/fullpipe/behavior.cpp b/engines/fullpipe/behavior.cpp
index 6bfb400..1a2b7bb 100644
--- a/engines/fullpipe/behavior.cpp
+++ b/engines/fullpipe/behavior.cpp
@@ -48,17 +48,17 @@ void BehaviorManager::clear() {
_behaviors.clear();
}
-void BehaviorManager::initBehavior(Scene *sc, CGameVar *var) {
+void BehaviorManager::initBehavior(Scene *sc, GameVar *var) {
clear();
_scene = sc;
BehaviorInfo *behinfo;
- CGameVar *behvar = var->getSubVarByName("BEHAVIOR");
+ GameVar *behvar = var->getSubVarByName("BEHAVIOR");
if (!behvar)
return;
- for (CGameVar *subvar = behvar->_subVars; subvar; subvar = subvar->_nextVarObj) {
+ for (GameVar *subvar = behvar->_subVars; subvar; subvar = subvar->_nextVarObj) {
if (!strcmp(subvar->_varName, "AMBIENT")) {
behinfo = new BehaviorInfo;
behinfo->initAmbientBehavior(subvar, sc);
@@ -191,7 +191,7 @@ void BehaviorInfo::clear() {
_bheItems.clear();
}
-void BehaviorInfo::initAmbientBehavior(CGameVar *var, Scene *sc) {
+void BehaviorInfo::initAmbientBehavior(GameVar *var, Scene *sc) {
debug(0, "BehaviorInfo::initAmbientBehavior(%s)", transCyrillic((byte *)var->_varName));
clear();
@@ -215,7 +215,7 @@ void BehaviorInfo::initAmbientBehavior(CGameVar *var, Scene *sc) {
}
}
-void BehaviorInfo::initObjectBehavior(CGameVar *var, Scene *sc, StaticANIObject *ani) {
+void BehaviorInfo::initObjectBehavior(GameVar *var, Scene *sc, StaticANIObject *ani) {
debug(0, "BehaviorInfo::initObjectBehavior(%s)", transCyrillic((byte *)var->_varName));
clear();
@@ -227,7 +227,7 @@ void BehaviorInfo::initObjectBehavior(CGameVar *var, Scene *sc, StaticANIObject
if (strcmp(var->_value.stringValue, "ROOT"))
break;
- CGameVar *v1 = g_fullpipe->getGameLoaderGameVar()->getSubVarByName("BEHAVIOR")->getSubVarByName(ani->getName());
+ GameVar *v1 = g_fullpipe->getGameLoaderGameVar()->getSubVarByName("BEHAVIOR")->getSubVarByName(ani->getName());
if (v1 == var)
return;
@@ -255,7 +255,7 @@ BehaviorEntry::BehaviorEntry() {
_items = 0;
}
-BehaviorEntry::BehaviorEntry(CGameVar *var, Scene *sc, StaticANIObject *ani, int *minDelay) {
+BehaviorEntry::BehaviorEntry(GameVar *var, Scene *sc, StaticANIObject *ani, int *minDelay) {
_staticsId = 0;
_itemsCount = 0;
@@ -274,7 +274,7 @@ BehaviorEntry::BehaviorEntry(CGameVar *var, Scene *sc, StaticANIObject *ani, int
_items = (BehaviorEntryInfo**)calloc(_itemsCount, sizeof(BehaviorEntryInfo *));
for (int i = 0; i < _itemsCount; i++) {
- CGameVar *subvar = var->getSubVarByIndex(i);
+ GameVar *subvar = var->getSubVarByIndex(i);
int delay;
_items[i] = new BehaviorEntryInfo(subvar, sc, &delay);
@@ -289,14 +289,14 @@ BehaviorEntry::BehaviorEntry(CGameVar *var, Scene *sc, StaticANIObject *ani, int
}
}
-BehaviorEntryInfo::BehaviorEntryInfo(CGameVar *subvar, Scene *sc, int *delay) {
+BehaviorEntryInfo::BehaviorEntryInfo(GameVar *subvar, Scene *sc, int *delay) {
_messageQueue = 0;
_delay = 0;
_percent = 0;
_flags = 0;
_messageQueue = sc->getMessageQueueByName(subvar->_varName);
- CGameVar *vart = subvar->getSubVarByName("dwDelay");
+ GameVar *vart = subvar->getSubVarByName("dwDelay");
if (vart)
_delay = vart->_value.intValue;
diff --git a/engines/fullpipe/behavior.h b/engines/fullpipe/behavior.h
index d9375d4..83a548f 100644
--- a/engines/fullpipe/behavior.h
+++ b/engines/fullpipe/behavior.h
@@ -31,7 +31,7 @@ struct BehaviorEntryInfo {
uint32 _percent;
int _flags;
- BehaviorEntryInfo(CGameVar *subvar, Scene *sc, int *delay);
+ BehaviorEntryInfo(GameVar *subvar, Scene *sc, int *delay);
};
struct BehaviorEntry {
@@ -41,7 +41,7 @@ struct BehaviorEntry {
BehaviorEntryInfo **_items;
BehaviorEntry();
- BehaviorEntry(CGameVar *var, Scene *sc, StaticANIObject *ani, int *minDelay);
+ BehaviorEntry(GameVar *var, Scene *sc, StaticANIObject *ani, int *minDelay);
};
struct BehaviorInfo {
@@ -57,8 +57,8 @@ struct BehaviorInfo {
BehaviorInfo() { clear(); }
void clear();
- void initAmbientBehavior(CGameVar *var, Scene *sc);
- void initObjectBehavior(CGameVar *var, Scene *sc, StaticANIObject *ani);
+ void initAmbientBehavior(GameVar *var, Scene *sc);
+ void initObjectBehavior(GameVar *var, Scene *sc, StaticANIObject *ani);
};
class BehaviorManager : public CObject {
@@ -72,7 +72,7 @@ class BehaviorManager : public CObject {
void clear();
- void initBehavior(Scene *scene, CGameVar *var);
+ void initBehavior(Scene *scene, GameVar *var);
void updateBehaviors();
void updateBehavior(BehaviorInfo *behaviorInfo, BehaviorEntry *entry);
diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp
index 5b3f178..5e1af12 100644
--- a/engines/fullpipe/fullpipe.cpp
+++ b/engines/fullpipe/fullpipe.cpp
@@ -389,7 +389,7 @@ void FullpipeEngine::updateScreen() {
}
int FullpipeEngine::getObjectEnumState(const char *name, const char *state) {
- CGameVar *var = _gameLoader->_gameVar->getSubVarByName("OBJSTATES");
+ GameVar *var = _gameLoader->_gameVar->getSubVarByName("OBJSTATES");
if (!var) {
var = _gameLoader->_gameVar->addSubVarAsInt("OBJSTATES", 0);
@@ -406,7 +406,7 @@ int FullpipeEngine::getObjectEnumState(const char *name, const char *state) {
}
int FullpipeEngine::getObjectState(const char *objname) {
- CGameVar *var = _gameLoader->_gameVar->getSubVarByName("OBJSTATES");
+ GameVar *var = _gameLoader->_gameVar->getSubVarByName("OBJSTATES");
if (var)
return var->getSubVarAsInt(objname);
@@ -415,7 +415,7 @@ int FullpipeEngine::getObjectState(const char *objname) {
}
void FullpipeEngine::setObjectState(const char *name, int state) {
- CGameVar *var = _gameLoader->_gameVar->getSubVarByName("OBJSTATES");
+ GameVar *var = _gameLoader->_gameVar->getSubVarByName("OBJSTATES");
if (!var) {
var = _gameLoader->_gameVar->addSubVarAsInt("OBJSTATES", 0);
diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h
index c950ed5..bab1d8e 100644
--- a/engines/fullpipe/fullpipe.h
+++ b/engines/fullpipe/fullpipe.h
@@ -46,7 +46,7 @@ enum FullpipeGameFeatures {
class BehaviorManager;
class BaseModalObject;
class CGameLoader;
-class CGameVar;
+class GameVar;
class InputController;
class Inventory2;
struct CursorInfo;
@@ -102,7 +102,7 @@ public:
GameProject *_gameProject;
bool loadGam(const char *fname, int scene = 0);
- CGameVar *getGameLoaderGameVar();
+ GameVar *getGameLoaderGameVar();
InputController *getGameLoaderInputController();
int _gameProjectVersion;
@@ -218,7 +218,7 @@ public:
bool sceneSwitcher(EntranceInfo *entrance);
Scene *accessScene(int sceneId);
- void setSceneMusicParameters(CGameVar *var);
+ void setSceneMusicParameters(GameVar *var);
NGIArchive *_currArchive;
diff --git a/engines/fullpipe/gameloader.cpp b/engines/fullpipe/gameloader.cpp
index 3f8255c..2d1f144 100644
--- a/engines/fullpipe/gameloader.cpp
+++ b/engines/fullpipe/gameloader.cpp
@@ -124,7 +124,7 @@ bool CGameLoader::load(MfcArchive &file) {
_field_FA = file.readUint16LE();
_field_F8 = file.readUint16LE();
- _gameVar = (CGameVar *)file.readClass();
+ _gameVar = (GameVar *)file.readClass();
return true;
}
@@ -181,7 +181,7 @@ bool CGameLoader::gotoScene(int sceneId, int entranceId) {
return false;
}
- CGameVar *sg = _gameVar->getSubVarByName("OBJSTATES")->getSubVarByName("SAVEGAME");
+ GameVar *sg = _gameVar->getSubVarByName("OBJSTATES")->getSubVarByName("SAVEGAME");
if (sg || (sg = _gameVar->getSubVarByName("OBJSTATES")->addSubVarAsInt("SAVEGAME", 0)) != 0)
sg->setSubVarAsInt("Entrance", entranceId);
@@ -496,7 +496,7 @@ bool PreloadItems::load(MfcArchive &file) {
return true;
}
-CGameVar *FullpipeEngine::getGameLoaderGameVar() {
+GameVar *FullpipeEngine::getGameLoaderGameVar() {
if (_gameLoader)
return _gameLoader->_gameVar;
else
diff --git a/engines/fullpipe/gameloader.h b/engines/fullpipe/gameloader.h
index 2fe8bf7..e702001 100644
--- a/engines/fullpipe/gameloader.h
+++ b/engines/fullpipe/gameloader.h
@@ -100,7 +100,7 @@ class CGameLoader : public CObject {
int16 _field_F8;
int16 _field_FA;
PreloadItems _preloadItems;
- CGameVar *_gameVar;
+ GameVar *_gameVar;
char *_gameName;
ExCommand _exCommand;
int _updateCounter;
diff --git a/engines/fullpipe/init.cpp b/engines/fullpipe/init.cpp
index c334542..fb60a4c 100644
--- a/engines/fullpipe/init.cpp
+++ b/engines/fullpipe/init.cpp
@@ -123,7 +123,7 @@ void FullpipeEngine::initObjectStates() {
}
void FullpipeEngine::setLevelStates() {
- CGameVar *v = _gameLoader->_gameVar->getSubVarByName("OBJSTATES")->getSubVarByName(sO_LiftButtons);
+ GameVar *v = _gameLoader->_gameVar->getSubVarByName("OBJSTATES")->getSubVarByName(sO_LiftButtons);
if (v) {
v->setSubVarAsInt(sO_Level0, 2833);
diff --git a/engines/fullpipe/objects.h b/engines/fullpipe/objects.h
index 9e7c753..a12851e 100644
--- a/engines/fullpipe/objects.h
+++ b/engines/fullpipe/objects.h
@@ -69,27 +69,27 @@ union VarValue {
char *stringValue;
};
-class CGameVar : public CObject {
+class GameVar : public CObject {
public:
- CGameVar *_nextVarObj;
- CGameVar *_prevVarObj;
- CGameVar *_parentVarObj;
- CGameVar *_subVars;
- CGameVar *_field_14;
+ GameVar *_nextVarObj;
+ GameVar *_prevVarObj;
+ GameVar *_parentVarObj;
+ GameVar *_subVars;
+ GameVar *_field_14;
char *_varName;
VarValue _value;
int _varType;
public:
- CGameVar();
+ GameVar();
virtual bool load(MfcArchive &file);
- CGameVar *getSubVarByName(const char *name);
+ GameVar *getSubVarByName(const char *name);
bool setSubVarAsInt(const char *name, int value);
int getSubVarAsInt(const char *name);
- CGameVar *addSubVarAsInt(const char *name, int value);
- bool addSubVar(CGameVar *subvar);
+ GameVar *addSubVarAsInt(const char *name, int value);
+ bool addSubVar(GameVar *subvar);
int getSubVarsCount();
- CGameVar *getSubVarByIndex(int idx);
+ GameVar *getSubVarByIndex(int idx);
};
} // End of namespace Fullpipe
diff --git a/engines/fullpipe/scene.cpp b/engines/fullpipe/scene.cpp
index 0f988b0..0ea724f 100644
--- a/engines/fullpipe/scene.cpp
+++ b/engines/fullpipe/scene.cpp
@@ -371,16 +371,16 @@ MessageQueue *Scene::getMessageQueueByName(char *name) {
return 0;
}
-void Scene::preloadMovements(CGameVar *var) {
- CGameVar *preload = var->getSubVarByName("PRELOAD");
+void Scene::preloadMovements(GameVar *var) {
+ GameVar *preload = var->getSubVarByName("PRELOAD");
if (!preload)
return;
- for (CGameVar *i = preload->_subVars; i; i = i->_nextVarObj) {
+ for (GameVar *i = preload->_subVars; i; i = i->_nextVarObj) {
StaticANIObject *ani = getStaticANIObject1ByName(i->_varName, -1);
if (ani) {
- CGameVar *subVars = i->_subVars;
+ GameVar *subVars = i->_subVars;
if (subVars) {
for (;subVars; subVars = subVars->_nextVarObj) {
@@ -397,7 +397,7 @@ void Scene::preloadMovements(CGameVar *var) {
}
void Scene::initObjectCursors(const char *varname) {
- CGameVar *cursorsVar = g_fullpipe->getGameLoaderGameVar()->getSubVarByName(varname)->getSubVarByName("CURSORS");
+ GameVar *cursorsVar = g_fullpipe->getGameLoaderGameVar()->getSubVarByName(varname)->getSubVarByName("CURSORS");
if (!cursorsVar || !cursorsVar->_subVars)
return;
@@ -405,7 +405,7 @@ void Scene::initObjectCursors(const char *varname) {
int maxId = 0;
int minId = 0xffff;
- for (CGameVar *sub = cursorsVar->_subVars; sub; sub = sub->_nextVarObj) {
+ for (GameVar *sub = cursorsVar->_subVars; sub; sub = sub->_nextVarObj) {
GameObject *obj = getPictureObjectByName(sub->_varName, -1);
if (obj || (obj = getStaticANIObject1ByName(sub->_varName, -1)) != 0) {
@@ -421,7 +421,7 @@ void Scene::initObjectCursors(const char *varname) {
g_fullpipe->_objectIdCursors.resize(maxId - minId + 1);
- for (CGameVar *sub = cursorsVar->_subVars; sub; sub = sub->_nextVarObj) {
+ for (GameVar *sub = cursorsVar->_subVars; sub; sub = sub->_nextVarObj) {
GameObject *obj = getPictureObjectByName(sub->_varName, -1);
if (!obj)
diff --git a/engines/fullpipe/scene.h b/engines/fullpipe/scene.h
index c01df15..7fe3b93 100644
--- a/engines/fullpipe/scene.h
+++ b/engines/fullpipe/scene.h
@@ -69,7 +69,7 @@ class Scene : public Background {
PictureObject *getPictureObjectById(int objId, int flags);
PictureObject *getPictureObjectByName(const char *name, int keyCode);
void deletePictureObject(PictureObject *obj);
- void preloadMovements(CGameVar *var);
+ void preloadMovements(GameVar *var);
StaticANIObject *getStaticANIObjectAtPos(int x, int y);
PictureObject *getPictureObjectAtPos(int x, int y);
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 8aed9e7..d66291d 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -75,7 +75,7 @@ Vars::Vars() {
}
bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
- CGameVar *sceneVar;
+ GameVar *sceneVar;
Common::Point sceneDim;
Scene *scene = accessScene(entrance->_sceneId);
@@ -657,7 +657,7 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
}
void setElevatorButton(const char *name, int state) {
- CGameVar *var = g_fullpipe->getGameLoaderGameVar()->getSubVarByName("OBJSTATES")->getSubVarByName(sO_LiftButtons);
+ GameVar *var = g_fullpipe->getGameLoaderGameVar()->getSubVarByName("OBJSTATES")->getSubVarByName(sO_LiftButtons);
if (var)
var->setSubVarAsInt(name, state);
@@ -1383,7 +1383,7 @@ int sceneIntro_updateCursor() {
}
void FullpipeEngine::setSwallowedEggsState() {
- CGameVar *v = _gameLoader->_gameVar->getSubVarByName("OBJSTATES")->getSubVarByName(sO_GulpedEggs);
+ GameVar *v = _gameLoader->_gameVar->getSubVarByName("OBJSTATES")->getSubVarByName(sO_GulpedEggs);
g_vars->swallowedEgg1 = v->getSubVarByName(sO_Egg1);
g_vars->swallowedEgg2 = v->getSubVarByName(sO_Egg2);
@@ -1416,7 +1416,7 @@ int sceneHandlerIntro(ExCommand *cmd) {
}
void scene01_fixEntrance() {
- CGameVar *var = g_fullpipe->getGameLoaderGameVar()->getSubVarByName("OBJSTATES")->getSubVarByName("SAVEGAME");
+ GameVar *var = g_fullpipe->getGameLoaderGameVar()->getSubVarByName("OBJSTATES")->getSubVarByName("SAVEGAME");
if (var->getSubVarAsInt("Entrance") == TrubaLeft)
var->setSubVarAsInt("Entrance", TrubaRight);
}
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index be42838..5597612 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -31,9 +31,9 @@ class Vars {
public:
Vars();
- CGameVar *swallowedEgg1;
- CGameVar *swallowedEgg2;
- CGameVar *swallowedEgg3;
+ GameVar *swallowedEgg1;
+ GameVar *swallowedEgg2;
+ GameVar *swallowedEgg3;
StaticANIObject *sceneIntro_aniin1man;
bool sceneIntro_needSleep;
diff --git a/engines/fullpipe/sound.cpp b/engines/fullpipe/sound.cpp
index 821049c..6da848a 100644
--- a/engines/fullpipe/sound.cpp
+++ b/engines/fullpipe/sound.cpp
@@ -111,7 +111,7 @@ void Sound::setPanAndVolumeByStaticAni() {
debug(3, "STUB Sound::setPanAndVolumeByStaticAni()");
}
-void FullpipeEngine::setSceneMusicParameters(CGameVar *var) {
+void FullpipeEngine::setSceneMusicParameters(GameVar *var) {
warning("STUB: FullpipeEngine::setSceneMusicParameters()");
}
diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp
index 8681347..8fe7027 100644
--- a/engines/fullpipe/stateloader.cpp
+++ b/engines/fullpipe/stateloader.cpp
@@ -145,7 +145,7 @@ GameProject::~GameProject() {
free(_headerFilename);
}
-CGameVar::CGameVar() {
+GameVar::GameVar() {
_subVars = 0;
_parentVarObj = 0;
_nextVarObj = 0;
@@ -156,7 +156,7 @@ CGameVar::CGameVar() {
_varName = 0;
}
-bool CGameVar::load(MfcArchive &file) {
+bool GameVar::load(MfcArchive &file) {
_varName = file.readPascalString();
_varType = file.readUint32LE();
@@ -184,18 +184,18 @@ bool CGameVar::load(MfcArchive &file) {
}
file.incLevel();
- _parentVarObj = (CGameVar *)file.readClass();
- _prevVarObj = (CGameVar *)file.readClass();
- _nextVarObj = (CGameVar *)file.readClass();
- _field_14 = (CGameVar *)file.readClass();
- _subVars = (CGameVar *)file.readClass();
+ _parentVarObj = (GameVar *)file.readClass();
+ _prevVarObj = (GameVar *)file.readClass();
+ _nextVarObj = (GameVar *)file.readClass();
+ _field_14 = (GameVar *)file.readClass();
+ _subVars = (GameVar *)file.readClass();
file.decLevel();
return true;
}
-CGameVar *CGameVar::getSubVarByName(const char *name) {
- CGameVar *sv = 0;
+GameVar *GameVar::getSubVarByName(const char *name) {
+ GameVar *sv = 0;
if (_subVars != 0) {
sv = _subVars;
@@ -205,8 +205,8 @@ CGameVar *CGameVar::getSubVarByName(const char *name) {
return sv;
}
-bool CGameVar::setSubVarAsInt(const char *name, int value) {
- CGameVar *var = getSubVarByName(name);
+bool GameVar::setSubVarAsInt(const char *name, int value) {
+ GameVar *var = getSubVarByName(name);
if (var) {
if (var->_varType == 0) {
@@ -217,7 +217,7 @@ bool CGameVar::setSubVarAsInt(const char *name, int value) {
return false;
}
- var = new CGameVar();
+ var = new GameVar();
var->_varType = 0;
var->_value.intValue = value;
var->_varName = (char *)calloc(strlen(name) + 1, 1);
@@ -226,8 +226,8 @@ bool CGameVar::setSubVarAsInt(const char *name, int value) {
return addSubVar(var);
}
-int CGameVar::getSubVarAsInt(const char *name) {
- CGameVar *var = getSubVarByName(name);
+int GameVar::getSubVarAsInt(const char *name) {
+ GameVar *var = getSubVarByName(name);
if (var)
return var->_value.intValue;
@@ -235,11 +235,11 @@ int CGameVar::getSubVarAsInt(const char *name) {
return 0;
}
-CGameVar *CGameVar::addSubVarAsInt(const char *name, int value) {
+GameVar *GameVar::addSubVarAsInt(const char *name, int value) {
if (getSubVarByName(name)) {
return 0;
} else {
- CGameVar *var = new CGameVar();
+ GameVar *var = new GameVar();
var->_varType = 0;
var->_value.intValue = value;
@@ -251,11 +251,11 @@ CGameVar *CGameVar::addSubVarAsInt(const char *name, int value) {
}
}
-bool CGameVar::addSubVar(CGameVar *subvar) {
- CGameVar *var = _subVars;
+bool GameVar::addSubVar(GameVar *subvar) {
+ GameVar *var = _subVars;
if (var) {
- for (CGameVar *i = var->_nextVarObj; i; i = i->_nextVarObj)
+ for (GameVar *i = var->_nextVarObj; i; i = i->_nextVarObj)
var = i;
var->_nextVarObj = subvar;
@@ -273,9 +273,9 @@ bool CGameVar::addSubVar(CGameVar *subvar) {
return false;
}
-int CGameVar::getSubVarsCount() {
+int GameVar::getSubVarsCount() {
int res;
- CGameVar *sub = _subVars;
+ GameVar *sub = _subVars;
for (res = 0; sub; res++)
sub = sub->_nextVarObj;
@@ -283,8 +283,8 @@ int CGameVar::getSubVarsCount() {
return res;
}
-CGameVar *CGameVar::getSubVarByIndex(int idx) {
- CGameVar *sub = _subVars;
+GameVar *GameVar::getSubVarByIndex(int idx) {
+ GameVar *sub = _subVars;
while (idx--) {
sub = sub->_nextVarObj;
diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index 0230995..343d5e9 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/fullpipe/statics.cpp
@@ -547,7 +547,7 @@ void StaticANIObject::draw2() {
}
MovTable *StaticANIObject::countMovements() {
- CGameVar *preloadSubVar = g_fullpipe->getGameLoaderGameVar()->getSubVarByName(getName())->getSubVarByName("PRELOAD");
+ GameVar *preloadSubVar = g_fullpipe->getGameLoaderGameVar()->getSubVarByName(getName())->getSubVarByName("PRELOAD");
if (!preloadSubVar || preloadSubVar->getSubVarsCount() == 0)
return 0;
@@ -561,7 +561,7 @@ MovTable *StaticANIObject::countMovements() {
GameObject *obj = (GameObject *)_movements[i];
movTable->movs[i] = 2;
- for (CGameVar *sub = preloadSubVar->_subVars; sub; sub = sub->_nextVarObj) {
+ for (GameVar *sub = preloadSubVar->_subVars; sub; sub = sub->_nextVarObj) {
if (scumm_stricmp(obj->getName(), sub->_varName) == 0) {
movTable->movs[i] = 1;
break;
@@ -573,7 +573,7 @@ MovTable *StaticANIObject::countMovements() {
}
void StaticANIObject::setSpeed(int speed) {
- CGameVar *var = g_fullpipe->getGameLoaderGameVar()->getSubVarByName(getName())->getSubVarByName("SpeedUp");
+ GameVar *var = g_fullpipe->getGameLoaderGameVar()->getSubVarByName(getName())->getSubVarByName("SpeedUp");
if (!var)
return;
diff --git a/engines/fullpipe/utils.cpp b/engines/fullpipe/utils.cpp
index 6042652..3304a93 100644
--- a/engines/fullpipe/utils.cpp
+++ b/engines/fullpipe/utils.cpp
@@ -266,7 +266,7 @@ enum {
kMessageQueue,
kExCommand,
kObjstateCommand,
- kCGameVar,
+ kGameVar,
kMctlCompound,
kMovGraph,
kMovGraphLink,
@@ -283,7 +283,7 @@ const struct {
{ "MessageQueue", kMessageQueue },
{ "ExCommand", kExCommand },
{ "CObjstateCommand", kObjstateCommand },
- { "CGameVar", kCGameVar },
+ { "CGameVar", kGameVar },
{ "CMctlCompound", kMctlCompound },
{ "CMovGraph", kMovGraph },
{ "CMovGraphLink", kMovGraphLink },
@@ -314,8 +314,8 @@ static CObject *createObject(int objectId) {
return new ExCommand();
case kObjstateCommand:
return new ObjstateCommand();
- case kCGameVar:
- return new CGameVar();
+ case kGameVar:
+ return new GameVar();
case kMctlCompound:
return new MctlCompound();
case kMovGraph:
Commit: 4a6ede35e764d60c35e17052414ffbc8682a0a04
https://github.com/scummvm/scummvm/commit/4a6ede35e764d60c35e17052414ffbc8682a0a04
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-18T08:39:54-07:00
Commit Message:
FULLPIPE: CGameLoader -> GameLoader
Changed paths:
engines/fullpipe/fullpipe.h
engines/fullpipe/gameloader.cpp
engines/fullpipe/gameloader.h
engines/fullpipe/stateloader.cpp
diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h
index bab1d8e..6872dd8 100644
--- a/engines/fullpipe/fullpipe.h
+++ b/engines/fullpipe/fullpipe.h
@@ -45,7 +45,7 @@ enum FullpipeGameFeatures {
class BehaviorManager;
class BaseModalObject;
-class CGameLoader;
+class GameLoader;
class GameVar;
class InputController;
class Inventory2;
@@ -98,7 +98,7 @@ public:
Graphics::Surface _backgroundSurface;
- CGameLoader *_gameLoader;
+ GameLoader *_gameLoader;
GameProject *_gameProject;
bool loadGam(const char *fname, int scene = 0);
diff --git a/engines/fullpipe/gameloader.cpp b/engines/fullpipe/gameloader.cpp
index 2d1f144..f8ede5c 100644
--- a/engines/fullpipe/gameloader.cpp
+++ b/engines/fullpipe/gameloader.cpp
@@ -47,7 +47,7 @@ InteractionController *getGameLoaderInteractionController() {
return g_fullpipe->_gameLoader->_interactionController;
}
-CGameLoader::CGameLoader() {
+GameLoader::GameLoader() {
_interactionController = new InteractionController();
_inputController = new InputController();
@@ -74,15 +74,15 @@ CGameLoader::CGameLoader() {
g_fullpipe->_msgId = 0;
}
-CGameLoader::~CGameLoader() {
+GameLoader::~GameLoader() {
free(_gameName);
delete _gameProject;
delete _interactionController;
delete _inputController;
}
-bool CGameLoader::load(MfcArchive &file) {
- debug(5, "CGameLoader::load()");
+bool GameLoader::load(MfcArchive &file) {
+ debug(5, "GameLoader::load()");
_gameName = file.readPascalString();
debug(6, "_gameName: %s", _gameName);
@@ -129,7 +129,7 @@ bool CGameLoader::load(MfcArchive &file) {
return true;
}
-bool CGameLoader::loadScene(int sceneId) {
+bool GameLoader::loadScene(int sceneId) {
SceneTag *st;
int idx = getSceneTagBySceneId(sceneId, &st);
@@ -155,7 +155,7 @@ bool CGameLoader::loadScene(int sceneId) {
return false;
}
-bool CGameLoader::gotoScene(int sceneId, int entranceId) {
+bool GameLoader::gotoScene(int sceneId, int entranceId) {
SceneTag *st;
int sc2idx = getSceneTagBySceneId(sceneId, &st);
@@ -234,7 +234,7 @@ bool preloadCallback(const PreloadItem &pre, int flag) {
return true;
}
-bool CGameLoader::preloadScene(int sceneId, int entranceId) {
+bool GameLoader::preloadScene(int sceneId, int entranceId) {
debug(0, "preloadScene(%d, %d), ", sceneId, entranceId);
if (_preloadSceneId != sceneId || _preloadEntranceId != entranceId) {
@@ -289,7 +289,7 @@ bool CGameLoader::preloadScene(int sceneId, int entranceId) {
return true;
}
-bool CGameLoader::unloadScene(int sceneId) {
+bool GameLoader::unloadScene(int sceneId) {
SceneTag *tag;
int sceneTag = getSceneTagBySceneId(sceneId, &tag);
@@ -310,7 +310,7 @@ bool CGameLoader::unloadScene(int sceneId) {
return true;
}
-int CGameLoader::getSceneTagBySceneId(int sceneId, SceneTag **st) {
+int GameLoader::getSceneTagBySceneId(int sceneId, SceneTag **st) {
if (_sc2array.size() > 0 && _gameProject->_sceneTagList->size() > 0) {
for (uint i = 0; i < _sc2array.size(); i++) {
if (_sc2array[i]._sceneId == sceneId) {
@@ -329,11 +329,11 @@ int CGameLoader::getSceneTagBySceneId(int sceneId, SceneTag **st) {
return -1;
}
-void CGameLoader::applyPicAniInfos(Scene *sc, PicAniInfo **picAniInfo, int picAniInfoCount) {
+void GameLoader::applyPicAniInfos(Scene *sc, PicAniInfo **picAniInfo, int picAniInfoCount) {
if (picAniInfoCount <= 0)
return;
- debug(0, "CGameLoader::applyPicAniInfos(sc, ptr, %d)", picAniInfoCount);
+ debug(0, "GameLoader::applyPicAniInfos(sc, ptr, %d)", picAniInfoCount);
PictureObject *pict;
StaticANIObject *ani;
@@ -381,11 +381,11 @@ void CGameLoader::applyPicAniInfos(Scene *sc, PicAniInfo **picAniInfo, int picAn
}
}
-void CGameLoader::saveScenePicAniInfos(int sceneId) {
- warning("STUB: CGameLoader::saveScenePicAniInfos(%d)", sceneId);
+void GameLoader::saveScenePicAniInfos(int sceneId) {
+ warning("STUB: GameLoader::saveScenePicAniInfos(%d)", sceneId);
}
-void CGameLoader::updateSystems(int counterdiff) {
+void GameLoader::updateSystems(int counterdiff) {
if (g_fullpipe->_currentScene) {
g_fullpipe->_currentScene->update(counterdiff);
diff --git a/engines/fullpipe/gameloader.h b/engines/fullpipe/gameloader.h
index e702001..4f54626 100644
--- a/engines/fullpipe/gameloader.h
+++ b/engines/fullpipe/gameloader.h
@@ -72,10 +72,10 @@ class PreloadItems : public Common::Array<PreloadItem *>, public CObject {
virtual bool load(MfcArchive &file);
};
-class CGameLoader : public CObject {
+class GameLoader : public CObject {
public:
- CGameLoader();
- virtual ~CGameLoader();
+ GameLoader();
+ virtual ~GameLoader();
virtual bool load(MfcArchive &file);
bool loadScene(int sceneId);
diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp
index 8fe7027..747015e 100644
--- a/engines/fullpipe/stateloader.cpp
+++ b/engines/fullpipe/stateloader.cpp
@@ -37,7 +37,7 @@
namespace Fullpipe {
bool FullpipeEngine::loadGam(const char *fname, int scene) {
- _gameLoader = new CGameLoader();
+ _gameLoader = new GameLoader();
if (!_gameLoader->loadFile(fname))
return false;
More information about the Scummvm-git-logs
mailing list