diff options
-rw-r--r-- | engines/fullpipe/gameloader.cpp | 2 | ||||
-rw-r--r-- | engines/fullpipe/gameloader.h | 2 | ||||
-rw-r--r-- | engines/fullpipe/interaction.cpp | 1 | ||||
-rw-r--r-- | engines/fullpipe/messages.cpp | 2 | ||||
-rw-r--r-- | engines/fullpipe/motion.cpp | 1 | ||||
-rw-r--r-- | engines/fullpipe/scene.cpp | 2 | ||||
-rw-r--r-- | engines/fullpipe/scenes.cpp | 2 | ||||
-rw-r--r-- | engines/fullpipe/sound.cpp | 3 | ||||
-rw-r--r-- | engines/fullpipe/stateloader.cpp | 1 |
9 files changed, 12 insertions, 4 deletions
diff --git a/engines/fullpipe/gameloader.cpp b/engines/fullpipe/gameloader.cpp index f4f59a724c..a91065fe87 100644 --- a/engines/fullpipe/gameloader.cpp +++ b/engines/fullpipe/gameloader.cpp @@ -51,7 +51,7 @@ CGameLoader::CGameLoader() { _inputController = new CInputController(); _gameProject = 0; - //_gameName = "untitled"; + _gameName = 0; addMessageHandlerByIndex(global_messageHandler2, 0, 0); insertMessageHandler(global_messageHandler3, 0, 128); diff --git a/engines/fullpipe/gameloader.h b/engines/fullpipe/gameloader.h index cc41855dba..a8d51cd794 100644 --- a/engines/fullpipe/gameloader.h +++ b/engines/fullpipe/gameloader.h @@ -32,7 +32,7 @@ namespace Fullpipe { class SceneTag; class CMctlCompound; class CInputController; - class CInteractionController; +class CInteractionController; class CGameLoader : public CObject { public: diff --git a/engines/fullpipe/interaction.cpp b/engines/fullpipe/interaction.cpp index 8942d5dc6d..b25a20949f 100644 --- a/engines/fullpipe/interaction.cpp +++ b/engines/fullpipe/interaction.cpp @@ -61,6 +61,7 @@ CInteraction::CInteraction() { _staticsId2 = 0; _field_28 = 0; _sceneId = -1; + _actionName = 0; } bool CInteraction::load(MfcArchive &file) { diff --git a/engines/fullpipe/messages.cpp b/engines/fullpipe/messages.cpp index 55a0b5f0bd..953b87c6af 100644 --- a/engines/fullpipe/messages.cpp +++ b/engines/fullpipe/messages.cpp @@ -171,6 +171,7 @@ Message::Message(int16 parentId, int messageKind, int x, int y, int a6, int a7, CObjstateCommand::CObjstateCommand() { _value = 0; + _objCommandName = 0; } bool CObjstateCommand::load(MfcArchive &file) { @@ -192,6 +193,7 @@ MessageQueue::MessageQueue() { _id = 0; _isFinished = 0; _flags = 0; + _queueName = 0; } MessageQueue::MessageQueue(MessageQueue *src, int parId, int field_38) { diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp index fed3cb79ff..3259653001 100644 --- a/engines/fullpipe/motion.cpp +++ b/engines/fullpipe/motion.cpp @@ -122,6 +122,7 @@ CMovGraphLink::CMovGraphLink() { _field_3C = 0; _field_38 = 0; _movGraphReact = 0; + _name = 0; } bool CMovGraphLink::load(MfcArchive &file) { diff --git a/engines/fullpipe/scene.cpp b/engines/fullpipe/scene.cpp index 7f1aeaa02c..da89611c9b 100644 --- a/engines/fullpipe/scene.cpp +++ b/engines/fullpipe/scene.cpp @@ -70,6 +70,7 @@ bool SceneTagList::load(MfcArchive &file) { SceneTag::SceneTag() { _field_4 = 0; _scene = 0; + _tag = 0; } bool SceneTag::load(MfcArchive &file) { @@ -123,6 +124,7 @@ Scene::Scene() { _shadows = 0; _soundList = 0; _libHandle = 0; + _sceneName = 0; } bool Scene::load(MfcArchive &file) { diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp index f3991e234b..b6c05afb9d 100644 --- a/engines/fullpipe/scenes.cpp +++ b/engines/fullpipe/scenes.cpp @@ -140,7 +140,7 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) { scene->setPictureObjectsFlag4(); for (CPtrList::iterator s = scene->_staticANIObjectList1.begin(); s != scene->_staticANIObjectList1.end(); ++s) { - StaticANIObject *o = (StaticANIObject *)s; + StaticANIObject *o = (StaticANIObject *)*s; o->setFlags(o->_field_6 & 0xFE7F); } diff --git a/engines/fullpipe/sound.cpp b/engines/fullpipe/sound.cpp index d69ce35777..7a6696edd6 100644 --- a/engines/fullpipe/sound.cpp +++ b/engines/fullpipe/sound.cpp @@ -73,7 +73,8 @@ Sound::Sound() { _directSoundBuffer = 0; _soundData = 0; _objectId = 0; - memset(_directSoundBuffers, 0, sizeof(_directSoundBuffers)); + memset(_directSoundBuffers, 0, sizeof(_directSoundBuffers)); + _description = 0; } diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp index 6d6185e58c..97306c1815 100644 --- a/engines/fullpipe/stateloader.cpp +++ b/engines/fullpipe/stateloader.cpp @@ -171,6 +171,7 @@ CGameVar::CGameVar() { _field_14 = 0; _varType = 0; _value.floatValue = 0; + _varName = 0; } bool CGameVar::load(MfcArchive &file) { |