FULLPIPE: CObjstateCommand -> ObjStateCommand

This commit is contained in:
Eugene Sandulenko 2013-09-18 19:28:44 +04:00
parent f40787dbbf
commit 655054fb37
4 changed files with 10 additions and 10 deletions

View File

@ -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;

View File

@ -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);
};

View File

@ -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);
}

View File

@ -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: