diff options
| author | Eugene Sandulenko | 2013-09-18 19:28:44 +0400 |
|---|---|---|
| committer | Eugene Sandulenko | 2013-09-18 19:39:54 +0400 |
| commit | 655054fb37eb53b376f63d8cf8839c7bd4550682 (patch) | |
| tree | 013fde7ba5be1945d804add19ab29d21d0cf89c4 /engines | |
| parent | f40787dbbfa27242d28de2a68b734874ad2a08f4 (diff) | |
| download | scummvm-rg350-655054fb37eb53b376f63d8cf8839c7bd4550682.tar.gz scummvm-rg350-655054fb37eb53b376f63d8cf8839c7bd4550682.tar.bz2 scummvm-rg350-655054fb37eb53b376f63d8cf8839c7bd4550682.zip | |
FULLPIPE: CObjstateCommand -> ObjStateCommand
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/fullpipe/messages.cpp | 6 | ||||
| -rw-r--r-- | engines/fullpipe/messages.h | 4 | ||||
| -rw-r--r-- | engines/fullpipe/scenes.cpp | 2 | ||||
| -rw-r--r-- | engines/fullpipe/utils.cpp | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/engines/fullpipe/messages.cpp b/engines/fullpipe/messages.cpp index 36fd1399ce..e74aae0ddb 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 7ba9126d46..5ae94b9cef 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 1ac92c3c10..8aed9e7f48 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 a35a275c95..60426524c2 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: |