[Scummvm-git-logs] scummvm master -> a70a5cb5b34a87bb96d726590a71b18767b7deb7
sev-
sev at scummvm.org
Sat Oct 3 22:06:30 UTC 2020
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
aef74baff1 FULLPIPE: Rename engine to NGI (files)
9e258f16ef NGI: Rename fullpipe.* -> ngi.*
1177b608fd NGI: Namespace rename
3cadfbeaf7 NGI: Rename engine class
a70a5cb5b3 NGI: Rename guard defines
Commit: aef74baff1c79c1b904e4e4f44a7d25df977238b
https://github.com/scummvm/scummvm/commit/aef74baff1c79c1b904e4e4f44a7d25df977238b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-04T00:05:36+02:00
Commit Message:
FULLPIPE: Rename engine to NGI (files)
Changed paths:
A engines/ngi/anihandler.cpp
A engines/ngi/anihandler.h
A engines/ngi/behavior.cpp
A engines/ngi/behavior.h
A engines/ngi/configure.engine
A engines/ngi/console.cpp
A engines/ngi/console.h
A engines/ngi/constants.h
A engines/ngi/detection.cpp
A engines/ngi/floaters.cpp
A engines/ngi/floaters.h
A engines/ngi/fullpipe.cpp
A engines/ngi/fullpipe.h
A engines/ngi/fullpipe/scene01.cpp
A engines/ngi/fullpipe/scene02.cpp
A engines/ngi/fullpipe/scene03.cpp
A engines/ngi/fullpipe/scene04.cpp
A engines/ngi/fullpipe/scene05.cpp
A engines/ngi/fullpipe/scene06.cpp
A engines/ngi/fullpipe/scene07.cpp
A engines/ngi/fullpipe/scene08.cpp
A engines/ngi/fullpipe/scene09.cpp
A engines/ngi/fullpipe/scene10.cpp
A engines/ngi/fullpipe/scene11.cpp
A engines/ngi/fullpipe/scene12.cpp
A engines/ngi/fullpipe/scene13.cpp
A engines/ngi/fullpipe/scene14.cpp
A engines/ngi/fullpipe/scene15.cpp
A engines/ngi/fullpipe/scene16.cpp
A engines/ngi/fullpipe/scene17.cpp
A engines/ngi/fullpipe/scene18and19.cpp
A engines/ngi/fullpipe/scene20.cpp
A engines/ngi/fullpipe/scene21.cpp
A engines/ngi/fullpipe/scene22.cpp
A engines/ngi/fullpipe/scene23.cpp
A engines/ngi/fullpipe/scene24.cpp
A engines/ngi/fullpipe/scene25.cpp
A engines/ngi/fullpipe/scene26.cpp
A engines/ngi/fullpipe/scene27.cpp
A engines/ngi/fullpipe/scene28.cpp
A engines/ngi/fullpipe/scene29.cpp
A engines/ngi/fullpipe/scene30.cpp
A engines/ngi/fullpipe/scene31.cpp
A engines/ngi/fullpipe/scene32.cpp
A engines/ngi/fullpipe/scene33.cpp
A engines/ngi/fullpipe/scene34.cpp
A engines/ngi/fullpipe/scene35.cpp
A engines/ngi/fullpipe/scene36.cpp
A engines/ngi/fullpipe/scene37.cpp
A engines/ngi/fullpipe/scene38.cpp
A engines/ngi/fullpipe/sceneDbg.cpp
A engines/ngi/fullpipe/sceneFinal.cpp
A engines/ngi/fullpipe/sceneIntro.cpp
A engines/ngi/fullpipe/sceneIntroDemo.cpp
A engines/ngi/gameloader.cpp
A engines/ngi/gameloader.h
A engines/ngi/gfx.cpp
A engines/ngi/gfx.h
A engines/ngi/init.cpp
A engines/ngi/input.cpp
A engines/ngi/input.h
A engines/ngi/interaction.cpp
A engines/ngi/interaction.h
A engines/ngi/inventory.cpp
A engines/ngi/inventory.h
A engines/ngi/lift.cpp
A engines/ngi/messagehandlers.cpp
A engines/ngi/messages.cpp
A engines/ngi/messages.h
A engines/ngi/metaengine.cpp
A engines/ngi/modal.cpp
A engines/ngi/modal.h
A engines/ngi/module.mk
A engines/ngi/motion.cpp
A engines/ngi/motion.h
A engines/ngi/ngiarchive.cpp
A engines/ngi/ngiarchive.h
A engines/ngi/objectnames.h
A engines/ngi/objects.h
A engines/ngi/scene.cpp
A engines/ngi/scene.h
A engines/ngi/scenes.cpp
A engines/ngi/scenes.h
A engines/ngi/sound.cpp
A engines/ngi/sound.h
A engines/ngi/stateloader.cpp
A engines/ngi/statesaver.cpp
A engines/ngi/statics.cpp
A engines/ngi/statics.h
A engines/ngi/utils.cpp
A engines/ngi/utils.h
R engines/fullpipe/anihandler.cpp
R engines/fullpipe/anihandler.h
R engines/fullpipe/behavior.cpp
R engines/fullpipe/behavior.h
R engines/fullpipe/configure.engine
R engines/fullpipe/console.cpp
R engines/fullpipe/console.h
R engines/fullpipe/constants.h
R engines/fullpipe/detection.cpp
R engines/fullpipe/floaters.cpp
R engines/fullpipe/floaters.h
R engines/fullpipe/fullpipe.cpp
R engines/fullpipe/fullpipe.h
R engines/fullpipe/gameloader.cpp
R engines/fullpipe/gameloader.h
R engines/fullpipe/gfx.cpp
R engines/fullpipe/gfx.h
R engines/fullpipe/init.cpp
R engines/fullpipe/input.cpp
R engines/fullpipe/input.h
R engines/fullpipe/interaction.cpp
R engines/fullpipe/interaction.h
R engines/fullpipe/inventory.cpp
R engines/fullpipe/inventory.h
R engines/fullpipe/lift.cpp
R engines/fullpipe/messagehandlers.cpp
R engines/fullpipe/messages.cpp
R engines/fullpipe/messages.h
R engines/fullpipe/metaengine.cpp
R engines/fullpipe/modal.cpp
R engines/fullpipe/modal.h
R engines/fullpipe/module.mk
R engines/fullpipe/motion.cpp
R engines/fullpipe/motion.h
R engines/fullpipe/ngiarchive.cpp
R engines/fullpipe/ngiarchive.h
R engines/fullpipe/objectnames.h
R engines/fullpipe/objects.h
R engines/fullpipe/scene.cpp
R engines/fullpipe/scene.h
R engines/fullpipe/scenes.cpp
R engines/fullpipe/scenes.h
R engines/fullpipe/scenes/scene01.cpp
R engines/fullpipe/scenes/scene02.cpp
R engines/fullpipe/scenes/scene03.cpp
R engines/fullpipe/scenes/scene04.cpp
R engines/fullpipe/scenes/scene05.cpp
R engines/fullpipe/scenes/scene06.cpp
R engines/fullpipe/scenes/scene07.cpp
R engines/fullpipe/scenes/scene08.cpp
R engines/fullpipe/scenes/scene09.cpp
R engines/fullpipe/scenes/scene10.cpp
R engines/fullpipe/scenes/scene11.cpp
R engines/fullpipe/scenes/scene12.cpp
R engines/fullpipe/scenes/scene13.cpp
R engines/fullpipe/scenes/scene14.cpp
R engines/fullpipe/scenes/scene15.cpp
R engines/fullpipe/scenes/scene16.cpp
R engines/fullpipe/scenes/scene17.cpp
R engines/fullpipe/scenes/scene18and19.cpp
R engines/fullpipe/scenes/scene20.cpp
R engines/fullpipe/scenes/scene21.cpp
R engines/fullpipe/scenes/scene22.cpp
R engines/fullpipe/scenes/scene23.cpp
R engines/fullpipe/scenes/scene24.cpp
R engines/fullpipe/scenes/scene25.cpp
R engines/fullpipe/scenes/scene26.cpp
R engines/fullpipe/scenes/scene27.cpp
R engines/fullpipe/scenes/scene28.cpp
R engines/fullpipe/scenes/scene29.cpp
R engines/fullpipe/scenes/scene30.cpp
R engines/fullpipe/scenes/scene31.cpp
R engines/fullpipe/scenes/scene32.cpp
R engines/fullpipe/scenes/scene33.cpp
R engines/fullpipe/scenes/scene34.cpp
R engines/fullpipe/scenes/scene35.cpp
R engines/fullpipe/scenes/scene36.cpp
R engines/fullpipe/scenes/scene37.cpp
R engines/fullpipe/scenes/scene38.cpp
R engines/fullpipe/scenes/sceneDbg.cpp
R engines/fullpipe/scenes/sceneFinal.cpp
R engines/fullpipe/scenes/sceneIntro.cpp
R engines/fullpipe/scenes/sceneIntroDemo.cpp
R engines/fullpipe/sound.cpp
R engines/fullpipe/sound.h
R engines/fullpipe/stateloader.cpp
R engines/fullpipe/statesaver.cpp
R engines/fullpipe/statics.cpp
R engines/fullpipe/statics.h
R engines/fullpipe/utils.cpp
R engines/fullpipe/utils.h
diff --git a/engines/fullpipe/module.mk b/engines/fullpipe/module.mk
deleted file mode 100644
index 3e59fdcb79..0000000000
--- a/engines/fullpipe/module.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-MODULE := engines/fullpipe
-
-MODULE_OBJS = \
- anihandler.o \
- behavior.o \
- console.o \
- floaters.o \
- fullpipe.o \
- gameloader.o \
- gfx.o \
- init.o \
- input.o \
- interaction.o \
- inventory.o \
- lift.o \
- messagehandlers.o \
- messages.o \
- metaengine.o \
- modal.o \
- motion.o \
- ngiarchive.o \
- scene.o \
- scenes.o \
- sound.o \
- stateloader.o \
- statesaver.o \
- statics.o \
- utils.o \
- scenes/sceneIntro.o \
- scenes/sceneIntroDemo.o \
- scenes/scene01.o \
- scenes/scene02.o \
- scenes/scene03.o \
- scenes/scene04.o \
- scenes/scene05.o \
- scenes/scene06.o \
- scenes/scene07.o \
- scenes/scene08.o \
- scenes/scene09.o \
- scenes/scene10.o \
- scenes/scene11.o \
- scenes/scene12.o \
- scenes/scene13.o \
- scenes/scene14.o \
- scenes/scene15.o \
- scenes/scene16.o \
- scenes/scene17.o \
- scenes/scene18and19.o \
- scenes/scene20.o \
- scenes/scene21.o \
- scenes/scene22.o \
- scenes/scene23.o \
- scenes/scene24.o \
- scenes/scene25.o \
- scenes/scene26.o \
- scenes/scene27.o \
- scenes/scene28.o \
- scenes/scene29.o \
- scenes/scene30.o \
- scenes/scene31.o \
- scenes/scene32.o \
- scenes/scene33.o \
- scenes/scene34.o \
- scenes/scene35.o \
- scenes/scene36.o \
- scenes/scene37.o \
- scenes/scene38.o \
- scenes/sceneFinal.o \
- scenes/sceneDbg.o
-
-# This module can be built as a plugin
-ifeq ($(ENABLE_FULLPIPE), DYNAMIC_PLUGIN)
-PLUGIN := 1
-endif
-
-# Include common rules
-include $(srcdir)/rules.mk
-
-# Detection objects
-DETECT_OBJS += $(MODULE)/detection.o
diff --git a/engines/fullpipe/anihandler.cpp b/engines/ngi/anihandler.cpp
similarity index 99%
rename from engines/fullpipe/anihandler.cpp
rename to engines/ngi/anihandler.cpp
index 05cde7567d..806cce9c5e 100644
--- a/engines/fullpipe/anihandler.cpp
+++ b/engines/ngi/anihandler.cpp
@@ -20,12 +20,12 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/utils.h"
-#include "fullpipe/statics.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/messages.h"
+#include "ngi/utils.h"
+#include "ngi/statics.h"
+#include "ngi/motion.h"
+#include "ngi/messages.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/anihandler.h b/engines/ngi/anihandler.h
similarity index 100%
rename from engines/fullpipe/anihandler.h
rename to engines/ngi/anihandler.h
diff --git a/engines/fullpipe/behavior.cpp b/engines/ngi/behavior.cpp
similarity index 98%
rename from engines/fullpipe/behavior.cpp
rename to engines/ngi/behavior.cpp
index db91643fa5..f123a0d36c 100644
--- a/engines/fullpipe/behavior.cpp
+++ b/engines/ngi/behavior.cpp
@@ -20,12 +20,12 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objects.h"
-#include "fullpipe/behavior.h"
-#include "fullpipe/statics.h"
-#include "fullpipe/messages.h"
+#include "ngi/objects.h"
+#include "ngi/behavior.h"
+#include "ngi/statics.h"
+#include "ngi/messages.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/behavior.h b/engines/ngi/behavior.h
similarity index 100%
rename from engines/fullpipe/behavior.h
rename to engines/ngi/behavior.h
diff --git a/engines/fullpipe/configure.engine b/engines/ngi/configure.engine
similarity index 67%
rename from engines/fullpipe/configure.engine
rename to engines/ngi/configure.engine
index 58e59befe3..62d49eb8eb 100644
--- a/engines/fullpipe/configure.engine
+++ b/engines/ngi/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
-add_engine fullpipe "Full Pipe" yes "" "" "16bit highres"
+add_engine ngi "Nikita Game Interface" yes "" "" "16bit highres"
diff --git a/engines/fullpipe/console.cpp b/engines/ngi/console.cpp
similarity index 91%
rename from engines/fullpipe/console.cpp
rename to engines/ngi/console.cpp
index 95a9345895..a09fd51b8f 100644
--- a/engines/fullpipe/console.cpp
+++ b/engines/ngi/console.cpp
@@ -20,11 +20,11 @@
*
*/
-#include "fullpipe/console.h"
-#include "fullpipe/constants.h"
-#include "fullpipe/fullpipe.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/scene.h"
+#include "ngi/console.h"
+#include "ngi/constants.h"
+#include "ngi/fullpipe.h"
+#include "ngi/gameloader.h"
+#include "ngi/scene.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/console.h b/engines/ngi/console.h
similarity index 100%
rename from engines/fullpipe/console.h
rename to engines/ngi/console.h
diff --git a/engines/fullpipe/constants.h b/engines/ngi/constants.h
similarity index 100%
rename from engines/fullpipe/constants.h
rename to engines/ngi/constants.h
diff --git a/engines/fullpipe/detection.cpp b/engines/ngi/detection.cpp
similarity index 94%
rename from engines/fullpipe/detection.cpp
rename to engines/ngi/detection.cpp
index 6473ca227c..58ee957f4f 100644
--- a/engines/fullpipe/detection.cpp
+++ b/engines/ngi/detection.cpp
@@ -27,6 +27,7 @@
static const PlainGameDescriptor fullpipeGames[] = {
+ {"ngi", "Nikita Game Interface game"},
{"fullpipe", "Full Pipe"},
{0, 0}
};
@@ -112,11 +113,11 @@ public:
}
const char *getEngineId() const override {
- return "fullpipe";
+ return "ngi";
}
const char *getName() const override {
- return "Full Pipe";
+ return "Nikita Game Interface";
}
const char *getOriginalCopyright() const override {
@@ -124,4 +125,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(FULLPIPE_DETECTION, PLUGIN_TYPE_METAENGINE, FullpipeMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(NGI_DETECTION, PLUGIN_TYPE_METAENGINE, FullpipeMetaEngineStatic);
diff --git a/engines/fullpipe/floaters.cpp b/engines/ngi/floaters.cpp
similarity index 95%
rename from engines/fullpipe/floaters.cpp
rename to engines/ngi/floaters.cpp
index 284e8b7205..33fef3e3e1 100644
--- a/engines/fullpipe/floaters.cpp
+++ b/engines/ngi/floaters.cpp
@@ -20,15 +20,15 @@
*
*/
-#include "fullpipe/fullpipe.h"
-#include "fullpipe/floaters.h"
-#include "fullpipe/utils.h"
-#include "fullpipe/objects.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/statics.h"
-#include "fullpipe/scene.h"
-#include "fullpipe/constants.h"
-#include "fullpipe/objectnames.h"
+#include "ngi/fullpipe.h"
+#include "ngi/floaters.h"
+#include "ngi/utils.h"
+#include "ngi/objects.h"
+#include "ngi/motion.h"
+#include "ngi/statics.h"
+#include "ngi/scene.h"
+#include "ngi/constants.h"
+#include "ngi/objectnames.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/floaters.h b/engines/ngi/floaters.h
similarity index 100%
rename from engines/fullpipe/floaters.h
rename to engines/ngi/floaters.h
diff --git a/engines/fullpipe/fullpipe.cpp b/engines/ngi/fullpipe.cpp
similarity index 96%
rename from engines/fullpipe/fullpipe.cpp
rename to engines/ngi/fullpipe.cpp
index 863b118595..950a15e474 100644
--- a/engines/fullpipe/fullpipe.cpp
+++ b/engines/ngi/fullpipe.cpp
@@ -30,18 +30,18 @@
#include "engines/util.h"
#include "graphics/surface.h"
-#include "fullpipe/fullpipe.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/messages.h"
-#include "fullpipe/behavior.h"
-#include "fullpipe/modal.h"
-#include "fullpipe/input.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/statics.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/floaters.h"
-#include "fullpipe/console.h"
-#include "fullpipe/constants.h"
+#include "ngi/fullpipe.h"
+#include "ngi/gameloader.h"
+#include "ngi/messages.h"
+#include "ngi/behavior.h"
+#include "ngi/modal.h"
+#include "ngi/input.h"
+#include "ngi/motion.h"
+#include "ngi/statics.h"
+#include "ngi/scenes.h"
+#include "ngi/floaters.h"
+#include "ngi/console.h"
+#include "ngi/constants.h"
namespace Fullpipe {
@@ -51,7 +51,7 @@ Vars *g_vars = nullptr;
FullpipeEngine::FullpipeEngine(OSystem *syst, const ADGameDescription *gameDesc) :
Engine(syst),
_gameDescription(gameDesc),
- _rnd("fullpipe"),
+ _rnd("ngi"),
_gameProject(nullptr),
_modalObject(nullptr),
_currSoundList1(),
@@ -247,7 +247,7 @@ Common::Error FullpipeEngine::saveGameState(int slot, const Common::String &desc
}
Common::String FullpipeEngine::getSaveStateName(int slot) const {
- return Common::String::format("fullpipe.s%02d", slot);
+ return Common::String::format("%s.s%02d", getGameId(), slot);
}
Common::Error FullpipeEngine::run() {
diff --git a/engines/fullpipe/fullpipe.h b/engines/ngi/fullpipe.h
similarity index 99%
rename from engines/fullpipe/fullpipe.h
rename to engines/ngi/fullpipe.h
index 4d1114e659..11bdc6d803 100644
--- a/engines/fullpipe/fullpipe.h
+++ b/engines/ngi/fullpipe.h
@@ -34,7 +34,7 @@
#include "graphics/surface.h"
#include "engines/engine.h"
-#include "fullpipe/console.h"
+#include "ngi/console.h"
struct ADGameDescription;
@@ -133,6 +133,7 @@ public:
uint32 getFeatures() const;
bool isDemo();
Common::Language getLanguage() const;
+ const char *getGameId() const;
Common::RandomSource _rnd;
diff --git a/engines/fullpipe/scenes/scene01.cpp b/engines/ngi/fullpipe/scene01.cpp
similarity index 91%
rename from engines/fullpipe/scenes/scene01.cpp
rename to engines/ngi/fullpipe/scene01.cpp
index e24eb1fa45..8a28c3bc77 100644
--- a/engines/fullpipe/scenes/scene01.cpp
+++ b/engines/ngi/fullpipe/scene01.cpp
@@ -20,18 +20,18 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene02.cpp b/engines/ngi/fullpipe/scene02.cpp
similarity index 92%
rename from engines/fullpipe/scenes/scene02.cpp
rename to engines/ngi/fullpipe/scene02.cpp
index b552599b95..f32c7cbd22 100644
--- a/engines/fullpipe/scenes/scene02.cpp
+++ b/engines/ngi/fullpipe/scene02.cpp
@@ -20,19 +20,19 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
-#include "fullpipe/floaters.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
+#include "ngi/floaters.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene03.cpp b/engines/ngi/fullpipe/scene03.cpp
similarity index 97%
rename from engines/fullpipe/scenes/scene03.cpp
rename to engines/ngi/fullpipe/scene03.cpp
index fea2579148..98ec4c6584 100644
--- a/engines/fullpipe/scenes/scene03.cpp
+++ b/engines/ngi/fullpipe/scene03.cpp
@@ -20,18 +20,18 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/ngi/fullpipe/scene04.cpp
similarity index 99%
rename from engines/fullpipe/scenes/scene04.cpp
rename to engines/ngi/fullpipe/scene04.cpp
index 6585001269..920c5fb994 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/ngi/fullpipe/scene04.cpp
@@ -20,20 +20,20 @@
*
*/
-#include "fullpipe/fullpipe.h"
-
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
-#include "fullpipe/utils.h"
-#include "fullpipe/gfx.h"
-#include "fullpipe/messages.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
-#include "fullpipe/scene.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/behavior.h"
+#include "ngi/fullpipe.h"
+
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
+#include "ngi/utils.h"
+#include "ngi/gfx.h"
+#include "ngi/messages.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
+#include "ngi/scene.h"
+#include "ngi/interaction.h"
+#include "ngi/gameloader.h"
+#include "ngi/behavior.h"
#include "audio/mixer.h"
diff --git a/engines/fullpipe/scenes/scene05.cpp b/engines/ngi/fullpipe/scene05.cpp
similarity index 96%
rename from engines/fullpipe/scenes/scene05.cpp
rename to engines/ngi/fullpipe/scene05.cpp
index 8fb2f8ff93..d799841228 100644
--- a/engines/fullpipe/scenes/scene05.cpp
+++ b/engines/ngi/fullpipe/scene05.cpp
@@ -20,19 +20,19 @@
*
*/
-#include "fullpipe/fullpipe.h"
-
-#include "fullpipe/gameloader.h"
-#include "fullpipe/objects.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
-#include "fullpipe/statics.h"
-#include "fullpipe/scene.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/messages.h"
-#include "fullpipe/floaters.h"
-#include "fullpipe/behavior.h"
+#include "ngi/fullpipe.h"
+
+#include "ngi/gameloader.h"
+#include "ngi/objects.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
+#include "ngi/statics.h"
+#include "ngi/scene.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/messages.h"
+#include "ngi/floaters.h"
+#include "ngi/behavior.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene06.cpp b/engines/ngi/fullpipe/scene06.cpp
similarity index 98%
rename from engines/fullpipe/scenes/scene06.cpp
rename to engines/ngi/fullpipe/scene06.cpp
index 83b50dd0fb..dc7726b594 100644
--- a/engines/fullpipe/scenes/scene06.cpp
+++ b/engines/ngi/fullpipe/scene06.cpp
@@ -20,20 +20,20 @@
*
*/
-#include "fullpipe/fullpipe.h"
-
-#include "fullpipe/objects.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
-#include "fullpipe/gfx.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
-#include "fullpipe/scene.h"
-#include "fullpipe/messages.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/behavior.h"
-#include "fullpipe/interaction.h"
+#include "ngi/fullpipe.h"
+
+#include "ngi/objects.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
+#include "ngi/gfx.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
+#include "ngi/scene.h"
+#include "ngi/messages.h"
+#include "ngi/gameloader.h"
+#include "ngi/behavior.h"
+#include "ngi/interaction.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene07.cpp b/engines/ngi/fullpipe/scene07.cpp
similarity index 94%
rename from engines/fullpipe/scenes/scene07.cpp
rename to engines/ngi/fullpipe/scene07.cpp
index 4ad4998c44..66d966215e 100644
--- a/engines/fullpipe/scenes/scene07.cpp
+++ b/engines/ngi/fullpipe/scene07.cpp
@@ -20,17 +20,17 @@
*
*/
-#include "fullpipe/fullpipe.h"
-
-#include "fullpipe/objects.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/scene.h"
-#include "fullpipe/statics.h"
-#include "fullpipe/messages.h"
-#include "fullpipe/behavior.h"
+#include "ngi/fullpipe.h"
+
+#include "ngi/objects.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/scene.h"
+#include "ngi/statics.h"
+#include "ngi/messages.h"
+#include "ngi/behavior.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene08.cpp b/engines/ngi/fullpipe/scene08.cpp
similarity index 97%
rename from engines/fullpipe/scenes/scene08.cpp
rename to engines/ngi/fullpipe/scene08.cpp
index 12170f04fe..bb22e2bb69 100644
--- a/engines/fullpipe/scenes/scene08.cpp
+++ b/engines/ngi/fullpipe/scene08.cpp
@@ -20,20 +20,20 @@
*
*/
-#include "fullpipe/fullpipe.h"
-
-#include "fullpipe/objects.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/scene.h"
-#include "fullpipe/statics.h"
-#include "fullpipe/floaters.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/behavior.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/modal.h"
+#include "ngi/fullpipe.h"
+
+#include "ngi/objects.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/scene.h"
+#include "ngi/statics.h"
+#include "ngi/floaters.h"
+#include "ngi/gameloader.h"
+#include "ngi/behavior.h"
+#include "ngi/interaction.h"
+#include "ngi/modal.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene09.cpp b/engines/ngi/fullpipe/scene09.cpp
similarity index 98%
rename from engines/fullpipe/scenes/scene09.cpp
rename to engines/ngi/fullpipe/scene09.cpp
index 1761f5d5a3..b0b9721c58 100644
--- a/engines/fullpipe/scenes/scene09.cpp
+++ b/engines/ngi/fullpipe/scene09.cpp
@@ -20,18 +20,18 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene10.cpp b/engines/ngi/fullpipe/scene10.cpp
similarity index 95%
rename from engines/fullpipe/scenes/scene10.cpp
rename to engines/ngi/fullpipe/scene10.cpp
index 60f1a4eed0..caa4d032a8 100644
--- a/engines/fullpipe/scenes/scene10.cpp
+++ b/engines/ngi/fullpipe/scene10.cpp
@@ -20,18 +20,18 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/behavior.h"
-#include "fullpipe/interaction.h"
+#include "ngi/behavior.h"
+#include "ngi/interaction.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene11.cpp b/engines/ngi/fullpipe/scene11.cpp
similarity index 98%
rename from engines/fullpipe/scenes/scene11.cpp
rename to engines/ngi/fullpipe/scene11.cpp
index eed42b65ed..61e0149786 100644
--- a/engines/fullpipe/scenes/scene11.cpp
+++ b/engines/ngi/fullpipe/scene11.cpp
@@ -20,18 +20,18 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene12.cpp b/engines/ngi/fullpipe/scene12.cpp
similarity index 87%
rename from engines/fullpipe/scenes/scene12.cpp
rename to engines/ngi/fullpipe/scene12.cpp
index 81732bc067..b9606e077a 100644
--- a/engines/fullpipe/scenes/scene12.cpp
+++ b/engines/ngi/fullpipe/scene12.cpp
@@ -20,18 +20,18 @@
*
*/
-#include "fullpipe/fullpipe.h"
-
-#include "fullpipe/objects.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/scene.h"
-#include "fullpipe/floaters.h"
-#include "fullpipe/messages.h"
-#include "fullpipe/statics.h"
-#include "fullpipe/behavior.h"
+#include "ngi/fullpipe.h"
+
+#include "ngi/objects.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/scene.h"
+#include "ngi/floaters.h"
+#include "ngi/messages.h"
+#include "ngi/statics.h"
+#include "ngi/behavior.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene13.cpp b/engines/ngi/fullpipe/scene13.cpp
similarity index 97%
rename from engines/fullpipe/scenes/scene13.cpp
rename to engines/ngi/fullpipe/scene13.cpp
index 2eac5cbea4..3fb96016ce 100644
--- a/engines/fullpipe/scenes/scene13.cpp
+++ b/engines/ngi/fullpipe/scene13.cpp
@@ -20,18 +20,18 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene14.cpp b/engines/ngi/fullpipe/scene14.cpp
similarity index 98%
rename from engines/fullpipe/scenes/scene14.cpp
rename to engines/ngi/fullpipe/scene14.cpp
index 161a6ba637..25cb11cdd5 100644
--- a/engines/fullpipe/scenes/scene14.cpp
+++ b/engines/ngi/fullpipe/scene14.cpp
@@ -20,19 +20,19 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
-#include "fullpipe/input.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
+#include "ngi/input.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene15.cpp b/engines/ngi/fullpipe/scene15.cpp
similarity index 95%
rename from engines/fullpipe/scenes/scene15.cpp
rename to engines/ngi/fullpipe/scene15.cpp
index 01ccb70b03..42f7ae3312 100644
--- a/engines/fullpipe/scenes/scene15.cpp
+++ b/engines/ngi/fullpipe/scene15.cpp
@@ -20,18 +20,18 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene16.cpp b/engines/ngi/fullpipe/scene16.cpp
similarity index 97%
rename from engines/fullpipe/scenes/scene16.cpp
rename to engines/ngi/fullpipe/scene16.cpp
index 973fce9d29..833a05635f 100644
--- a/engines/fullpipe/scenes/scene16.cpp
+++ b/engines/ngi/fullpipe/scene16.cpp
@@ -20,18 +20,18 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene17.cpp b/engines/ngi/fullpipe/scene17.cpp
similarity index 96%
rename from engines/fullpipe/scenes/scene17.cpp
rename to engines/ngi/fullpipe/scene17.cpp
index e71c7c90d6..b3c93d0268 100644
--- a/engines/fullpipe/scenes/scene17.cpp
+++ b/engines/ngi/fullpipe/scene17.cpp
@@ -20,19 +20,19 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
-#include "fullpipe/floaters.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
+#include "ngi/floaters.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene18and19.cpp b/engines/ngi/fullpipe/scene18and19.cpp
similarity index 98%
rename from engines/fullpipe/scenes/scene18and19.cpp
rename to engines/ngi/fullpipe/scene18and19.cpp
index 35d3e025ec..596f069a9f 100644
--- a/engines/fullpipe/scenes/scene18and19.cpp
+++ b/engines/ngi/fullpipe/scene18and19.cpp
@@ -20,18 +20,18 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
#include "common/math.h"
diff --git a/engines/fullpipe/scenes/scene20.cpp b/engines/ngi/fullpipe/scene20.cpp
similarity index 93%
rename from engines/fullpipe/scenes/scene20.cpp
rename to engines/ngi/fullpipe/scene20.cpp
index 009d0d3de7..058196e013 100644
--- a/engines/fullpipe/scenes/scene20.cpp
+++ b/engines/ngi/fullpipe/scene20.cpp
@@ -20,19 +20,19 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
-#include "fullpipe/floaters.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
+#include "ngi/floaters.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene21.cpp b/engines/ngi/fullpipe/scene21.cpp
similarity index 94%
rename from engines/fullpipe/scenes/scene21.cpp
rename to engines/ngi/fullpipe/scene21.cpp
index be6db90a4a..48b3795894 100644
--- a/engines/fullpipe/scenes/scene21.cpp
+++ b/engines/ngi/fullpipe/scene21.cpp
@@ -20,18 +20,18 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene22.cpp b/engines/ngi/fullpipe/scene22.cpp
similarity index 97%
rename from engines/fullpipe/scenes/scene22.cpp
rename to engines/ngi/fullpipe/scene22.cpp
index 82c9f9307b..be9750f2f1 100644
--- a/engines/fullpipe/scenes/scene22.cpp
+++ b/engines/ngi/fullpipe/scene22.cpp
@@ -20,18 +20,18 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene23.cpp b/engines/ngi/fullpipe/scene23.cpp
similarity index 97%
rename from engines/fullpipe/scenes/scene23.cpp
rename to engines/ngi/fullpipe/scene23.cpp
index 2dcaaebc53..4899015156 100644
--- a/engines/fullpipe/scenes/scene23.cpp
+++ b/engines/ngi/fullpipe/scene23.cpp
@@ -20,19 +20,19 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
-#include "fullpipe/floaters.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
+#include "ngi/floaters.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene24.cpp b/engines/ngi/fullpipe/scene24.cpp
similarity index 93%
rename from engines/fullpipe/scenes/scene24.cpp
rename to engines/ngi/fullpipe/scene24.cpp
index a2a20a2fe9..87d83dd364 100644
--- a/engines/fullpipe/scenes/scene24.cpp
+++ b/engines/ngi/fullpipe/scene24.cpp
@@ -20,18 +20,18 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene25.cpp b/engines/ngi/fullpipe/scene25.cpp
similarity index 98%
rename from engines/fullpipe/scenes/scene25.cpp
rename to engines/ngi/fullpipe/scene25.cpp
index 45fcc1cf53..86167906c8 100644
--- a/engines/fullpipe/scenes/scene25.cpp
+++ b/engines/ngi/fullpipe/scene25.cpp
@@ -20,18 +20,18 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene26.cpp b/engines/ngi/fullpipe/scene26.cpp
similarity index 97%
rename from engines/fullpipe/scenes/scene26.cpp
rename to engines/ngi/fullpipe/scene26.cpp
index 468919f656..9fa9911e3d 100644
--- a/engines/fullpipe/scenes/scene26.cpp
+++ b/engines/ngi/fullpipe/scene26.cpp
@@ -20,18 +20,18 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene27.cpp b/engines/ngi/fullpipe/scene27.cpp
similarity index 98%
rename from engines/fullpipe/scenes/scene27.cpp
rename to engines/ngi/fullpipe/scene27.cpp
index fd23d58394..435f8094cb 100644
--- a/engines/fullpipe/scenes/scene27.cpp
+++ b/engines/ngi/fullpipe/scene27.cpp
@@ -20,18 +20,18 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
#define DBG 0
diff --git a/engines/fullpipe/scenes/scene28.cpp b/engines/ngi/fullpipe/scene28.cpp
similarity index 97%
rename from engines/fullpipe/scenes/scene28.cpp
rename to engines/ngi/fullpipe/scene28.cpp
index aef714035a..5626ddaae2 100644
--- a/engines/fullpipe/scenes/scene28.cpp
+++ b/engines/ngi/fullpipe/scene28.cpp
@@ -20,19 +20,19 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
-#include "fullpipe/floaters.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
+#include "ngi/floaters.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene29.cpp b/engines/ngi/fullpipe/scene29.cpp
similarity index 98%
rename from engines/fullpipe/scenes/scene29.cpp
rename to engines/ngi/fullpipe/scene29.cpp
index 5da86b8fb7..c7025db418 100644
--- a/engines/fullpipe/scenes/scene29.cpp
+++ b/engines/ngi/fullpipe/scene29.cpp
@@ -20,18 +20,18 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
#define DEBUG 0
diff --git a/engines/fullpipe/scenes/scene30.cpp b/engines/ngi/fullpipe/scene30.cpp
similarity index 93%
rename from engines/fullpipe/scenes/scene30.cpp
rename to engines/ngi/fullpipe/scene30.cpp
index d1faaa7c47..a091ccd0d2 100644
--- a/engines/fullpipe/scenes/scene30.cpp
+++ b/engines/ngi/fullpipe/scene30.cpp
@@ -20,18 +20,18 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene31.cpp b/engines/ngi/fullpipe/scene31.cpp
similarity index 92%
rename from engines/fullpipe/scenes/scene31.cpp
rename to engines/ngi/fullpipe/scene31.cpp
index 3c5469052a..7e56019586 100644
--- a/engines/fullpipe/scenes/scene31.cpp
+++ b/engines/ngi/fullpipe/scene31.cpp
@@ -20,18 +20,18 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene32.cpp b/engines/ngi/fullpipe/scene32.cpp
similarity index 97%
rename from engines/fullpipe/scenes/scene32.cpp
rename to engines/ngi/fullpipe/scene32.cpp
index 46dde6ad83..8125d9df18 100644
--- a/engines/fullpipe/scenes/scene32.cpp
+++ b/engines/ngi/fullpipe/scene32.cpp
@@ -20,18 +20,18 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene33.cpp b/engines/ngi/fullpipe/scene33.cpp
similarity index 96%
rename from engines/fullpipe/scenes/scene33.cpp
rename to engines/ngi/fullpipe/scene33.cpp
index 43bfdc71ee..b5336e0efa 100644
--- a/engines/fullpipe/scenes/scene33.cpp
+++ b/engines/ngi/fullpipe/scene33.cpp
@@ -20,18 +20,18 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene34.cpp b/engines/ngi/fullpipe/scene34.cpp
similarity index 97%
rename from engines/fullpipe/scenes/scene34.cpp
rename to engines/ngi/fullpipe/scene34.cpp
index 2a2bbf85da..cb1f7c32b6 100644
--- a/engines/fullpipe/scenes/scene34.cpp
+++ b/engines/ngi/fullpipe/scene34.cpp
@@ -20,19 +20,19 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
-#include "fullpipe/floaters.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
+#include "ngi/floaters.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene35.cpp b/engines/ngi/fullpipe/scene35.cpp
similarity index 95%
rename from engines/fullpipe/scenes/scene35.cpp
rename to engines/ngi/fullpipe/scene35.cpp
index 05f69c62b2..f572c9c5f2 100644
--- a/engines/fullpipe/scenes/scene35.cpp
+++ b/engines/ngi/fullpipe/scene35.cpp
@@ -20,20 +20,20 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
-#include "fullpipe/floaters.h"
+#include "ngi/floaters.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene36.cpp b/engines/ngi/fullpipe/scene36.cpp
similarity index 90%
rename from engines/fullpipe/scenes/scene36.cpp
rename to engines/ngi/fullpipe/scene36.cpp
index effe9b94fe..2125c5e21b 100644
--- a/engines/fullpipe/scenes/scene36.cpp
+++ b/engines/ngi/fullpipe/scene36.cpp
@@ -20,18 +20,18 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene37.cpp b/engines/ngi/fullpipe/scene37.cpp
similarity index 97%
rename from engines/fullpipe/scenes/scene37.cpp
rename to engines/ngi/fullpipe/scene37.cpp
index 116b045fc9..7df973aa52 100644
--- a/engines/fullpipe/scenes/scene37.cpp
+++ b/engines/ngi/fullpipe/scene37.cpp
@@ -20,18 +20,18 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/scene38.cpp b/engines/ngi/fullpipe/scene38.cpp
similarity index 97%
rename from engines/fullpipe/scenes/scene38.cpp
rename to engines/ngi/fullpipe/scene38.cpp
index 3632e72973..9b2a89c9fa 100644
--- a/engines/fullpipe/scenes/scene38.cpp
+++ b/engines/ngi/fullpipe/scene38.cpp
@@ -20,18 +20,18 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/sceneDbg.cpp b/engines/ngi/fullpipe/sceneDbg.cpp
similarity index 92%
rename from engines/fullpipe/scenes/sceneDbg.cpp
rename to engines/ngi/fullpipe/sceneDbg.cpp
index 759480d1f0..fc0cfbe0d7 100644
--- a/engines/fullpipe/scenes/sceneDbg.cpp
+++ b/engines/ngi/fullpipe/sceneDbg.cpp
@@ -20,17 +20,17 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/constants.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
-#include "fullpipe/input.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
+#include "ngi/input.h"
-#include "fullpipe/interaction.h"
+#include "ngi/interaction.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/sceneFinal.cpp b/engines/ngi/fullpipe/sceneFinal.cpp
similarity index 93%
rename from engines/fullpipe/scenes/sceneFinal.cpp
rename to engines/ngi/fullpipe/sceneFinal.cpp
index 7ff5626042..6a6e203b28 100644
--- a/engines/fullpipe/scenes/sceneFinal.cpp
+++ b/engines/ngi/fullpipe/sceneFinal.cpp
@@ -20,20 +20,20 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/behavior.h"
+#include "ngi/interaction.h"
+#include "ngi/behavior.h"
-#include "fullpipe/modal.h"
+#include "ngi/modal.h"
#include "audio/mixer.h"
diff --git a/engines/fullpipe/scenes/sceneIntro.cpp b/engines/ngi/fullpipe/sceneIntro.cpp
similarity index 92%
rename from engines/fullpipe/scenes/sceneIntro.cpp
rename to engines/ngi/fullpipe/sceneIntro.cpp
index 32401bc079..be3032285f 100644
--- a/engines/fullpipe/scenes/sceneIntro.cpp
+++ b/engines/ngi/fullpipe/sceneIntro.cpp
@@ -20,14 +20,14 @@
*
*/
-#include "fullpipe/fullpipe.h"
-
-#include "fullpipe/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/modal.h"
-#include "fullpipe/statics.h"
+#include "ngi/fullpipe.h"
+
+#include "ngi/constants.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/modal.h"
+#include "ngi/statics.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes/sceneIntroDemo.cpp b/engines/ngi/fullpipe/sceneIntroDemo.cpp
similarity index 90%
rename from engines/fullpipe/scenes/sceneIntroDemo.cpp
rename to engines/ngi/fullpipe/sceneIntroDemo.cpp
index ea3c469ffd..5f18ee7a1a 100644
--- a/engines/fullpipe/scenes/sceneIntroDemo.cpp
+++ b/engines/ngi/fullpipe/sceneIntroDemo.cpp
@@ -20,14 +20,14 @@
*
*/
-#include "fullpipe/fullpipe.h"
-
-#include "fullpipe/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/modal.h"
-#include "fullpipe/statics.h"
+#include "ngi/fullpipe.h"
+
+#include "ngi/constants.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/scenes.h"
+#include "ngi/modal.h"
+#include "ngi/statics.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/gameloader.cpp b/engines/ngi/gameloader.cpp
similarity index 98%
rename from engines/fullpipe/gameloader.cpp
rename to engines/ngi/gameloader.cpp
index ed9348ebc7..643a513a14 100644
--- a/engines/fullpipe/gameloader.cpp
+++ b/engines/ngi/gameloader.cpp
@@ -20,17 +20,17 @@
*
*/
-#include "fullpipe/fullpipe.h"
-
-#include "fullpipe/gameloader.h"
-#include "fullpipe/scene.h"
-#include "fullpipe/input.h"
-#include "fullpipe/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/constants.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/floaters.h"
+#include "ngi/fullpipe.h"
+
+#include "ngi/gameloader.h"
+#include "ngi/scene.h"
+#include "ngi/input.h"
+#include "ngi/statics.h"
+#include "ngi/interaction.h"
+#include "ngi/motion.h"
+#include "ngi/constants.h"
+#include "ngi/scenes.h"
+#include "ngi/floaters.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/gameloader.h b/engines/ngi/gameloader.h
similarity index 97%
rename from engines/fullpipe/gameloader.h
rename to engines/ngi/gameloader.h
index af4ccf6297..8a88e4d3e7 100644
--- a/engines/fullpipe/gameloader.h
+++ b/engines/ngi/gameloader.h
@@ -26,9 +26,9 @@
#include "common/ptr.h"
#include "engines/savestate.h"
-#include "fullpipe/objects.h"
-#include "fullpipe/inventory.h"
-#include "fullpipe/messages.h"
+#include "ngi/objects.h"
+#include "ngi/inventory.h"
+#include "ngi/messages.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/gfx.cpp b/engines/ngi/gfx.cpp
similarity index 99%
rename from engines/fullpipe/gfx.cpp
rename to engines/ngi/gfx.cpp
index c9f186905a..c730a8b7f1 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/ngi/gfx.cpp
@@ -20,14 +20,14 @@
*
*/
-#include "fullpipe/fullpipe.h"
-
-#include "fullpipe/objects.h"
-#include "fullpipe/gfx.h"
-#include "fullpipe/statics.h"
-#include "fullpipe/scene.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/gameloader.h"
+#include "ngi/fullpipe.h"
+
+#include "ngi/objects.h"
+#include "ngi/gfx.h"
+#include "ngi/statics.h"
+#include "ngi/scene.h"
+#include "ngi/interaction.h"
+#include "ngi/gameloader.h"
#include "common/memstream.h"
#include "graphics/transparent_surface.h"
diff --git a/engines/fullpipe/gfx.h b/engines/ngi/gfx.h
similarity index 100%
rename from engines/fullpipe/gfx.h
rename to engines/ngi/gfx.h
diff --git a/engines/fullpipe/init.cpp b/engines/ngi/init.cpp
similarity index 98%
rename from engines/fullpipe/init.cpp
rename to engines/ngi/init.cpp
index db95cd88b8..52d5b87159 100644
--- a/engines/fullpipe/init.cpp
+++ b/engines/ngi/init.cpp
@@ -20,14 +20,14 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objects.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/input.h"
+#include "ngi/objects.h"
+#include "ngi/gameloader.h"
+#include "ngi/objectnames.h"
+#include "ngi/input.h"
-#include "fullpipe/constants.h"
+#include "ngi/constants.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/input.cpp b/engines/ngi/input.cpp
similarity index 96%
rename from engines/fullpipe/input.cpp
rename to engines/ngi/input.cpp
index 3b733b9eab..f9e356010c 100644
--- a/engines/fullpipe/input.cpp
+++ b/engines/ngi/input.cpp
@@ -20,16 +20,16 @@
*
*/
-#include "fullpipe/fullpipe.h"
-
-#include "fullpipe/objects.h"
-#include "fullpipe/input.h"
-#include "fullpipe/gfx.h"
-#include "fullpipe/scene.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/statics.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/constants.h"
+#include "ngi/fullpipe.h"
+
+#include "ngi/objects.h"
+#include "ngi/input.h"
+#include "ngi/gfx.h"
+#include "ngi/scene.h"
+#include "ngi/gameloader.h"
+#include "ngi/statics.h"
+#include "ngi/interaction.h"
+#include "ngi/constants.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/input.h b/engines/ngi/input.h
similarity index 100%
rename from engines/fullpipe/input.h
rename to engines/ngi/input.h
diff --git a/engines/fullpipe/interaction.cpp b/engines/ngi/interaction.cpp
similarity index 98%
rename from engines/fullpipe/interaction.cpp
rename to engines/ngi/interaction.cpp
index 6f78a5b5cc..1b50e36eb7 100644
--- a/engines/fullpipe/interaction.cpp
+++ b/engines/ngi/interaction.cpp
@@ -20,12 +20,12 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/statics.h"
-#include "fullpipe/motion.h"
+#include "ngi/interaction.h"
+#include "ngi/gameloader.h"
+#include "ngi/statics.h"
+#include "ngi/motion.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/interaction.h b/engines/ngi/interaction.h
similarity index 98%
rename from engines/fullpipe/interaction.h
rename to engines/ngi/interaction.h
index e9e750980a..8218b2f96e 100644
--- a/engines/fullpipe/interaction.h
+++ b/engines/ngi/interaction.h
@@ -23,7 +23,7 @@
#ifndef FULLPIPE_INTERACTION_H
#define FULLPIPE_INTERACTION_H
-#include "fullpipe/utils.h"
+#include "ngi/utils.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/inventory.cpp b/engines/ngi/inventory.cpp
similarity index 98%
rename from engines/fullpipe/inventory.cpp
rename to engines/ngi/inventory.cpp
index 1e696115f4..984ab96f21 100644
--- a/engines/fullpipe/inventory.cpp
+++ b/engines/ngi/inventory.cpp
@@ -20,13 +20,13 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/utils.h"
-#include "fullpipe/inventory.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/statics.h"
-#include "fullpipe/input.h"
+#include "ngi/utils.h"
+#include "ngi/inventory.h"
+#include "ngi/gameloader.h"
+#include "ngi/statics.h"
+#include "ngi/input.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/inventory.h b/engines/ngi/inventory.h
similarity index 100%
rename from engines/fullpipe/inventory.h
rename to engines/ngi/inventory.h
diff --git a/engines/fullpipe/lift.cpp b/engines/ngi/lift.cpp
similarity index 97%
rename from engines/fullpipe/lift.cpp
rename to engines/ngi/lift.cpp
index 0baa9efbd7..aa198cf604 100644
--- a/engines/fullpipe/lift.cpp
+++ b/engines/ngi/lift.cpp
@@ -20,17 +20,17 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objects.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/constants.h"
+#include "ngi/objects.h"
+#include "ngi/objectnames.h"
+#include "ngi/constants.h"
-#include "fullpipe/scene.h"
-#include "fullpipe/statics.h"
-#include "fullpipe/messages.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
+#include "ngi/scene.h"
+#include "ngi/statics.h"
+#include "ngi/messages.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/messagehandlers.cpp b/engines/ngi/messagehandlers.cpp
similarity index 98%
rename from engines/fullpipe/messagehandlers.cpp
rename to engines/ngi/messagehandlers.cpp
index bf6c271d42..2d1c3a6961 100644
--- a/engines/fullpipe/messagehandlers.cpp
+++ b/engines/ngi/messagehandlers.cpp
@@ -20,16 +20,16 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/messages.h"
-#include "fullpipe/statics.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/input.h"
+#include "ngi/messages.h"
+#include "ngi/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/interaction.h"
+#include "ngi/motion.h"
+#include "ngi/input.h"
-#include "fullpipe/constants.h"
+#include "ngi/constants.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/messages.cpp b/engines/ngi/messages.cpp
similarity index 99%
rename from engines/fullpipe/messages.cpp
rename to engines/ngi/messages.cpp
index 81934ea1df..9a221d2691 100644
--- a/engines/fullpipe/messages.cpp
+++ b/engines/ngi/messages.cpp
@@ -20,13 +20,13 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objects.h"
-#include "fullpipe/messages.h"
-#include "fullpipe/modal.h"
-#include "fullpipe/statics.h"
-#include "fullpipe/gameloader.h"
+#include "ngi/objects.h"
+#include "ngi/messages.h"
+#include "ngi/modal.h"
+#include "ngi/statics.h"
+#include "ngi/gameloader.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/messages.h b/engines/ngi/messages.h
similarity index 97%
rename from engines/fullpipe/messages.h
rename to engines/ngi/messages.h
index 03f07d87c5..5f3675ac24 100644
--- a/engines/fullpipe/messages.h
+++ b/engines/ngi/messages.h
@@ -23,11 +23,11 @@
#ifndef FULLPIPE_MESSAGEQUEUE_H
#define FULLPIPE_MESSAGEQUEUE_H
-#include "fullpipe/utils.h"
-#include "fullpipe/inventory.h"
-#include "fullpipe/gfx.h"
-#include "fullpipe/sound.h"
-#include "fullpipe/scene.h"
+#include "ngi/utils.h"
+#include "ngi/inventory.h"
+#include "ngi/gfx.h"
+#include "ngi/sound.h"
+#include "ngi/scene.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/metaengine.cpp b/engines/ngi/metaengine.cpp
similarity index 93%
rename from engines/fullpipe/metaengine.cpp
rename to engines/ngi/metaengine.cpp
index 0b2970bed2..34c35cf2fc 100644
--- a/engines/fullpipe/metaengine.cpp
+++ b/engines/ngi/metaengine.cpp
@@ -27,8 +27,8 @@
#include "graphics/surface.h"
-#include "fullpipe/fullpipe.h"
-#include "fullpipe/gameloader.h"
+#include "ngi/fullpipe.h"
+#include "ngi/gameloader.h"
namespace Fullpipe {
@@ -44,12 +44,16 @@ Common::Language FullpipeEngine::getLanguage() const {
return _gameDescription->language;
}
+const char *FullpipeEngine::getGameId() const {
+ return _gameDescription->gameId;
+}
+
} // End of namspace Fullpipe
class FullpipeMetaEngine : public AdvancedMetaEngine {
public:
const char *getName() const override {
- return "fullpipe";
+ return "ngi";
}
bool hasFeature(MetaEngineFeature f) const override;
@@ -152,8 +156,8 @@ bool FullpipeMetaEngine::createInstance(OSystem *syst, Engine **engine, const AD
return desc != 0;
}
-#if PLUGIN_ENABLED_DYNAMIC(FULLPIPE)
- REGISTER_PLUGIN_DYNAMIC(FULLPIPE, PLUGIN_TYPE_ENGINE, FullpipeMetaEngine);
+#if PLUGIN_ENABLED_DYNAMIC(NGI)
+ REGISTER_PLUGIN_DYNAMIC(NGI, PLUGIN_TYPE_ENGINE, FullpipeMetaEngine);
#else
- REGISTER_PLUGIN_STATIC(FULLPIPE, PLUGIN_TYPE_ENGINE, FullpipeMetaEngine);
+ REGISTER_PLUGIN_STATIC(NGI, PLUGIN_TYPE_ENGINE, FullpipeMetaEngine);
#endif
diff --git a/engines/fullpipe/modal.cpp b/engines/ngi/modal.cpp
similarity index 99%
rename from engines/fullpipe/modal.cpp
rename to engines/ngi/modal.cpp
index f97b89ccf3..e260103967 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/ngi/modal.cpp
@@ -20,16 +20,16 @@
*
*/
-#include "fullpipe/fullpipe.h"
-
-#include "fullpipe/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/messages.h"
-#include "fullpipe/modal.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/statics.h"
+#include "ngi/fullpipe.h"
+
+#include "ngi/constants.h"
+#include "ngi/gameloader.h"
+#include "ngi/messages.h"
+#include "ngi/modal.h"
+#include "ngi/motion.h"
+#include "ngi/objectnames.h"
+#include "ngi/scenes.h"
+#include "ngi/statics.h"
#include "engines/savestate.h"
diff --git a/engines/fullpipe/modal.h b/engines/ngi/modal.h
similarity index 100%
rename from engines/fullpipe/modal.h
rename to engines/ngi/modal.h
diff --git a/engines/ngi/module.mk b/engines/ngi/module.mk
new file mode 100644
index 0000000000..7f266dcb27
--- /dev/null
+++ b/engines/ngi/module.mk
@@ -0,0 +1,80 @@
+MODULE := engines/ngi
+
+MODULE_OBJS = \
+ anihandler.o \
+ behavior.o \
+ console.o \
+ floaters.o \
+ fullpipe.o \
+ gameloader.o \
+ gfx.o \
+ init.o \
+ input.o \
+ interaction.o \
+ inventory.o \
+ lift.o \
+ messagehandlers.o \
+ messages.o \
+ metaengine.o \
+ modal.o \
+ motion.o \
+ ngiarchive.o \
+ scene.o \
+ scenes.o \
+ sound.o \
+ stateloader.o \
+ statesaver.o \
+ statics.o \
+ utils.o \
+ fullpipe/sceneIntro.o \
+ fullpipe/sceneIntroDemo.o \
+ fullpipe/scene01.o \
+ fullpipe/scene02.o \
+ fullpipe/scene03.o \
+ fullpipe/scene04.o \
+ fullpipe/scene05.o \
+ fullpipe/scene06.o \
+ fullpipe/scene07.o \
+ fullpipe/scene08.o \
+ fullpipe/scene09.o \
+ fullpipe/scene10.o \
+ fullpipe/scene11.o \
+ fullpipe/scene12.o \
+ fullpipe/scene13.o \
+ fullpipe/scene14.o \
+ fullpipe/scene15.o \
+ fullpipe/scene16.o \
+ fullpipe/scene17.o \
+ fullpipe/scene18and19.o \
+ fullpipe/scene20.o \
+ fullpipe/scene21.o \
+ fullpipe/scene22.o \
+ fullpipe/scene23.o \
+ fullpipe/scene24.o \
+ fullpipe/scene25.o \
+ fullpipe/scene26.o \
+ fullpipe/scene27.o \
+ fullpipe/scene28.o \
+ fullpipe/scene29.o \
+ fullpipe/scene30.o \
+ fullpipe/scene31.o \
+ fullpipe/scene32.o \
+ fullpipe/scene33.o \
+ fullpipe/scene34.o \
+ fullpipe/scene35.o \
+ fullpipe/scene36.o \
+ fullpipe/scene37.o \
+ fullpipe/scene38.o \
+ fullpipe/sceneFinal.o \
+ fullpipe/sceneDbg.o
+
+# This module can be built as a plugin
+ifeq ($(ENABLE_NGI), DYNAMIC_PLUGIN)
+PLUGIN := 1
+endif
+
+# Include common rules
+include $(srcdir)/rules.mk
+
+# Detection objects
+DETECT_OBJS += $(MODULE)/detection.o
diff --git a/engines/fullpipe/motion.cpp b/engines/ngi/motion.cpp
similarity index 99%
rename from engines/fullpipe/motion.cpp
rename to engines/ngi/motion.cpp
index 83407420fa..8c7e7e4d0c 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/ngi/motion.cpp
@@ -20,12 +20,12 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/utils.h"
-#include "fullpipe/statics.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
+#include "ngi/utils.h"
+#include "ngi/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/motion.h b/engines/ngi/motion.h
similarity index 99%
rename from engines/fullpipe/motion.h
rename to engines/ngi/motion.h
index 52b77034fc..0441b1a055 100644
--- a/engines/fullpipe/motion.h
+++ b/engines/ngi/motion.h
@@ -23,7 +23,7 @@
#ifndef FULLPIPE_MOTION_H
#define FULLPIPE_MOTION_H
-#include "fullpipe/anihandler.h"
+#include "ngi/anihandler.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/ngiarchive.cpp b/engines/ngi/ngiarchive.cpp
similarity index 98%
rename from engines/fullpipe/ngiarchive.cpp
rename to engines/ngi/ngiarchive.cpp
index 0bf13c175f..4c0f410159 100644
--- a/engines/fullpipe/ngiarchive.cpp
+++ b/engines/ngi/ngiarchive.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
#include "common/archive.h"
#include "common/file.h"
@@ -29,7 +29,7 @@
#include "common/bufferedstream.h"
#include "common/textconsole.h"
-#include "fullpipe/ngiarchive.h"
+#include "ngi/ngiarchive.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/ngiarchive.h b/engines/ngi/ngiarchive.h
similarity index 100%
rename from engines/fullpipe/ngiarchive.h
rename to engines/ngi/ngiarchive.h
diff --git a/engines/fullpipe/objectnames.h b/engines/ngi/objectnames.h
similarity index 100%
rename from engines/fullpipe/objectnames.h
rename to engines/ngi/objectnames.h
diff --git a/engines/fullpipe/objects.h b/engines/ngi/objects.h
similarity index 98%
rename from engines/fullpipe/objects.h
rename to engines/ngi/objects.h
index fcf90e0eca..9aab30b61d 100644
--- a/engines/fullpipe/objects.h
+++ b/engines/ngi/objects.h
@@ -24,7 +24,7 @@
#define FULLPIPE_OBJECTS_H
#include "common/ptr.h"
-#include "fullpipe/utils.h"
+#include "ngi/utils.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scene.cpp b/engines/ngi/scene.cpp
similarity index 98%
rename from engines/fullpipe/scene.cpp
rename to engines/ngi/scene.cpp
index 19ef3f3611..ecbe29494f 100644
--- a/engines/fullpipe/scene.cpp
+++ b/engines/ngi/scene.cpp
@@ -20,15 +20,15 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objects.h"
-#include "fullpipe/ngiarchive.h"
-#include "fullpipe/statics.h"
-#include "fullpipe/messages.h"
-#include "fullpipe/gameloader.h"
+#include "ngi/objects.h"
+#include "ngi/ngiarchive.h"
+#include "ngi/statics.h"
+#include "ngi/messages.h"
+#include "ngi/gameloader.h"
-#include "fullpipe/constants.h"
+#include "ngi/constants.h"
#include "common/algorithm.h"
#include "graphics/surface.h"
diff --git a/engines/fullpipe/scene.h b/engines/ngi/scene.h
similarity index 99%
rename from engines/fullpipe/scene.h
rename to engines/ngi/scene.h
index 2b95d881c3..dc799d7501 100644
--- a/engines/fullpipe/scene.h
+++ b/engines/ngi/scene.h
@@ -24,7 +24,7 @@
#define FULLPIPE_SCENE_H
#include "common/ptr.h"
-#include "fullpipe/gfx.h"
+#include "ngi/gfx.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes.cpp b/engines/ngi/scenes.cpp
similarity index 99%
rename from engines/fullpipe/scenes.cpp
rename to engines/ngi/scenes.cpp
index bbadf12794..8469636a5b 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/ngi/scenes.cpp
@@ -20,20 +20,20 @@
*
*/
-#include "fullpipe/fullpipe.h"
-
-#include "fullpipe/utils.h"
-#include "fullpipe/objects.h"
-#include "fullpipe/statics.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/input.h"
-#include "fullpipe/behavior.h"
-
-#include "fullpipe/constants.h"
-#include "fullpipe/objectnames.h"
-#include "fullpipe/scenes.h"
-#include "fullpipe/interaction.h"
+#include "ngi/fullpipe.h"
+
+#include "ngi/utils.h"
+#include "ngi/objects.h"
+#include "ngi/statics.h"
+#include "ngi/gameloader.h"
+#include "ngi/motion.h"
+#include "ngi/input.h"
+#include "ngi/behavior.h"
+
+#include "ngi/constants.h"
+#include "ngi/objectnames.h"
+#include "ngi/scenes.h"
+#include "ngi/interaction.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/scenes.h b/engines/ngi/scenes.h
similarity index 100%
rename from engines/fullpipe/scenes.h
rename to engines/ngi/scenes.h
diff --git a/engines/fullpipe/sound.cpp b/engines/ngi/sound.cpp
similarity index 98%
rename from engines/fullpipe/sound.cpp
rename to engines/ngi/sound.cpp
index ec6ce82957..0fc68bacfc 100644
--- a/engines/fullpipe/sound.cpp
+++ b/engines/ngi/sound.cpp
@@ -20,14 +20,14 @@
*
*/
-#include "fullpipe/fullpipe.h"
-
-#include "fullpipe/objects.h"
-#include "fullpipe/scene.h"
-#include "fullpipe/sound.h"
-#include "fullpipe/ngiarchive.h"
-#include "fullpipe/messages.h"
-#include "fullpipe/statics.h"
+#include "ngi/fullpipe.h"
+
+#include "ngi/objects.h"
+#include "ngi/scene.h"
+#include "ngi/sound.h"
+#include "ngi/ngiarchive.h"
+#include "ngi/messages.h"
+#include "ngi/statics.h"
#include "common/config-manager.h"
#include "common/memstream.h"
diff --git a/engines/fullpipe/sound.h b/engines/ngi/sound.h
similarity index 100%
rename from engines/fullpipe/sound.h
rename to engines/ngi/sound.h
diff --git a/engines/fullpipe/stateloader.cpp b/engines/ngi/stateloader.cpp
similarity index 98%
rename from engines/fullpipe/stateloader.cpp
rename to engines/ngi/stateloader.cpp
index 5b89b6b0e2..7354ff2284 100644
--- a/engines/fullpipe/stateloader.cpp
+++ b/engines/ngi/stateloader.cpp
@@ -20,14 +20,14 @@
*
*/
-#include "fullpipe/fullpipe.h"
-
-#include "fullpipe/constants.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/objects.h"
-#include "fullpipe/scene.h"
-#include "fullpipe/statics.h"
+#include "ngi/fullpipe.h"
+
+#include "ngi/constants.h"
+#include "ngi/gameloader.h"
+#include "ngi/interaction.h"
+#include "ngi/objects.h"
+#include "ngi/scene.h"
+#include "ngi/statics.h"
#include "common/file.h"
#include "common/array.h"
diff --git a/engines/fullpipe/statesaver.cpp b/engines/ngi/statesaver.cpp
similarity index 98%
rename from engines/fullpipe/statesaver.cpp
rename to engines/ngi/statesaver.cpp
index 7cd10e5e99..8c4d056ae5 100644
--- a/engines/fullpipe/statesaver.cpp
+++ b/engines/ngi/statesaver.cpp
@@ -24,10 +24,10 @@
#include "graphics/thumbnail.h"
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/gameloader.h"
-#include "fullpipe/objects.h"
+#include "ngi/gameloader.h"
+#include "ngi/objects.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/statics.cpp b/engines/ngi/statics.cpp
similarity index 99%
rename from engines/fullpipe/statics.cpp
rename to engines/ngi/statics.cpp
index 91b3df8e48..b7515274a1 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/ngi/statics.cpp
@@ -20,17 +20,17 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
-#include "fullpipe/objects.h"
-#include "fullpipe/ngiarchive.h"
-#include "fullpipe/statics.h"
-#include "fullpipe/messages.h"
-#include "fullpipe/interaction.h"
-#include "fullpipe/motion.h"
+#include "ngi/objects.h"
+#include "ngi/ngiarchive.h"
+#include "ngi/statics.h"
+#include "ngi/messages.h"
+#include "ngi/interaction.h"
+#include "ngi/motion.h"
-#include "fullpipe/constants.h"
-#include "fullpipe/objectnames.h"
+#include "ngi/constants.h"
+#include "ngi/objectnames.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/statics.h b/engines/ngi/statics.h
similarity index 99%
rename from engines/fullpipe/statics.h
rename to engines/ngi/statics.h
index e5f7ae771e..e633a62f80 100644
--- a/engines/fullpipe/statics.h
+++ b/engines/ngi/statics.h
@@ -23,7 +23,7 @@
#ifndef FULLPIPE_STATICS_H
#define FULLPIPE_STATICS_H
-#include "fullpipe/gfx.h"
+#include "ngi/gfx.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/utils.cpp b/engines/ngi/utils.cpp
similarity index 98%
rename from engines/fullpipe/utils.cpp
rename to engines/ngi/utils.cpp
index ea01ddd64f..b374e4d30a 100644
--- a/engines/fullpipe/utils.cpp
+++ b/engines/ngi/utils.cpp
@@ -20,17 +20,17 @@
*
*/
-#include "fullpipe/fullpipe.h"
+#include "ngi/fullpipe.h"
#include "common/file.h"
#include "common/memstream.h"
#include "common/ptr.h"
-#include "fullpipe/objects.h"
-#include "fullpipe/motion.h"
-#include "fullpipe/ngiarchive.h"
-#include "fullpipe/messages.h"
-#include "fullpipe/interaction.h"
+#include "ngi/objects.h"
+#include "ngi/motion.h"
+#include "ngi/ngiarchive.h"
+#include "ngi/messages.h"
+#include "ngi/interaction.h"
namespace Fullpipe {
diff --git a/engines/fullpipe/utils.h b/engines/ngi/utils.h
similarity index 100%
rename from engines/fullpipe/utils.h
rename to engines/ngi/utils.h
Commit: 9e258f16ef6f0f393ade30aa15ace5ec3c34c470
https://github.com/scummvm/scummvm/commit/9e258f16ef6f0f393ade30aa15ace5ec3c34c470
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-04T00:05:36+02:00
Commit Message:
NGI: Rename fullpipe.* -> ngi.*
Changed paths:
A engines/ngi/ngi.cpp
A engines/ngi/ngi.h
R engines/ngi/fullpipe.cpp
R engines/ngi/fullpipe.h
engines/ngi/anihandler.cpp
engines/ngi/behavior.cpp
engines/ngi/console.cpp
engines/ngi/floaters.cpp
engines/ngi/fullpipe/scene01.cpp
engines/ngi/fullpipe/scene02.cpp
engines/ngi/fullpipe/scene03.cpp
engines/ngi/fullpipe/scene04.cpp
engines/ngi/fullpipe/scene05.cpp
engines/ngi/fullpipe/scene06.cpp
engines/ngi/fullpipe/scene07.cpp
engines/ngi/fullpipe/scene08.cpp
engines/ngi/fullpipe/scene09.cpp
engines/ngi/fullpipe/scene10.cpp
engines/ngi/fullpipe/scene11.cpp
engines/ngi/fullpipe/scene12.cpp
engines/ngi/fullpipe/scene13.cpp
engines/ngi/fullpipe/scene14.cpp
engines/ngi/fullpipe/scene15.cpp
engines/ngi/fullpipe/scene16.cpp
engines/ngi/fullpipe/scene17.cpp
engines/ngi/fullpipe/scene18and19.cpp
engines/ngi/fullpipe/scene20.cpp
engines/ngi/fullpipe/scene21.cpp
engines/ngi/fullpipe/scene22.cpp
engines/ngi/fullpipe/scene23.cpp
engines/ngi/fullpipe/scene24.cpp
engines/ngi/fullpipe/scene25.cpp
engines/ngi/fullpipe/scene26.cpp
engines/ngi/fullpipe/scene27.cpp
engines/ngi/fullpipe/scene28.cpp
engines/ngi/fullpipe/scene29.cpp
engines/ngi/fullpipe/scene30.cpp
engines/ngi/fullpipe/scene31.cpp
engines/ngi/fullpipe/scene32.cpp
engines/ngi/fullpipe/scene33.cpp
engines/ngi/fullpipe/scene34.cpp
engines/ngi/fullpipe/scene35.cpp
engines/ngi/fullpipe/scene36.cpp
engines/ngi/fullpipe/scene37.cpp
engines/ngi/fullpipe/scene38.cpp
engines/ngi/fullpipe/sceneDbg.cpp
engines/ngi/fullpipe/sceneFinal.cpp
engines/ngi/fullpipe/sceneIntro.cpp
engines/ngi/fullpipe/sceneIntroDemo.cpp
engines/ngi/gameloader.cpp
engines/ngi/gfx.cpp
engines/ngi/init.cpp
engines/ngi/input.cpp
engines/ngi/interaction.cpp
engines/ngi/inventory.cpp
engines/ngi/lift.cpp
engines/ngi/messagehandlers.cpp
engines/ngi/messages.cpp
engines/ngi/metaengine.cpp
engines/ngi/modal.cpp
engines/ngi/module.mk
engines/ngi/motion.cpp
engines/ngi/ngiarchive.cpp
engines/ngi/scene.cpp
engines/ngi/scenes.cpp
engines/ngi/sound.cpp
engines/ngi/stateloader.cpp
engines/ngi/statesaver.cpp
engines/ngi/statics.cpp
engines/ngi/utils.cpp
diff --git a/engines/ngi/anihandler.cpp b/engines/ngi/anihandler.cpp
index 806cce9c5e..55c9188881 100644
--- a/engines/ngi/anihandler.cpp
+++ b/engines/ngi/anihandler.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/utils.h"
#include "ngi/statics.h"
diff --git a/engines/ngi/behavior.cpp b/engines/ngi/behavior.cpp
index f123a0d36c..3c33b59294 100644
--- a/engines/ngi/behavior.cpp
+++ b/engines/ngi/behavior.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objects.h"
#include "ngi/behavior.h"
diff --git a/engines/ngi/console.cpp b/engines/ngi/console.cpp
index a09fd51b8f..4f219a1529 100644
--- a/engines/ngi/console.cpp
+++ b/engines/ngi/console.cpp
@@ -22,7 +22,7 @@
#include "ngi/console.h"
#include "ngi/constants.h"
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/gameloader.h"
#include "ngi/scene.h"
diff --git a/engines/ngi/floaters.cpp b/engines/ngi/floaters.cpp
index 33fef3e3e1..3897a3d4e4 100644
--- a/engines/ngi/floaters.cpp
+++ b/engines/ngi/floaters.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/floaters.h"
#include "ngi/utils.h"
#include "ngi/objects.h"
diff --git a/engines/ngi/fullpipe/scene01.cpp b/engines/ngi/fullpipe/scene01.cpp
index 8a28c3bc77..42d3345178 100644
--- a/engines/ngi/fullpipe/scene01.cpp
+++ b/engines/ngi/fullpipe/scene01.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene02.cpp b/engines/ngi/fullpipe/scene02.cpp
index f32c7cbd22..d9928f2b1b 100644
--- a/engines/ngi/fullpipe/scene02.cpp
+++ b/engines/ngi/fullpipe/scene02.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene03.cpp b/engines/ngi/fullpipe/scene03.cpp
index 98ec4c6584..2f49800ab8 100644
--- a/engines/ngi/fullpipe/scene03.cpp
+++ b/engines/ngi/fullpipe/scene03.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene04.cpp b/engines/ngi/fullpipe/scene04.cpp
index 920c5fb994..a86e72ad23 100644
--- a/engines/ngi/fullpipe/scene04.cpp
+++ b/engines/ngi/fullpipe/scene04.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene05.cpp b/engines/ngi/fullpipe/scene05.cpp
index d799841228..006514233c 100644
--- a/engines/ngi/fullpipe/scene05.cpp
+++ b/engines/ngi/fullpipe/scene05.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/gameloader.h"
#include "ngi/objects.h"
diff --git a/engines/ngi/fullpipe/scene06.cpp b/engines/ngi/fullpipe/scene06.cpp
index dc7726b594..2dbc8347b5 100644
--- a/engines/ngi/fullpipe/scene06.cpp
+++ b/engines/ngi/fullpipe/scene06.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objects.h"
#include "ngi/objectnames.h"
diff --git a/engines/ngi/fullpipe/scene07.cpp b/engines/ngi/fullpipe/scene07.cpp
index 66d966215e..b38f5b128c 100644
--- a/engines/ngi/fullpipe/scene07.cpp
+++ b/engines/ngi/fullpipe/scene07.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objects.h"
#include "ngi/objectnames.h"
diff --git a/engines/ngi/fullpipe/scene08.cpp b/engines/ngi/fullpipe/scene08.cpp
index bb22e2bb69..9c87915f57 100644
--- a/engines/ngi/fullpipe/scene08.cpp
+++ b/engines/ngi/fullpipe/scene08.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objects.h"
#include "ngi/objectnames.h"
diff --git a/engines/ngi/fullpipe/scene09.cpp b/engines/ngi/fullpipe/scene09.cpp
index b0b9721c58..b3d5376159 100644
--- a/engines/ngi/fullpipe/scene09.cpp
+++ b/engines/ngi/fullpipe/scene09.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene10.cpp b/engines/ngi/fullpipe/scene10.cpp
index caa4d032a8..e1eacbba16 100644
--- a/engines/ngi/fullpipe/scene10.cpp
+++ b/engines/ngi/fullpipe/scene10.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene11.cpp b/engines/ngi/fullpipe/scene11.cpp
index 61e0149786..823bec0c5e 100644
--- a/engines/ngi/fullpipe/scene11.cpp
+++ b/engines/ngi/fullpipe/scene11.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene12.cpp b/engines/ngi/fullpipe/scene12.cpp
index b9606e077a..a920d44352 100644
--- a/engines/ngi/fullpipe/scene12.cpp
+++ b/engines/ngi/fullpipe/scene12.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objects.h"
#include "ngi/objectnames.h"
diff --git a/engines/ngi/fullpipe/scene13.cpp b/engines/ngi/fullpipe/scene13.cpp
index 3fb96016ce..3a7c3d96cd 100644
--- a/engines/ngi/fullpipe/scene13.cpp
+++ b/engines/ngi/fullpipe/scene13.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene14.cpp b/engines/ngi/fullpipe/scene14.cpp
index 25cb11cdd5..682c644cfb 100644
--- a/engines/ngi/fullpipe/scene14.cpp
+++ b/engines/ngi/fullpipe/scene14.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene15.cpp b/engines/ngi/fullpipe/scene15.cpp
index 42f7ae3312..b63957cf3d 100644
--- a/engines/ngi/fullpipe/scene15.cpp
+++ b/engines/ngi/fullpipe/scene15.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene16.cpp b/engines/ngi/fullpipe/scene16.cpp
index 833a05635f..fc4b50ac6c 100644
--- a/engines/ngi/fullpipe/scene16.cpp
+++ b/engines/ngi/fullpipe/scene16.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene17.cpp b/engines/ngi/fullpipe/scene17.cpp
index b3c93d0268..737ad7b06c 100644
--- a/engines/ngi/fullpipe/scene17.cpp
+++ b/engines/ngi/fullpipe/scene17.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene18and19.cpp b/engines/ngi/fullpipe/scene18and19.cpp
index 596f069a9f..2969f3b641 100644
--- a/engines/ngi/fullpipe/scene18and19.cpp
+++ b/engines/ngi/fullpipe/scene18and19.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene20.cpp b/engines/ngi/fullpipe/scene20.cpp
index 058196e013..e2eb8733e4 100644
--- a/engines/ngi/fullpipe/scene20.cpp
+++ b/engines/ngi/fullpipe/scene20.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene21.cpp b/engines/ngi/fullpipe/scene21.cpp
index 48b3795894..652e2f781b 100644
--- a/engines/ngi/fullpipe/scene21.cpp
+++ b/engines/ngi/fullpipe/scene21.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene22.cpp b/engines/ngi/fullpipe/scene22.cpp
index be9750f2f1..cf56d5d9ba 100644
--- a/engines/ngi/fullpipe/scene22.cpp
+++ b/engines/ngi/fullpipe/scene22.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene23.cpp b/engines/ngi/fullpipe/scene23.cpp
index 4899015156..261ccfb0eb 100644
--- a/engines/ngi/fullpipe/scene23.cpp
+++ b/engines/ngi/fullpipe/scene23.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene24.cpp b/engines/ngi/fullpipe/scene24.cpp
index 87d83dd364..6a349a107b 100644
--- a/engines/ngi/fullpipe/scene24.cpp
+++ b/engines/ngi/fullpipe/scene24.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene25.cpp b/engines/ngi/fullpipe/scene25.cpp
index 86167906c8..05050fb6a7 100644
--- a/engines/ngi/fullpipe/scene25.cpp
+++ b/engines/ngi/fullpipe/scene25.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene26.cpp b/engines/ngi/fullpipe/scene26.cpp
index 9fa9911e3d..7b4e91344a 100644
--- a/engines/ngi/fullpipe/scene26.cpp
+++ b/engines/ngi/fullpipe/scene26.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene27.cpp b/engines/ngi/fullpipe/scene27.cpp
index 435f8094cb..6bea5883c9 100644
--- a/engines/ngi/fullpipe/scene27.cpp
+++ b/engines/ngi/fullpipe/scene27.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene28.cpp b/engines/ngi/fullpipe/scene28.cpp
index 5626ddaae2..b159c368a1 100644
--- a/engines/ngi/fullpipe/scene28.cpp
+++ b/engines/ngi/fullpipe/scene28.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene29.cpp b/engines/ngi/fullpipe/scene29.cpp
index c7025db418..dadb810d04 100644
--- a/engines/ngi/fullpipe/scene29.cpp
+++ b/engines/ngi/fullpipe/scene29.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene30.cpp b/engines/ngi/fullpipe/scene30.cpp
index a091ccd0d2..05e2d126e8 100644
--- a/engines/ngi/fullpipe/scene30.cpp
+++ b/engines/ngi/fullpipe/scene30.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene31.cpp b/engines/ngi/fullpipe/scene31.cpp
index 7e56019586..f2bb8c630a 100644
--- a/engines/ngi/fullpipe/scene31.cpp
+++ b/engines/ngi/fullpipe/scene31.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene32.cpp b/engines/ngi/fullpipe/scene32.cpp
index 8125d9df18..f9fb8700e1 100644
--- a/engines/ngi/fullpipe/scene32.cpp
+++ b/engines/ngi/fullpipe/scene32.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene33.cpp b/engines/ngi/fullpipe/scene33.cpp
index b5336e0efa..60982f98be 100644
--- a/engines/ngi/fullpipe/scene33.cpp
+++ b/engines/ngi/fullpipe/scene33.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene34.cpp b/engines/ngi/fullpipe/scene34.cpp
index cb1f7c32b6..a726fb2b00 100644
--- a/engines/ngi/fullpipe/scene34.cpp
+++ b/engines/ngi/fullpipe/scene34.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene35.cpp b/engines/ngi/fullpipe/scene35.cpp
index f572c9c5f2..20a8251479 100644
--- a/engines/ngi/fullpipe/scene35.cpp
+++ b/engines/ngi/fullpipe/scene35.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene36.cpp b/engines/ngi/fullpipe/scene36.cpp
index 2125c5e21b..1370bf0119 100644
--- a/engines/ngi/fullpipe/scene36.cpp
+++ b/engines/ngi/fullpipe/scene36.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene37.cpp b/engines/ngi/fullpipe/scene37.cpp
index 7df973aa52..eb3e77f51d 100644
--- a/engines/ngi/fullpipe/scene37.cpp
+++ b/engines/ngi/fullpipe/scene37.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/scene38.cpp b/engines/ngi/fullpipe/scene38.cpp
index 9b2a89c9fa..c632a707d7 100644
--- a/engines/ngi/fullpipe/scene38.cpp
+++ b/engines/ngi/fullpipe/scene38.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/sceneDbg.cpp b/engines/ngi/fullpipe/sceneDbg.cpp
index fc0cfbe0d7..c3c92acaf9 100644
--- a/engines/ngi/fullpipe/sceneDbg.cpp
+++ b/engines/ngi/fullpipe/sceneDbg.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/sceneFinal.cpp b/engines/ngi/fullpipe/sceneFinal.cpp
index 6a6e203b28..ce0ceab746 100644
--- a/engines/ngi/fullpipe/sceneFinal.cpp
+++ b/engines/ngi/fullpipe/sceneFinal.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objectnames.h"
#include "ngi/constants.h"
diff --git a/engines/ngi/fullpipe/sceneIntro.cpp b/engines/ngi/fullpipe/sceneIntro.cpp
index be3032285f..567ee52fb4 100644
--- a/engines/ngi/fullpipe/sceneIntro.cpp
+++ b/engines/ngi/fullpipe/sceneIntro.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/constants.h"
#include "ngi/gameloader.h"
diff --git a/engines/ngi/fullpipe/sceneIntroDemo.cpp b/engines/ngi/fullpipe/sceneIntroDemo.cpp
index 5f18ee7a1a..e969b67f03 100644
--- a/engines/ngi/fullpipe/sceneIntroDemo.cpp
+++ b/engines/ngi/fullpipe/sceneIntroDemo.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/constants.h"
#include "ngi/gameloader.h"
diff --git a/engines/ngi/gameloader.cpp b/engines/ngi/gameloader.cpp
index 643a513a14..6bcf671ff3 100644
--- a/engines/ngi/gameloader.cpp
+++ b/engines/ngi/gameloader.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/gameloader.h"
#include "ngi/scene.h"
diff --git a/engines/ngi/gfx.cpp b/engines/ngi/gfx.cpp
index c730a8b7f1..23efde8078 100644
--- a/engines/ngi/gfx.cpp
+++ b/engines/ngi/gfx.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objects.h"
#include "ngi/gfx.h"
diff --git a/engines/ngi/init.cpp b/engines/ngi/init.cpp
index 52d5b87159..9966c7ac68 100644
--- a/engines/ngi/init.cpp
+++ b/engines/ngi/init.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objects.h"
#include "ngi/gameloader.h"
diff --git a/engines/ngi/input.cpp b/engines/ngi/input.cpp
index f9e356010c..170674dac9 100644
--- a/engines/ngi/input.cpp
+++ b/engines/ngi/input.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objects.h"
#include "ngi/input.h"
diff --git a/engines/ngi/interaction.cpp b/engines/ngi/interaction.cpp
index 1b50e36eb7..335320ffef 100644
--- a/engines/ngi/interaction.cpp
+++ b/engines/ngi/interaction.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/interaction.h"
#include "ngi/gameloader.h"
diff --git a/engines/ngi/inventory.cpp b/engines/ngi/inventory.cpp
index 984ab96f21..1186d0ed67 100644
--- a/engines/ngi/inventory.cpp
+++ b/engines/ngi/inventory.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/utils.h"
#include "ngi/inventory.h"
diff --git a/engines/ngi/lift.cpp b/engines/ngi/lift.cpp
index aa198cf604..0545cf6582 100644
--- a/engines/ngi/lift.cpp
+++ b/engines/ngi/lift.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objects.h"
#include "ngi/objectnames.h"
diff --git a/engines/ngi/messagehandlers.cpp b/engines/ngi/messagehandlers.cpp
index 2d1c3a6961..4ac1793168 100644
--- a/engines/ngi/messagehandlers.cpp
+++ b/engines/ngi/messagehandlers.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/messages.h"
#include "ngi/statics.h"
diff --git a/engines/ngi/messages.cpp b/engines/ngi/messages.cpp
index 9a221d2691..75fceb58e8 100644
--- a/engines/ngi/messages.cpp
+++ b/engines/ngi/messages.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objects.h"
#include "ngi/messages.h"
diff --git a/engines/ngi/metaengine.cpp b/engines/ngi/metaengine.cpp
index 34c35cf2fc..949a99420f 100644
--- a/engines/ngi/metaengine.cpp
+++ b/engines/ngi/metaengine.cpp
@@ -27,7 +27,7 @@
#include "graphics/surface.h"
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/gameloader.h"
namespace Fullpipe {
diff --git a/engines/ngi/modal.cpp b/engines/ngi/modal.cpp
index e260103967..b28192e197 100644
--- a/engines/ngi/modal.cpp
+++ b/engines/ngi/modal.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/constants.h"
#include "ngi/gameloader.h"
diff --git a/engines/ngi/module.mk b/engines/ngi/module.mk
index 7f266dcb27..a9707c2d81 100644
--- a/engines/ngi/module.mk
+++ b/engines/ngi/module.mk
@@ -5,7 +5,6 @@ MODULE_OBJS = \
behavior.o \
console.o \
floaters.o \
- fullpipe.o \
gameloader.o \
gfx.o \
init.o \
@@ -18,6 +17,7 @@ MODULE_OBJS = \
metaengine.o \
modal.o \
motion.o \
+ ngi.o \
ngiarchive.o \
scene.o \
scenes.o \
diff --git a/engines/ngi/motion.cpp b/engines/ngi/motion.cpp
index 8c7e7e4d0c..9913b8bb95 100644
--- a/engines/ngi/motion.cpp
+++ b/engines/ngi/motion.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/utils.h"
#include "ngi/statics.h"
diff --git a/engines/ngi/fullpipe.cpp b/engines/ngi/ngi.cpp
similarity index 99%
rename from engines/ngi/fullpipe.cpp
rename to engines/ngi/ngi.cpp
index 950a15e474..503d62ae3c 100644
--- a/engines/ngi/fullpipe.cpp
+++ b/engines/ngi/ngi.cpp
@@ -30,7 +30,7 @@
#include "engines/util.h"
#include "graphics/surface.h"
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/gameloader.h"
#include "ngi/messages.h"
#include "ngi/behavior.h"
diff --git a/engines/ngi/fullpipe.h b/engines/ngi/ngi.h
similarity index 100%
rename from engines/ngi/fullpipe.h
rename to engines/ngi/ngi.h
diff --git a/engines/ngi/ngiarchive.cpp b/engines/ngi/ngiarchive.cpp
index 4c0f410159..949fb778fd 100644
--- a/engines/ngi/ngiarchive.cpp
+++ b/engines/ngi/ngiarchive.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "common/archive.h"
#include "common/file.h"
diff --git a/engines/ngi/scene.cpp b/engines/ngi/scene.cpp
index ecbe29494f..529f2e68bf 100644
--- a/engines/ngi/scene.cpp
+++ b/engines/ngi/scene.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objects.h"
#include "ngi/ngiarchive.h"
diff --git a/engines/ngi/scenes.cpp b/engines/ngi/scenes.cpp
index 8469636a5b..442449c2e9 100644
--- a/engines/ngi/scenes.cpp
+++ b/engines/ngi/scenes.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/utils.h"
#include "ngi/objects.h"
diff --git a/engines/ngi/sound.cpp b/engines/ngi/sound.cpp
index 0fc68bacfc..d8c3567690 100644
--- a/engines/ngi/sound.cpp
+++ b/engines/ngi/sound.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objects.h"
#include "ngi/scene.h"
diff --git a/engines/ngi/stateloader.cpp b/engines/ngi/stateloader.cpp
index 7354ff2284..8db0609111 100644
--- a/engines/ngi/stateloader.cpp
+++ b/engines/ngi/stateloader.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/constants.h"
#include "ngi/gameloader.h"
diff --git a/engines/ngi/statesaver.cpp b/engines/ngi/statesaver.cpp
index 8c4d056ae5..387be7e130 100644
--- a/engines/ngi/statesaver.cpp
+++ b/engines/ngi/statesaver.cpp
@@ -24,7 +24,7 @@
#include "graphics/thumbnail.h"
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/gameloader.h"
#include "ngi/objects.h"
diff --git a/engines/ngi/statics.cpp b/engines/ngi/statics.cpp
index b7515274a1..b6133729d9 100644
--- a/engines/ngi/statics.cpp
+++ b/engines/ngi/statics.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "ngi/objects.h"
#include "ngi/ngiarchive.h"
diff --git a/engines/ngi/utils.cpp b/engines/ngi/utils.cpp
index b374e4d30a..980f512ab6 100644
--- a/engines/ngi/utils.cpp
+++ b/engines/ngi/utils.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "ngi/fullpipe.h"
+#include "ngi/ngi.h"
#include "common/file.h"
#include "common/memstream.h"
Commit: 1177b608fda595261016244bcb4b4dd1f9c81c11
https://github.com/scummvm/scummvm/commit/1177b608fda595261016244bcb4b4dd1f9c81c11
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-04T00:05:36+02:00
Commit Message:
NGI: Namespace rename
Changed paths:
engines/ngi/anihandler.cpp
engines/ngi/anihandler.h
engines/ngi/behavior.cpp
engines/ngi/behavior.h
engines/ngi/console.cpp
engines/ngi/console.h
engines/ngi/constants.h
engines/ngi/detection.cpp
engines/ngi/floaters.cpp
engines/ngi/floaters.h
engines/ngi/fullpipe/scene01.cpp
engines/ngi/fullpipe/scene02.cpp
engines/ngi/fullpipe/scene03.cpp
engines/ngi/fullpipe/scene04.cpp
engines/ngi/fullpipe/scene05.cpp
engines/ngi/fullpipe/scene06.cpp
engines/ngi/fullpipe/scene07.cpp
engines/ngi/fullpipe/scene08.cpp
engines/ngi/fullpipe/scene09.cpp
engines/ngi/fullpipe/scene10.cpp
engines/ngi/fullpipe/scene11.cpp
engines/ngi/fullpipe/scene12.cpp
engines/ngi/fullpipe/scene13.cpp
engines/ngi/fullpipe/scene14.cpp
engines/ngi/fullpipe/scene15.cpp
engines/ngi/fullpipe/scene16.cpp
engines/ngi/fullpipe/scene17.cpp
engines/ngi/fullpipe/scene18and19.cpp
engines/ngi/fullpipe/scene20.cpp
engines/ngi/fullpipe/scene21.cpp
engines/ngi/fullpipe/scene22.cpp
engines/ngi/fullpipe/scene23.cpp
engines/ngi/fullpipe/scene24.cpp
engines/ngi/fullpipe/scene25.cpp
engines/ngi/fullpipe/scene26.cpp
engines/ngi/fullpipe/scene27.cpp
engines/ngi/fullpipe/scene28.cpp
engines/ngi/fullpipe/scene29.cpp
engines/ngi/fullpipe/scene30.cpp
engines/ngi/fullpipe/scene31.cpp
engines/ngi/fullpipe/scene32.cpp
engines/ngi/fullpipe/scene33.cpp
engines/ngi/fullpipe/scene34.cpp
engines/ngi/fullpipe/scene35.cpp
engines/ngi/fullpipe/scene36.cpp
engines/ngi/fullpipe/scene37.cpp
engines/ngi/fullpipe/scene38.cpp
engines/ngi/fullpipe/sceneDbg.cpp
engines/ngi/fullpipe/sceneFinal.cpp
engines/ngi/fullpipe/sceneIntro.cpp
engines/ngi/fullpipe/sceneIntroDemo.cpp
engines/ngi/gameloader.cpp
engines/ngi/gameloader.h
engines/ngi/gfx.cpp
engines/ngi/gfx.h
engines/ngi/init.cpp
engines/ngi/input.cpp
engines/ngi/input.h
engines/ngi/interaction.cpp
engines/ngi/interaction.h
engines/ngi/inventory.cpp
engines/ngi/inventory.h
engines/ngi/lift.cpp
engines/ngi/messagehandlers.cpp
engines/ngi/messages.cpp
engines/ngi/messages.h
engines/ngi/metaengine.cpp
engines/ngi/modal.cpp
engines/ngi/modal.h
engines/ngi/motion.cpp
engines/ngi/motion.h
engines/ngi/ngi.cpp
engines/ngi/ngi.h
engines/ngi/ngiarchive.cpp
engines/ngi/ngiarchive.h
engines/ngi/objectnames.h
engines/ngi/objects.h
engines/ngi/scene.cpp
engines/ngi/scene.h
engines/ngi/scenes.cpp
engines/ngi/scenes.h
engines/ngi/sound.cpp
engines/ngi/sound.h
engines/ngi/stateloader.cpp
engines/ngi/statesaver.cpp
engines/ngi/statics.cpp
engines/ngi/statics.h
engines/ngi/utils.cpp
engines/ngi/utils.h
diff --git a/engines/ngi/anihandler.cpp b/engines/ngi/anihandler.cpp
index 55c9188881..6a83b33284 100644
--- a/engines/ngi/anihandler.cpp
+++ b/engines/ngi/anihandler.cpp
@@ -27,7 +27,7 @@
#include "ngi/motion.h"
#include "ngi/messages.h"
-namespace Fullpipe {
+namespace NGI {
void AniHandler::detachAllObjects() {
_items.clear();
@@ -748,4 +748,4 @@ ExCommand2 *AniHandler::createCommand(Movement *mov, int objId, int x1, int y1,
return ex;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/anihandler.h b/engines/ngi/anihandler.h
index ed4e382869..5dc88e66ab 100644
--- a/engines/ngi/anihandler.h
+++ b/engines/ngi/anihandler.h
@@ -23,7 +23,7 @@
#ifndef FULLPIPE_ANIHANDLER_H
#define FULLPIPE_ANIHANDLER_H
-namespace Fullpipe {
+namespace NGI {
class ExCommand2;
class Movement;
@@ -113,6 +113,6 @@ public:
int getNumMovements(int objectId, int idx1, int idx2);
};
-} // End of namespace Fullpipe
+} // End of namespace NGI
#endif /* FULLPIPE_ANIHANDLER_H */
diff --git a/engines/ngi/behavior.cpp b/engines/ngi/behavior.cpp
index 3c33b59294..a71a13c816 100644
--- a/engines/ngi/behavior.cpp
+++ b/engines/ngi/behavior.cpp
@@ -27,7 +27,7 @@
#include "ngi/statics.h"
#include "ngi/messages.h"
-namespace Fullpipe {
+namespace NGI {
BehaviorManager::BehaviorManager() {
_scene = 0;
@@ -350,4 +350,4 @@ BehaviorMove::BehaviorMove(GameVar *subvar, Scene *sc, int *delay) {
_flags |= 2;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/behavior.h b/engines/ngi/behavior.h
index dd74279be7..5a02903942 100644
--- a/engines/ngi/behavior.h
+++ b/engines/ngi/behavior.h
@@ -23,7 +23,7 @@
#ifndef FULLPIPE_BEHAVIOR_H
#define FULLPIPE_BEHAVIOR_H
-namespace Fullpipe {
+namespace NGI {
struct BehaviorMove {
MessageQueue *_messageQueue;
@@ -84,6 +84,6 @@ class BehaviorManager : public CObject {
BehaviorMove *getBehaviorMoveByMessageQueueDataId(StaticANIObject *ani, int id1, int id2);
};
-} // End of namespace Fullpipe
+} // End of namespace NGI
#endif /* FULLPIPE_BEHAVIOR_H */
diff --git a/engines/ngi/console.cpp b/engines/ngi/console.cpp
index 4f219a1529..aad15b7ec3 100644
--- a/engines/ngi/console.cpp
+++ b/engines/ngi/console.cpp
@@ -26,7 +26,7 @@
#include "ngi/gameloader.h"
#include "ngi/scene.h"
-namespace Fullpipe {
+namespace NGI {
Console::Console(FullpipeEngine *vm) : GUI::Debugger(), _vm(vm) {
registerCmd("scene", WRAP_METHOD(Console, Cmd_Scene));
@@ -50,4 +50,4 @@ bool Console::Cmd_Scene(int argc, const char **argv) {
}
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/console.h b/engines/ngi/console.h
index 0204527f24..dc7d59f73c 100644
--- a/engines/ngi/console.h
+++ b/engines/ngi/console.h
@@ -25,7 +25,7 @@
#include "gui/debugger.h"
-namespace Fullpipe {
+namespace NGI {
class FullpipeEngine;
@@ -39,6 +39,6 @@ private:
bool Cmd_Scene(int argc, const char **argv);
};
-} // End of namespace Fullpipe
+} // End of namespace NGI
#endif /* FULLPIPE_CONSOLE_H */
diff --git a/engines/ngi/constants.h b/engines/ngi/constants.h
index da80ef3c5f..96aca1291b 100644
--- a/engines/ngi/constants.h
+++ b/engines/ngi/constants.h
@@ -23,7 +23,7 @@
#ifndef FULLPIPE_CONSTANTS_H
#define FULLPIPE_CONSTANTS_H
-namespace Fullpipe {
+namespace NGI {
// Common
#define ANI_FLY 4916
@@ -1732,6 +1732,6 @@ namespace Fullpipe {
#define PIC_SCD_FIN 5026
#define PIC_SCD_SEL 734
-} // End of namespace Fullpipe
+} // End of namespace NGI
#endif /* FULLPIPE_CONSTANTS_H */
diff --git a/engines/ngi/detection.cpp b/engines/ngi/detection.cpp
index 58ee957f4f..88d608fe38 100644
--- a/engines/ngi/detection.cpp
+++ b/engines/ngi/detection.cpp
@@ -32,7 +32,7 @@ static const PlainGameDescriptor fullpipeGames[] = {
{0, 0}
};
-namespace Fullpipe {
+namespace NGI {
static const ADGameDescription gameDescriptions[] = {
@@ -105,11 +105,11 @@ static const ADGameDescription gameDescriptions[] = {
AD_TABLE_END_MARKER
};
-} // End of namespace Fullpipe
+} // End of namespace NGI
class FullpipeMetaEngineStatic : public AdvancedMetaEngineStatic {
public:
- FullpipeMetaEngineStatic() : AdvancedMetaEngineStatic(Fullpipe::gameDescriptions, sizeof(ADGameDescription), fullpipeGames) {
+ FullpipeMetaEngineStatic() : AdvancedMetaEngineStatic(NGI::gameDescriptions, sizeof(ADGameDescription), fullpipeGames) {
}
const char *getEngineId() const override {
diff --git a/engines/ngi/floaters.cpp b/engines/ngi/floaters.cpp
index 3897a3d4e4..bfdd41cc57 100644
--- a/engines/ngi/floaters.cpp
+++ b/engines/ngi/floaters.cpp
@@ -30,7 +30,7 @@
#include "ngi/constants.h"
#include "ngi/objectnames.h"
-namespace Fullpipe {
+namespace NGI {
void Floaters::init(GameVar *var) {
_array1.clear();
@@ -236,4 +236,4 @@ void Floaters::stopAll() {
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/floaters.h b/engines/ngi/floaters.h
index 161a34282c..3fe0666c6b 100644
--- a/engines/ngi/floaters.h
+++ b/engines/ngi/floaters.h
@@ -26,7 +26,7 @@
#include "common/array.h"
#include "common/ptr.h"
-namespace Fullpipe {
+namespace NGI {
class StaticANIObject;
class Scene;
@@ -71,6 +71,6 @@ public:
void stopAll();
};
-} // End of namespace Fullpipe
+} // End of namespace NGI
#endif /* FULLPIPE_FLOATERS_H */
diff --git a/engines/ngi/fullpipe/scene01.cpp b/engines/ngi/fullpipe/scene01.cpp
index 42d3345178..bb32d15d00 100644
--- a/engines/ngi/fullpipe/scene01.cpp
+++ b/engines/ngi/fullpipe/scene01.cpp
@@ -34,7 +34,7 @@
#include "ngi/behavior.h"
-namespace Fullpipe {
+namespace NGI {
void scene01_fixEntrance() {
GameVar *var = g_fp->getGameLoaderGameVar()->getSubVarByName("OBJSTATES")->getSubVarByName("SAVEGAME");
@@ -115,4 +115,4 @@ int sceneHandler01(ExCommand *cmd) {
return res;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene02.cpp b/engines/ngi/fullpipe/scene02.cpp
index d9928f2b1b..325b24a010 100644
--- a/engines/ngi/fullpipe/scene02.cpp
+++ b/engines/ngi/fullpipe/scene02.cpp
@@ -35,7 +35,7 @@
#include "ngi/floaters.h"
-namespace Fullpipe {
+namespace NGI {
void scene02_initScene(Scene *sc) {
g_vars->scene02_guvTheDrawer = sc->getStaticANIObject1ById(ANI_DADAYASHIK, -1);
@@ -139,4 +139,4 @@ int sceneHandler02(ExCommand *ex) {
return res;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene03.cpp b/engines/ngi/fullpipe/scene03.cpp
index 2f49800ab8..7ccfc322f9 100644
--- a/engines/ngi/fullpipe/scene03.cpp
+++ b/engines/ngi/fullpipe/scene03.cpp
@@ -33,7 +33,7 @@
#include "ngi/interaction.h"
#include "ngi/behavior.h"
-namespace Fullpipe {
+namespace NGI {
void FullpipeEngine::setSwallowedEggsState() {
GameVar *v = _gameLoader->_gameVar->getSubVarByName("OBJSTATES")->getSubVarByName(sO_GulpedEggs);
@@ -330,4 +330,4 @@ int sceneHandler03(ExCommand *ex) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene04.cpp b/engines/ngi/fullpipe/scene04.cpp
index a86e72ad23..065442de56 100644
--- a/engines/ngi/fullpipe/scene04.cpp
+++ b/engines/ngi/fullpipe/scene04.cpp
@@ -37,7 +37,7 @@
#include "audio/mixer.h"
-namespace Fullpipe {
+namespace NGI {
static const int scene04_speakerPhases[] = {
0, 1, 2, 3, -1, -1,
@@ -1644,4 +1644,4 @@ int sceneHandler04(ExCommand *ex) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene05.cpp b/engines/ngi/fullpipe/scene05.cpp
index 006514233c..d25e3f11db 100644
--- a/engines/ngi/fullpipe/scene05.cpp
+++ b/engines/ngi/fullpipe/scene05.cpp
@@ -34,7 +34,7 @@
#include "ngi/floaters.h"
#include "ngi/behavior.h"
-namespace Fullpipe {
+namespace NGI {
void scene05_initScene(Scene *sc) {
debugC(1, kDebugSceneLogic, "scene05_initScene()");
@@ -407,4 +407,4 @@ int sceneHandler05(ExCommand *ex) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene06.cpp b/engines/ngi/fullpipe/scene06.cpp
index 2dbc8347b5..33dd9b89eb 100644
--- a/engines/ngi/fullpipe/scene06.cpp
+++ b/engines/ngi/fullpipe/scene06.cpp
@@ -35,7 +35,7 @@
#include "ngi/behavior.h"
#include "ngi/interaction.h"
-namespace Fullpipe {
+namespace NGI {
void scene06_initMumsy() {
g_vars->scene06_mumsyJumpFw = g_fp->_behaviorManager->getBehaviorMoveByMessageQueueDataId(g_vars->scene06_mumsy, ST_MOM_STANDS, QU_MOM_JUMPFW);
@@ -769,4 +769,4 @@ int sceneHandler06(ExCommand *ex) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene07.cpp b/engines/ngi/fullpipe/scene07.cpp
index b38f5b128c..f1dce3eab8 100644
--- a/engines/ngi/fullpipe/scene07.cpp
+++ b/engines/ngi/fullpipe/scene07.cpp
@@ -32,7 +32,7 @@
#include "ngi/messages.h"
#include "ngi/behavior.h"
-namespace Fullpipe {
+namespace NGI {
void scene07_initScene(Scene *sc) {
g_vars->scene07_lukeAnim = 0;
@@ -176,4 +176,4 @@ int sceneHandler07(ExCommand *ex) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene08.cpp b/engines/ngi/fullpipe/scene08.cpp
index 9c87915f57..ac4085d4fb 100644
--- a/engines/ngi/fullpipe/scene08.cpp
+++ b/engines/ngi/fullpipe/scene08.cpp
@@ -35,7 +35,7 @@
#include "ngi/interaction.h"
#include "ngi/modal.h"
-namespace Fullpipe {
+namespace NGI {
void scene08_clockCallback(int *phase) {
// do nothing
@@ -558,4 +558,4 @@ int sceneHandler08(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene09.cpp b/engines/ngi/fullpipe/scene09.cpp
index b3d5376159..d69c014ef3 100644
--- a/engines/ngi/fullpipe/scene09.cpp
+++ b/engines/ngi/fullpipe/scene09.cpp
@@ -33,7 +33,7 @@
#include "ngi/interaction.h"
#include "ngi/behavior.h"
-namespace Fullpipe {
+namespace NGI {
struct Hanger {
StaticANIObject *ani;
@@ -589,4 +589,4 @@ int sceneHandler09(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene10.cpp b/engines/ngi/fullpipe/scene10.cpp
index e1eacbba16..d4eb84dcfe 100644
--- a/engines/ngi/fullpipe/scene10.cpp
+++ b/engines/ngi/fullpipe/scene10.cpp
@@ -33,7 +33,7 @@
#include "ngi/behavior.h"
#include "ngi/interaction.h"
-namespace Fullpipe {
+namespace NGI {
void scene10_initScene(Scene *sc) {
g_vars->scene10_gum = sc->getStaticANIObject1ById(ANI_GUM, -1);
@@ -221,4 +221,4 @@ int sceneHandler10(ExCommand *ex) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene11.cpp b/engines/ngi/fullpipe/scene11.cpp
index 823bec0c5e..bb59ec029b 100644
--- a/engines/ngi/fullpipe/scene11.cpp
+++ b/engines/ngi/fullpipe/scene11.cpp
@@ -34,7 +34,7 @@
#include "ngi/behavior.h"
-namespace Fullpipe {
+namespace NGI {
void scene11_dudeSwingCallback(int *arg) {
int oldarg = *arg;
@@ -774,4 +774,4 @@ int sceneHandler11(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene12.cpp b/engines/ngi/fullpipe/scene12.cpp
index a920d44352..7d64581315 100644
--- a/engines/ngi/fullpipe/scene12.cpp
+++ b/engines/ngi/fullpipe/scene12.cpp
@@ -33,7 +33,7 @@
#include "ngi/statics.h"
#include "ngi/behavior.h"
-namespace Fullpipe {
+namespace NGI {
void scene12_initScene(Scene *sc) {
GameVar *var = g_fp->getGameLoaderGameVar()->getSubVarByName("SC_12");
@@ -82,4 +82,4 @@ int sceneHandler12(ExCommand *cmd) {
return res;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene13.cpp b/engines/ngi/fullpipe/scene13.cpp
index 3a7c3d96cd..41240c8157 100644
--- a/engines/ngi/fullpipe/scene13.cpp
+++ b/engines/ngi/fullpipe/scene13.cpp
@@ -34,7 +34,7 @@
#include "ngi/behavior.h"
-namespace Fullpipe {
+namespace NGI {
void scene13_whirlgigCallback(int *phase) {
// Do nothing
@@ -390,4 +390,4 @@ int sceneHandler13(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene14.cpp b/engines/ngi/fullpipe/scene14.cpp
index 682c644cfb..03ce6bf878 100644
--- a/engines/ngi/fullpipe/scene14.cpp
+++ b/engines/ngi/fullpipe/scene14.cpp
@@ -34,7 +34,7 @@
#include "ngi/behavior.h"
#include "ngi/input.h"
-namespace Fullpipe {
+namespace NGI {
void scene14_initScene(Scene *sc) {
g_vars->scene14_grandma = sc->getStaticANIObject1ById(ANI_GRANDMA, -1);
@@ -849,4 +849,4 @@ int sceneHandler14(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene15.cpp b/engines/ngi/fullpipe/scene15.cpp
index b63957cf3d..424e9293e5 100644
--- a/engines/ngi/fullpipe/scene15.cpp
+++ b/engines/ngi/fullpipe/scene15.cpp
@@ -34,7 +34,7 @@
#include "ngi/behavior.h"
-namespace Fullpipe {
+namespace NGI {
void scene15_initScene(Scene *sc) {
g_vars->scene15_chantingCountdown = 0;
@@ -210,4 +210,4 @@ int sceneHandler15(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene16.cpp b/engines/ngi/fullpipe/scene16.cpp
index fc4b50ac6c..1f9c83e3e2 100644
--- a/engines/ngi/fullpipe/scene16.cpp
+++ b/engines/ngi/fullpipe/scene16.cpp
@@ -34,7 +34,7 @@
#include "ngi/behavior.h"
-namespace Fullpipe {
+namespace NGI {
void scene16_initScene(Scene *sc) {
g_vars->scene16_figures.clear();
@@ -486,4 +486,4 @@ int sceneHandler16(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene17.cpp b/engines/ngi/fullpipe/scene17.cpp
index 737ad7b06c..0957d641a2 100644
--- a/engines/ngi/fullpipe/scene17.cpp
+++ b/engines/ngi/fullpipe/scene17.cpp
@@ -34,7 +34,7 @@
#include "ngi/behavior.h"
#include "ngi/floaters.h"
-namespace Fullpipe {
+namespace NGI {
void scene17_initScene(Scene *sc) {
g_vars->scene17_flyState = 1;
@@ -284,4 +284,4 @@ int sceneHandler17(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene18and19.cpp b/engines/ngi/fullpipe/scene18and19.cpp
index 2969f3b641..90682e0ccf 100644
--- a/engines/ngi/fullpipe/scene18and19.cpp
+++ b/engines/ngi/fullpipe/scene18and19.cpp
@@ -35,7 +35,7 @@
#include "common/math.h"
-namespace Fullpipe {
+namespace NGI {
struct Swinger {
StaticANIObject *ani;
@@ -935,4 +935,4 @@ int sceneHandler19(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene20.cpp b/engines/ngi/fullpipe/scene20.cpp
index e2eb8733e4..a2427b9496 100644
--- a/engines/ngi/fullpipe/scene20.cpp
+++ b/engines/ngi/fullpipe/scene20.cpp
@@ -34,7 +34,7 @@
#include "ngi/behavior.h"
#include "ngi/floaters.h"
-namespace Fullpipe {
+namespace NGI {
void scene20_setExits(Scene *sc) {
int thingpar;
@@ -155,4 +155,4 @@ int sceneHandler20(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene21.cpp b/engines/ngi/fullpipe/scene21.cpp
index 652e2f781b..a8049264a0 100644
--- a/engines/ngi/fullpipe/scene21.cpp
+++ b/engines/ngi/fullpipe/scene21.cpp
@@ -34,7 +34,7 @@
#include "ngi/behavior.h"
-namespace Fullpipe {
+namespace NGI {
void scene21_initScene(Scene *sc) {
Scene *oldsc = g_fp->_currentScene;
@@ -149,4 +149,4 @@ int sceneHandler21(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene22.cpp b/engines/ngi/fullpipe/scene22.cpp
index cf56d5d9ba..8b937ac9db 100644
--- a/engines/ngi/fullpipe/scene22.cpp
+++ b/engines/ngi/fullpipe/scene22.cpp
@@ -34,7 +34,7 @@
#include "ngi/behavior.h"
-namespace Fullpipe {
+namespace NGI {
void scene22_initScene(Scene *sc) {
g_vars->scene22_bag = sc->getStaticANIObject1ById(ANI_MESHOK, -1);
@@ -397,4 +397,4 @@ int sceneHandler22(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene23.cpp b/engines/ngi/fullpipe/scene23.cpp
index 261ccfb0eb..46506d4fa7 100644
--- a/engines/ngi/fullpipe/scene23.cpp
+++ b/engines/ngi/fullpipe/scene23.cpp
@@ -34,7 +34,7 @@
#include "ngi/behavior.h"
#include "ngi/floaters.h"
-namespace Fullpipe {
+namespace NGI {
bool sceneHandler23_testCalendar() {
int cal0, cal1, cal2, cal3;
@@ -555,4 +555,4 @@ int sceneHandler23(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene24.cpp b/engines/ngi/fullpipe/scene24.cpp
index 6a349a107b..2db4eca760 100644
--- a/engines/ngi/fullpipe/scene24.cpp
+++ b/engines/ngi/fullpipe/scene24.cpp
@@ -33,7 +33,7 @@
#include "ngi/interaction.h"
#include "ngi/behavior.h"
-namespace Fullpipe {
+namespace NGI {
void scene24_initScene(Scene *sc) {
g_vars->scene24_water = sc->getStaticANIObject1ById(ANI_WATER24, -1);
@@ -125,4 +125,4 @@ int sceneHandler24(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene25.cpp b/engines/ngi/fullpipe/scene25.cpp
index 05050fb6a7..d544b6c3d0 100644
--- a/engines/ngi/fullpipe/scene25.cpp
+++ b/engines/ngi/fullpipe/scene25.cpp
@@ -33,7 +33,7 @@
#include "ngi/interaction.h"
#include "ngi/behavior.h"
-namespace Fullpipe {
+namespace NGI {
void scene25_showBoardOnRightFar() {
g_vars->scene25_board->show1(453, 557, MV_BRD25_RIGHT, 0);
@@ -727,4 +727,4 @@ int sceneHandler25(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene26.cpp b/engines/ngi/fullpipe/scene26.cpp
index 7b4e91344a..158a613cd8 100644
--- a/engines/ngi/fullpipe/scene26.cpp
+++ b/engines/ngi/fullpipe/scene26.cpp
@@ -34,7 +34,7 @@
#include "ngi/behavior.h"
-namespace Fullpipe {
+namespace NGI {
void scene26_initScene(Scene *sc) {
g_vars->scene26_chhi = sc->getStaticANIObject1ById(ANI_CHHI, -1);
@@ -360,4 +360,4 @@ int sceneHandler26(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene27.cpp b/engines/ngi/fullpipe/scene27.cpp
index 6bea5883c9..e6b5f71d29 100644
--- a/engines/ngi/fullpipe/scene27.cpp
+++ b/engines/ngi/fullpipe/scene27.cpp
@@ -35,7 +35,7 @@
#define DBG 0
-namespace Fullpipe {
+namespace NGI {
struct Bat {
StaticANIObject *ani;
@@ -703,4 +703,4 @@ int sceneHandler27(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene28.cpp b/engines/ngi/fullpipe/scene28.cpp
index b159c368a1..8b7ddb7712 100644
--- a/engines/ngi/fullpipe/scene28.cpp
+++ b/engines/ngi/fullpipe/scene28.cpp
@@ -34,7 +34,7 @@
#include "ngi/behavior.h"
#include "ngi/floaters.h"
-namespace Fullpipe {
+namespace NGI {
void scene28_initScene(Scene *sc) {
g_vars->scene28_fliesArePresent = true;
@@ -484,4 +484,4 @@ int sceneHandler28(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene29.cpp b/engines/ngi/fullpipe/scene29.cpp
index dadb810d04..1aee6e1db1 100644
--- a/engines/ngi/fullpipe/scene29.cpp
+++ b/engines/ngi/fullpipe/scene29.cpp
@@ -36,7 +36,7 @@
#define DEBUG 0
-namespace Fullpipe {
+namespace NGI {
struct WalkingBearder {
StaticANIObject *ani;
@@ -848,4 +848,4 @@ int scene29_updateCursor() {
return g_fp->_cursorId;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene30.cpp b/engines/ngi/fullpipe/scene30.cpp
index 05e2d126e8..4356cf223a 100644
--- a/engines/ngi/fullpipe/scene30.cpp
+++ b/engines/ngi/fullpipe/scene30.cpp
@@ -34,7 +34,7 @@
#include "ngi/behavior.h"
-namespace Fullpipe {
+namespace NGI {
void scene30_enablePass(Scene *sc) {
MovGraphLink *lnk = getSc2MctlCompoundBySceneId(sc->_sceneId)->getLinkByName(sO_WayToPipe);
@@ -152,4 +152,4 @@ int sceneHandler30(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene31.cpp b/engines/ngi/fullpipe/scene31.cpp
index f2bb8c630a..9b79f201ce 100644
--- a/engines/ngi/fullpipe/scene31.cpp
+++ b/engines/ngi/fullpipe/scene31.cpp
@@ -34,7 +34,7 @@
#include "ngi/behavior.h"
-namespace Fullpipe {
+namespace NGI {
void scene31_initScene(Scene *sc) {
g_vars->scene31_chantingCountdown = 0;
@@ -126,4 +126,4 @@ int sceneHandler31(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene32.cpp b/engines/ngi/fullpipe/scene32.cpp
index f9fb8700e1..bd3e99d1a0 100644
--- a/engines/ngi/fullpipe/scene32.cpp
+++ b/engines/ngi/fullpipe/scene32.cpp
@@ -34,7 +34,7 @@
#include "ngi/behavior.h"
-namespace Fullpipe {
+namespace NGI {
void scene32_initScene(Scene *sc) {
g_vars->scene32_flagIsWaving = false;
@@ -435,4 +435,4 @@ int sceneHandler32(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene33.cpp b/engines/ngi/fullpipe/scene33.cpp
index 60982f98be..016cac219c 100644
--- a/engines/ngi/fullpipe/scene33.cpp
+++ b/engines/ngi/fullpipe/scene33.cpp
@@ -34,7 +34,7 @@
#include "ngi/behavior.h"
-namespace Fullpipe {
+namespace NGI {
const int ventsInit[9] = { 0, 0, 1, 0, 0, 1, 0, 0, 1 };
@@ -316,4 +316,4 @@ int sceneHandler33(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene34.cpp b/engines/ngi/fullpipe/scene34.cpp
index a726fb2b00..d039f66bca 100644
--- a/engines/ngi/fullpipe/scene34.cpp
+++ b/engines/ngi/fullpipe/scene34.cpp
@@ -34,7 +34,7 @@
#include "ngi/behavior.h"
#include "ngi/floaters.h"
-namespace Fullpipe {
+namespace NGI {
void sceneHandler34_setExits() {
int state;
@@ -478,4 +478,4 @@ int sceneHandler34(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene35.cpp b/engines/ngi/fullpipe/scene35.cpp
index 20a8251479..bb0686e2cc 100644
--- a/engines/ngi/fullpipe/scene35.cpp
+++ b/engines/ngi/fullpipe/scene35.cpp
@@ -35,7 +35,7 @@
#include "ngi/floaters.h"
-namespace Fullpipe {
+namespace NGI {
void scene35_initScene(Scene *sc) {
g_vars->scene35_hose = sc->getStaticANIObject1ById(ANI_HOSE, -1);
@@ -265,4 +265,4 @@ int sceneHandler35(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene36.cpp b/engines/ngi/fullpipe/scene36.cpp
index 1370bf0119..5b674f607f 100644
--- a/engines/ngi/fullpipe/scene36.cpp
+++ b/engines/ngi/fullpipe/scene36.cpp
@@ -34,7 +34,7 @@
#include "ngi/behavior.h"
-namespace Fullpipe {
+namespace NGI {
void scene36_initScene(Scene *sc) {
g_vars->scene36_rotohrust = sc->getStaticANIObject1ById(ANI_ROTOHRUST, -1);
@@ -94,4 +94,4 @@ int sceneHandler36(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene37.cpp b/engines/ngi/fullpipe/scene37.cpp
index eb3e77f51d..2e5699306e 100644
--- a/engines/ngi/fullpipe/scene37.cpp
+++ b/engines/ngi/fullpipe/scene37.cpp
@@ -34,7 +34,7 @@
#include "ngi/behavior.h"
-namespace Fullpipe {
+namespace NGI {
Ring::Ring() {
ani = 0;
@@ -330,4 +330,4 @@ int sceneHandler37(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/scene38.cpp b/engines/ngi/fullpipe/scene38.cpp
index c632a707d7..2d6c7e4c1c 100644
--- a/engines/ngi/fullpipe/scene38.cpp
+++ b/engines/ngi/fullpipe/scene38.cpp
@@ -34,7 +34,7 @@
#include "ngi/behavior.h"
-namespace Fullpipe {
+namespace NGI {
void scene38_setBottleState(Scene *sc) {
ExCommand *ex = sc->getMessageQueueById(QU_SC38_SHOWBOTTLE_ONTABLE)->getExCommandByIndex(0);
@@ -409,4 +409,4 @@ int sceneHandler38(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/sceneDbg.cpp b/engines/ngi/fullpipe/sceneDbg.cpp
index c3c92acaf9..49e2bc5a18 100644
--- a/engines/ngi/fullpipe/sceneDbg.cpp
+++ b/engines/ngi/fullpipe/sceneDbg.cpp
@@ -32,7 +32,7 @@
#include "ngi/interaction.h"
-namespace Fullpipe {
+namespace NGI {
void sceneDbgMenu_initScene(Scene *sc) {
g_vars->selector = sc->getPictureObjectById(PIC_SCD_SEL, 0);
@@ -104,4 +104,4 @@ int sceneHandlerDbgMenu(ExCommand *ex) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/sceneFinal.cpp b/engines/ngi/fullpipe/sceneFinal.cpp
index ce0ceab746..bda66dd5df 100644
--- a/engines/ngi/fullpipe/sceneFinal.cpp
+++ b/engines/ngi/fullpipe/sceneFinal.cpp
@@ -37,7 +37,7 @@
#include "audio/mixer.h"
-namespace Fullpipe {
+namespace NGI {
void sceneFinal_initScene() {
g_fp->_gameLoader->loadScene(SC_FINAL2);
@@ -185,4 +185,4 @@ int sceneHandlerFinal(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/sceneIntro.cpp b/engines/ngi/fullpipe/sceneIntro.cpp
index 567ee52fb4..eedf75e385 100644
--- a/engines/ngi/fullpipe/sceneIntro.cpp
+++ b/engines/ngi/fullpipe/sceneIntro.cpp
@@ -29,7 +29,7 @@
#include "ngi/modal.h"
#include "ngi/statics.h"
-namespace Fullpipe {
+namespace NGI {
int sceneIntro_updateCursor() {
g_fp->_cursorId = 0;
@@ -107,4 +107,4 @@ int sceneHandlerIntro(ExCommand *ex) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/fullpipe/sceneIntroDemo.cpp b/engines/ngi/fullpipe/sceneIntroDemo.cpp
index e969b67f03..73236dcf5a 100644
--- a/engines/ngi/fullpipe/sceneIntroDemo.cpp
+++ b/engines/ngi/fullpipe/sceneIntroDemo.cpp
@@ -29,7 +29,7 @@
#include "ngi/modal.h"
#include "ngi/statics.h"
-namespace Fullpipe {
+namespace NGI {
int sceneIntroDemo_updateCursor() {
g_fp->_cursorId = 0;
@@ -91,4 +91,4 @@ int sceneHandlerIntroDemo(ExCommand *ex) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/gameloader.cpp b/engines/ngi/gameloader.cpp
index 6bcf671ff3..b5259bc718 100644
--- a/engines/ngi/gameloader.cpp
+++ b/engines/ngi/gameloader.cpp
@@ -32,7 +32,7 @@
#include "ngi/scenes.h"
#include "ngi/floaters.h"
-namespace Fullpipe {
+namespace NGI {
Inventory2 *getGameLoaderInventory() {
return &g_fp->_gameLoader->_inventory;
@@ -678,4 +678,4 @@ MctlCompound *getCurrSceneSc2MotionController() {
return getSc2MctlCompoundBySceneId(g_fp->_currentScene->_sceneId);
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/gameloader.h b/engines/ngi/gameloader.h
index 8a88e4d3e7..3dd53ef453 100644
--- a/engines/ngi/gameloader.h
+++ b/engines/ngi/gameloader.h
@@ -30,7 +30,7 @@
#include "ngi/inventory.h"
#include "ngi/messages.h"
-namespace Fullpipe {
+namespace NGI {
#define FULLPIPE_SAVEGAME_VERSION 2
@@ -143,7 +143,7 @@ class GameLoader : public CObject {
const char *getSavegameFile(int saveGameIdx);
WARN_UNUSED_RESULT bool readSavegameHeader(Common::InSaveFile *in, FullpipeSavegameHeader &header, bool skipThumbnail = true);
-void parseSavegameHeader(Fullpipe::FullpipeSavegameHeader &header, SaveStateDescriptor &desc);
+void parseSavegameHeader(NGI::FullpipeSavegameHeader &header, SaveStateDescriptor &desc);
Inventory2 *getGameLoaderInventory();
InteractionController *getGameLoaderInteractionController();
@@ -151,6 +151,6 @@ MctlCompound *getSc2MctlCompoundBySceneId(int16 sceneId);
MovGraph *getSc2MovGraphBySceneId(int16 sceneId);
MctlCompound *getCurrSceneSc2MotionController();
-} // End of namespace Fullpipe
+} // End of namespace NGI
#endif /* FULLPIPE_GAMELOADER_H */
diff --git a/engines/ngi/gfx.cpp b/engines/ngi/gfx.cpp
index 23efde8078..4d0be4fb12 100644
--- a/engines/ngi/gfx.cpp
+++ b/engines/ngi/gfx.cpp
@@ -32,7 +32,7 @@
#include "common/memstream.h"
#include "graphics/transparent_surface.h"
-namespace Fullpipe {
+namespace NGI {
Background::Background() {
_x = 0;
@@ -1207,4 +1207,4 @@ void FullpipeEngine::sceneFade(Scene *sc, bool direction) {
}
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/gfx.h b/engines/ngi/gfx.h
index bfc966d92a..91290af4e7 100644
--- a/engines/ngi/gfx.h
+++ b/engines/ngi/gfx.h
@@ -30,7 +30,7 @@ namespace Graphics {
struct TransparentSurface;
}
-namespace Fullpipe {
+namespace NGI {
class DynamicPhase;
class Movement;
@@ -238,6 +238,6 @@ class Shadows : public CObject {
DynamicPhase *findSize(int width, int height);
};
-} // End of namespace Fullpipe
+} // End of namespace NGI
#endif /* FULLPIPE_GFX_H */
diff --git a/engines/ngi/init.cpp b/engines/ngi/init.cpp
index 9966c7ac68..5a9fd0d7b2 100644
--- a/engines/ngi/init.cpp
+++ b/engines/ngi/init.cpp
@@ -29,7 +29,7 @@
#include "ngi/constants.h"
-namespace Fullpipe {
+namespace NGI {
void FullpipeEngine::initObjectStates() {
setLevelStates();
@@ -247,4 +247,4 @@ void FullpipeEngine::loadAllScenes() {
accessScene(5222);
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/input.cpp b/engines/ngi/input.cpp
index 170674dac9..36d0167d2a 100644
--- a/engines/ngi/input.cpp
+++ b/engines/ngi/input.cpp
@@ -31,7 +31,7 @@
#include "ngi/interaction.h"
#include "ngi/constants.h"
-namespace Fullpipe {
+namespace NGI {
InputController::InputController() {
g_fp->_inputController = this;
@@ -346,4 +346,4 @@ int FullpipeEngine::drawArcadeOverlay(int adjust) {
return 1;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/input.h b/engines/ngi/input.h
index 8efb1c40c6..7a20561b8d 100644
--- a/engines/ngi/input.h
+++ b/engines/ngi/input.h
@@ -23,7 +23,7 @@
#ifndef FULLPIPE_INPUT_H
#define FULLPIPE_INPUT_H
-namespace Fullpipe {
+namespace NGI {
class Picture;
@@ -71,6 +71,6 @@ class InputController {
void setCursorItemPicture(Picture *pic) { _cursorItemPicture = pic; }
};
-} // End of namespace Fullpipe
+} // End of namespace NGI
#endif /* FULLPIPE_INPUT_H */
diff --git a/engines/ngi/interaction.cpp b/engines/ngi/interaction.cpp
index 335320ffef..6cc079f0ae 100644
--- a/engines/ngi/interaction.cpp
+++ b/engines/ngi/interaction.cpp
@@ -27,7 +27,7 @@
#include "ngi/statics.h"
#include "ngi/motion.h"
-namespace Fullpipe {
+namespace NGI {
int handleObjectInteraction(StaticANIObject *subject, GameObject *object, int invId) {
return getGameLoaderInteractionController()->handleInteraction(subject, object, invId);
@@ -549,4 +549,4 @@ bool EntranceInfo::load(MfcArchive &file) {
return true;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/interaction.h b/engines/ngi/interaction.h
index 8218b2f96e..2430f82cb9 100644
--- a/engines/ngi/interaction.h
+++ b/engines/ngi/interaction.h
@@ -25,7 +25,7 @@
#include "ngi/utils.h"
-namespace Fullpipe {
+namespace NGI {
class GameObject;
class MessageQueue;
@@ -97,6 +97,6 @@ struct EntranceInfo {
bool load(MfcArchive &file);
};
-} // End of namespace Fullpipe
+} // End of namespace NGI
#endif /* FULLPIPE_INTERACTION_H */
diff --git a/engines/ngi/inventory.cpp b/engines/ngi/inventory.cpp
index 1186d0ed67..ef9712090f 100644
--- a/engines/ngi/inventory.cpp
+++ b/engines/ngi/inventory.cpp
@@ -28,7 +28,7 @@
#include "ngi/statics.h"
#include "ngi/input.h"
-namespace Fullpipe {
+namespace NGI {
bool Inventory::load(MfcArchive &file) {
debugC(5, kDebugLoading | kDebugInventory, "Inventory::load()");
@@ -506,4 +506,4 @@ void FullpipeEngine::getAllInventory() {
inv->rebuildItemRects();
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/inventory.h b/engines/ngi/inventory.h
index 100d36b5cc..46c782d7ae 100644
--- a/engines/ngi/inventory.h
+++ b/engines/ngi/inventory.h
@@ -23,7 +23,7 @@
#ifndef FULLPIPE_INVENTORY_H
#define FULLPIPE_INVENTORY_H
-namespace Fullpipe {
+namespace NGI {
class Scene;
class BigPicture;
@@ -129,6 +129,6 @@ class Inventory2 : public Inventory {
void clear();
};
-} // End of namespace Fullpipe
+} // End of namespace NGI
#endif /* FULLPIPE_INVENTORY_H */
diff --git a/engines/ngi/lift.cpp b/engines/ngi/lift.cpp
index 0545cf6582..fd1e3980af 100644
--- a/engines/ngi/lift.cpp
+++ b/engines/ngi/lift.cpp
@@ -32,7 +32,7 @@
#include "ngi/gameloader.h"
#include "ngi/motion.h"
-namespace Fullpipe {
+namespace NGI {
int FullpipeEngine::lift_getButtonIdP(int objid) {
switch (objid) {
@@ -518,4 +518,4 @@ void FullpipeEngine::lift_setButtonStatics(Scene *sc, int buttonId) {
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/messagehandlers.cpp b/engines/ngi/messagehandlers.cpp
index 4ac1793168..9e64330fd7 100644
--- a/engines/ngi/messagehandlers.cpp
+++ b/engines/ngi/messagehandlers.cpp
@@ -31,7 +31,7 @@
#include "ngi/constants.h"
-namespace Fullpipe {
+namespace NGI {
void global_messageHandler_KickStucco() {
Movement *mov = g_fp->_aniMan->getMovementById(MV_MAN_HMRKICK);
@@ -809,4 +809,4 @@ int MovGraph::messageHandler(ExCommand *cmd) {
return 0;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/messages.cpp b/engines/ngi/messages.cpp
index 75fceb58e8..7f5a8f5ffe 100644
--- a/engines/ngi/messages.cpp
+++ b/engines/ngi/messages.cpp
@@ -28,7 +28,7 @@
#include "ngi/statics.h"
#include "ngi/gameloader.h"
-namespace Fullpipe {
+namespace NGI {
ExCommand::ExCommand() {
_field_3C = 1;
@@ -963,4 +963,4 @@ void postExCommand(int parentId, int keyCode, int x, int y, int f20, int f14) {
ex->postMessage();
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/messages.h b/engines/ngi/messages.h
index 5f3675ac24..75cc1370f0 100644
--- a/engines/ngi/messages.h
+++ b/engines/ngi/messages.h
@@ -29,7 +29,7 @@
#include "ngi/sound.h"
#include "ngi/scene.h"
-namespace Fullpipe {
+namespace NGI {
enum QueueFlags {
kInGlobalQueue = 2
@@ -202,6 +202,6 @@ bool chainQueue(int queueId, int flags);
bool chainObjQueue(StaticANIObject *obj, int queueId, int flags);
void postExCommand(int parentId, int keyCode, int x, int y, int f20, int f16);
-} // End of namespace Fullpipe
+} // End of namespace NGI
#endif /* FULLPIPE_MESSAGEQUEUE_H */
diff --git a/engines/ngi/metaengine.cpp b/engines/ngi/metaengine.cpp
index 949a99420f..c3dad0c56f 100644
--- a/engines/ngi/metaengine.cpp
+++ b/engines/ngi/metaengine.cpp
@@ -30,7 +30,7 @@
#include "ngi/ngi.h"
#include "ngi/gameloader.h"
-namespace Fullpipe {
+namespace NGI {
uint32 FullpipeEngine::getFeatures() const {
return _gameDescription->flags;
@@ -78,7 +78,7 @@ bool FullpipeMetaEngine::hasFeature(MetaEngineFeature f) const {
(f == kSimpleSavesNames);
}
-bool Fullpipe::FullpipeEngine::hasFeature(EngineFeature f) const {
+bool NGI::FullpipeEngine::hasFeature(EngineFeature f) const {
return
(f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
@@ -100,14 +100,14 @@ SaveStateList FullpipeMetaEngine::listSaves(const char *target) const {
if (slotNum >= 0 && slotNum <= getMaximumSaveSlot()) {
Common::ScopedPtr<Common::InSaveFile> in(saveFileMan->openForLoading(*file));
if (in) {
- Fullpipe::FullpipeSavegameHeader header;
- if (!Fullpipe::readSavegameHeader(in.get(), header)) {
+ NGI::FullpipeSavegameHeader header;
+ if (!NGI::readSavegameHeader(in.get(), header)) {
continue;
}
SaveStateDescriptor desc;
- Fullpipe::parseSavegameHeader(header, desc);
+ NGI::parseSavegameHeader(header, desc);
desc.setSaveSlot(slotNum);
@@ -122,23 +122,23 @@ SaveStateList FullpipeMetaEngine::listSaves(const char *target) const {
}
void FullpipeMetaEngine::removeSaveState(const char *target, int slot) const {
- g_system->getSavefileManager()->removeSavefile(Fullpipe::getSavegameFile(slot));
+ g_system->getSavefileManager()->removeSavefile(NGI::getSavegameFile(slot));
}
SaveStateDescriptor FullpipeMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
Common::ScopedPtr<Common::InSaveFile> f(g_system->getSavefileManager()->openForLoading(
- Fullpipe::getSavegameFile(slot)));
+ NGI::getSavegameFile(slot)));
if (f) {
- Fullpipe::FullpipeSavegameHeader header;
- if (!Fullpipe::readSavegameHeader(f.get(), header, false)) {
+ NGI::FullpipeSavegameHeader header;
+ if (!NGI::readSavegameHeader(f.get(), header, false)) {
return SaveStateDescriptor();
}
// Create the return descriptor
SaveStateDescriptor desc;
- Fullpipe::parseSavegameHeader(header, desc);
+ NGI::parseSavegameHeader(header, desc);
desc.setSaveSlot(slot);
desc.setThumbnail(header.thumbnail);
@@ -151,7 +151,7 @@ SaveStateDescriptor FullpipeMetaEngine::querySaveMetaInfos(const char *target, i
bool FullpipeMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
if (desc) {
- *engine = new Fullpipe::FullpipeEngine(syst, desc);
+ *engine = new NGI::FullpipeEngine(syst, desc);
}
return desc != 0;
}
diff --git a/engines/ngi/modal.cpp b/engines/ngi/modal.cpp
index b28192e197..38fe1e1c69 100644
--- a/engines/ngi/modal.cpp
+++ b/engines/ngi/modal.cpp
@@ -36,7 +36,7 @@
#include "graphics/palette.h"
#include "graphics/surface.h"
-namespace Fullpipe {
+namespace NGI {
ModalIntro::ModalIntro() {
_field_8 = 0;
@@ -2143,20 +2143,20 @@ char *ModalSaveGame::getSaveName() {
bool ModalSaveGame::getFileInfo(int slot, FileInfo *fileinfo) {
Common::ScopedPtr<Common::InSaveFile> f(g_system->getSavefileManager()->openForLoading(
- Fullpipe::getSavegameFile(slot)));
+ NGI::getSavegameFile(slot)));
if (!f)
return false;
- Fullpipe::FullpipeSavegameHeader header;
- if (!Fullpipe::readSavegameHeader(f.get(), header))
+ NGI::FullpipeSavegameHeader header;
+ if (!NGI::readSavegameHeader(f.get(), header))
return false;
// Create the return descriptor
SaveStateDescriptor desc(slot, header.saveName);
char res[17];
- Fullpipe::parseSavegameHeader(header, desc);
+ NGI::parseSavegameHeader(header, desc);
snprintf(res, sizeof(res), "%s %s", desc.getSaveDate().c_str(), desc.getSaveTime().c_str());
@@ -2502,4 +2502,4 @@ void FullpipeEngine::openMainMenu() {
g_fp->_modalObject = menu;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/modal.h b/engines/ngi/modal.h
index 0ffddf4c4c..6c8b502a4b 100644
--- a/engines/ngi/modal.h
+++ b/engines/ngi/modal.h
@@ -25,7 +25,7 @@
#include "video/avi_decoder.h"
-namespace Fullpipe {
+namespace NGI {
class PictureObject;
class Picture;
@@ -349,6 +349,6 @@ class ModalDemo : public BaseModalObject {
};
-} // End of namespace Fullpipe
+} // End of namespace NGI
#endif /* FULLPIPE_MODAL_H */
diff --git a/engines/ngi/motion.cpp b/engines/ngi/motion.cpp
index 9913b8bb95..4e59f5facc 100644
--- a/engines/ngi/motion.cpp
+++ b/engines/ngi/motion.cpp
@@ -27,7 +27,7 @@
#include "ngi/gameloader.h"
#include "ngi/motion.h"
-namespace Fullpipe {
+namespace NGI {
bool MotionController::load(MfcArchive &file) {
// Is originally empty file.readClass();
@@ -3103,4 +3103,4 @@ bool doSomeAnimation2(int objId, int objKey) {
return doSomeAnimation(objId, objKey, 0);
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/motion.h b/engines/ngi/motion.h
index 0441b1a055..eea6e66ace 100644
--- a/engines/ngi/motion.h
+++ b/engines/ngi/motion.h
@@ -25,7 +25,7 @@
#include "ngi/anihandler.h"
-namespace Fullpipe {
+namespace NGI {
class MctlConnectionPoint;
class MovGraphLink;
@@ -411,6 +411,6 @@ public:
MctlConnectionPoint();
};
-} // End of namespace Fullpipe
+} // End of namespace NGI
#endif /* FULLPIPE_MOTION_H */
diff --git a/engines/ngi/ngi.cpp b/engines/ngi/ngi.cpp
index 503d62ae3c..2ba4c81d18 100644
--- a/engines/ngi/ngi.cpp
+++ b/engines/ngi/ngi.cpp
@@ -43,7 +43,7 @@
#include "ngi/console.h"
#include "ngi/constants.h"
-namespace Fullpipe {
+namespace NGI {
FullpipeEngine *g_fp = nullptr;
Vars *g_vars = nullptr;
@@ -592,4 +592,4 @@ bool FullpipeEngine::isSaveAllowed() {
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/ngi.h b/engines/ngi/ngi.h
index 11bdc6d803..11040721ad 100644
--- a/engines/ngi/ngi.h
+++ b/engines/ngi/ngi.h
@@ -42,7 +42,7 @@ namespace Audio {
class SoundHandle;
}
-namespace Fullpipe {
+namespace NGI {
enum FullpipeGameFeatures {
};
@@ -383,6 +383,6 @@ public:
extern FullpipeEngine *g_fp;
extern Vars *g_vars;
-} // End of namespace Fullpipe
+} // End of namespace NGI
#endif /* FULLPIPE_FULLPIPE_H */
diff --git a/engines/ngi/ngiarchive.cpp b/engines/ngi/ngiarchive.cpp
index 949fb778fd..77d933bf0c 100644
--- a/engines/ngi/ngiarchive.cpp
+++ b/engines/ngi/ngiarchive.cpp
@@ -31,7 +31,7 @@
#include "ngi/ngiarchive.h"
-namespace Fullpipe {
+namespace NGI {
NGIArchive::NGIArchive(const Common::String &filename) : _ngiFilename(filename) {
Common::File ngiFile;
@@ -147,4 +147,4 @@ NGIArchive *makeNGIArchive(const Common::String &name) {
return new NGIArchive(name);
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/ngiarchive.h b/engines/ngi/ngiarchive.h
index c52f0c6177..f3f5d30b5b 100644
--- a/engines/ngi/ngiarchive.h
+++ b/engines/ngi/ngiarchive.h
@@ -26,7 +26,7 @@
#include "common/ptr.h"
#include "common/str.h"
-namespace Fullpipe {
+namespace NGI {
class Archive;
@@ -65,6 +65,6 @@ public:
*/
NGIArchive *makeNGIArchive(const Common::String &name);
-} // End of namespace Fullpipe
+} // End of namespace NGI
#endif
diff --git a/engines/ngi/objectnames.h b/engines/ngi/objectnames.h
index 7af82ff62c..8bb94ecc76 100644
--- a/engines/ngi/objectnames.h
+++ b/engines/ngi/objectnames.h
@@ -25,7 +25,7 @@
#ifndef FULLPIPE_OBJECTNAMES_H
#define FULLPIPE_OBJECTNAMES_H
-namespace Fullpipe {
+namespace NGI {
#define sO_Grandma "\xc1\xe0\xe1\xf3\xeb\xff" // "БабулÑ"
#define sO_Jar_4 "\xc1\xe0\xed\xea\xe0_4" // "Банка_4"
@@ -255,6 +255,6 @@ namespace Fullpipe {
#define sO_Egg2 "\xdf\xe9\xf6\xee\x32" // "Яйцо2"
#define sO_Egg3 "\xdf\xe9\xf6\xee\x33" // "Яйцо3"
-} // End of namespace Fullpipe
+} // End of namespace NGI
#endif /* FULLPIPE_OBJECTNAMES_H */
diff --git a/engines/ngi/objects.h b/engines/ngi/objects.h
index 9aab30b61d..4190a80fde 100644
--- a/engines/ngi/objects.h
+++ b/engines/ngi/objects.h
@@ -26,7 +26,7 @@
#include "common/ptr.h"
#include "ngi/utils.h"
-namespace Fullpipe {
+namespace NGI {
class MessageQueue;
class SceneTagList;
@@ -100,6 +100,6 @@ class GameVar : public CObject {
GameVar *getSubVarByIndex(int idx);
};
-} // End of namespace Fullpipe
+} // End of namespace NGI
#endif /* FULLPIPE_OBJECTS_H */
diff --git a/engines/ngi/scene.cpp b/engines/ngi/scene.cpp
index 529f2e68bf..c10ab4fa3b 100644
--- a/engines/ngi/scene.cpp
+++ b/engines/ngi/scene.cpp
@@ -33,7 +33,7 @@
#include "common/algorithm.h"
#include "graphics/surface.h"
-namespace Fullpipe {
+namespace NGI {
Scene *FullpipeEngine::accessScene(int sceneId) {
SceneTag *t = 0;
@@ -818,4 +818,4 @@ void Scene::drawContent(int minPri, int maxPri, bool drawBg) {
}
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/scene.h b/engines/ngi/scene.h
index dc799d7501..9d0c179e56 100644
--- a/engines/ngi/scene.h
+++ b/engines/ngi/scene.h
@@ -26,7 +26,7 @@
#include "common/ptr.h"
#include "ngi/gfx.h"
-namespace Fullpipe {
+namespace NGI {
class MessageQueue;
@@ -115,6 +115,6 @@ class SceneTagList : public Common::List<SceneTag>, public CObject {
bool load(MfcArchive &file) override;
};
-} // End of namespace Fullpipe
+} // End of namespace NGI
#endif /* FULLPIPE_SCENE_H */
diff --git a/engines/ngi/scenes.cpp b/engines/ngi/scenes.cpp
index 442449c2e9..2303b26d52 100644
--- a/engines/ngi/scenes.cpp
+++ b/engines/ngi/scenes.cpp
@@ -35,7 +35,7 @@
#include "ngi/scenes.h"
#include "ngi/interaction.h"
-namespace Fullpipe {
+namespace NGI {
Vars::Vars() {
sceneIntro_aniin1man = 0;
@@ -1466,4 +1466,4 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
}
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/scenes.h b/engines/ngi/scenes.h
index 1d54aef441..2854e1e75f 100644
--- a/engines/ngi/scenes.h
+++ b/engines/ngi/scenes.h
@@ -23,7 +23,7 @@
#ifndef FULLPIPE_SCENES_H
#define FULLPIPE_SCENES_H
-namespace Fullpipe {
+namespace NGI {
struct Bat;
struct BehaviorMove;
@@ -685,6 +685,6 @@ struct Ring {
Ring();
};
-} // End of namespace Fullpipe
+} // End of namespace NGI
#endif /* FULLPIPE_SCENES_H */
diff --git a/engines/ngi/sound.cpp b/engines/ngi/sound.cpp
index d8c3567690..460a407091 100644
--- a/engines/ngi/sound.cpp
+++ b/engines/ngi/sound.cpp
@@ -36,7 +36,7 @@
#include "audio/decoders/vorbis.h"
#include "audio/decoders/wave.h"
-namespace Fullpipe {
+namespace NGI {
bool SoundList::load(MfcArchive &file, const Common::String &fname) {
debugC(5, kDebugLoading, "SoundList::load()");
@@ -529,4 +529,4 @@ void FullpipeEngine::setMusicVolume(int vol) {
syncSoundSettings();
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/sound.h b/engines/ngi/sound.h
index 7017855d2f..74c5853fb4 100644
--- a/engines/ngi/sound.h
+++ b/engines/ngi/sound.h
@@ -30,7 +30,7 @@ namespace Audio {
class SoundHandle;
}
-namespace Fullpipe {
+namespace NGI {
class Sound : public MemoryObject {
int _id;
@@ -73,6 +73,6 @@ class SoundList : public CObject {
Sound *getSoundItemById(int id);
};
-} // End of namespace Fullpipe
+} // End of namespace NGI
#endif /* FULLPIPE_SOUND_H */
diff --git a/engines/ngi/stateloader.cpp b/engines/ngi/stateloader.cpp
index 8db0609111..bbb6401ba8 100644
--- a/engines/ngi/stateloader.cpp
+++ b/engines/ngi/stateloader.cpp
@@ -36,7 +36,7 @@
#include "graphics/thumbnail.h"
-namespace Fullpipe {
+namespace NGI {
bool GameLoader::readSavegame(const char *fname) {
SaveHeader header;
@@ -68,7 +68,7 @@ bool GameLoader::readSavegame(const char *fname) {
saveFile->read(map.data(), 800);
FullpipeSavegameHeader header2;
- if (Fullpipe::readSavegameHeader(saveFile.get(), header2)) {
+ if (NGI::readSavegameHeader(saveFile.get(), header2)) {
g_fp->setTotalPlayTime(header2.playtime * 1000);
}
@@ -171,7 +171,7 @@ bool GameLoader::readSavegame(const char *fname) {
return true;
}
-void parseSavegameHeader(Fullpipe::FullpipeSavegameHeader &header, SaveStateDescriptor &desc) {
+void parseSavegameHeader(NGI::FullpipeSavegameHeader &header, SaveStateDescriptor &desc) {
int day = (header.date >> 24) & 0xFF;
int month = (header.date >> 16) & 0xFF;
int year = header.date & 0xFFFF;
@@ -184,7 +184,7 @@ void parseSavegameHeader(Fullpipe::FullpipeSavegameHeader &header, SaveStateDesc
desc.setDescription(header.description);
}
-void fillDummyHeader(Fullpipe::FullpipeSavegameHeader &header) {
+void fillDummyHeader(NGI::FullpipeSavegameHeader &header) {
// This is wrong header, perhaps it is original savegame. Thus fill out dummy values
header.date = (20 << 24) | (9 << 16) | 2016;
header.time = (9 << 8) | 56;
@@ -604,4 +604,4 @@ bool PicAniInfo::load(MfcArchive &file) {
return true;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/statesaver.cpp b/engines/ngi/statesaver.cpp
index 387be7e130..94236442da 100644
--- a/engines/ngi/statesaver.cpp
+++ b/engines/ngi/statesaver.cpp
@@ -29,7 +29,7 @@
#include "ngi/gameloader.h"
#include "ngi/objects.h"
-namespace Fullpipe {
+namespace NGI {
bool GameLoader::writeSavegame(Scene *sc, const char *fname, const Common::String &description) {
GameVar *v = _gameVar->getSubVarByName("OBJSTATES")->getSubVarByName("SAVEGAME");
@@ -218,4 +218,4 @@ void GameVar::save(MfcArchive &file) {
file.writeObject(_subVars);
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/statics.cpp b/engines/ngi/statics.cpp
index b6133729d9..a591622b4f 100644
--- a/engines/ngi/statics.cpp
+++ b/engines/ngi/statics.cpp
@@ -32,7 +32,7 @@
#include "ngi/constants.h"
#include "ngi/objectnames.h"
-namespace Fullpipe {
+namespace NGI {
StepArray::StepArray() {
_currPointIndex = 0;
@@ -2196,4 +2196,4 @@ bool StaticPhase::load(MfcArchive &file) {
return true;
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/statics.h b/engines/ngi/statics.h
index e633a62f80..d8fd08b855 100644
--- a/engines/ngi/statics.h
+++ b/engines/ngi/statics.h
@@ -25,7 +25,7 @@
#include "ngi/gfx.h"
-namespace Fullpipe {
+namespace NGI {
class ExCommand;
@@ -263,6 +263,6 @@ public:
bool isPixelHitAtPos(int x, int y);
};
-} // End of namespace Fullpipe
+} // End of namespace NGI
#endif /* FULLPIPE_STATICS_H */
diff --git a/engines/ngi/utils.cpp b/engines/ngi/utils.cpp
index 980f512ab6..a0d8872d1f 100644
--- a/engines/ngi/utils.cpp
+++ b/engines/ngi/utils.cpp
@@ -32,7 +32,7 @@
#include "ngi/messages.h"
#include "ngi/interaction.h"
-namespace Fullpipe {
+namespace NGI {
bool CObject::loadFile(const Common::String &fname) {
Common::File file;
@@ -569,4 +569,4 @@ Common::String FullpipeEngine::gameIdToStr(uint16 id) {
return Common::String::format("%d", id);
}
-} // End of namespace Fullpipe
+} // End of namespace NGI
diff --git a/engines/ngi/utils.h b/engines/ngi/utils.h
index 4e26c60c59..236077437a 100644
--- a/engines/ngi/utils.h
+++ b/engines/ngi/utils.h
@@ -28,7 +28,7 @@
#include "common/array.h"
#include "common/file.h"
-namespace Fullpipe {
+namespace NGI {
class CObject;
class NGIArchive;
@@ -195,6 +195,6 @@ class DWordArray : public Common::Array<int32>, public CObject {
Common::String genFileName(int superId, int sceneId, const char *ext);
byte *transCyrillic(const Common::String &str);
-} // End of namespace Fullpipe
+} // End of namespace NGI
#endif /* FULLPIPE_UTILS_H */
Commit: 3cadfbeaf7e4e8fd05f2f2b7edf6114916bbec67
https://github.com/scummvm/scummvm/commit/3cadfbeaf7e4e8fd05f2f2b7edf6114916bbec67
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-04T00:05:36+02:00
Commit Message:
NGI: Rename engine class
Changed paths:
engines/ngi/console.cpp
engines/ngi/console.h
engines/ngi/detection.cpp
engines/ngi/fullpipe/scene03.cpp
engines/ngi/gameloader.cpp
engines/ngi/gfx.cpp
engines/ngi/init.cpp
engines/ngi/input.cpp
engines/ngi/inventory.cpp
engines/ngi/lift.cpp
engines/ngi/metaengine.cpp
engines/ngi/modal.cpp
engines/ngi/ngi.cpp
engines/ngi/ngi.h
engines/ngi/scene.cpp
engines/ngi/scenes.cpp
engines/ngi/sound.cpp
engines/ngi/stateloader.cpp
engines/ngi/utils.cpp
diff --git a/engines/ngi/console.cpp b/engines/ngi/console.cpp
index aad15b7ec3..91224d2138 100644
--- a/engines/ngi/console.cpp
+++ b/engines/ngi/console.cpp
@@ -28,7 +28,7 @@
namespace NGI {
-Console::Console(FullpipeEngine *vm) : GUI::Debugger(), _vm(vm) {
+Console::Console(NGIEngine *vm) : GUI::Debugger(), _vm(vm) {
registerCmd("scene", WRAP_METHOD(Console, Cmd_Scene));
}
diff --git a/engines/ngi/console.h b/engines/ngi/console.h
index dc7d59f73c..6e4941ba0c 100644
--- a/engines/ngi/console.h
+++ b/engines/ngi/console.h
@@ -27,14 +27,14 @@
namespace NGI {
-class FullpipeEngine;
+class NGIEngine;
class Console : public GUI::Debugger {
public:
- Console(FullpipeEngine *vm);
+ Console(NGIEngine *vm);
private:
- FullpipeEngine *_vm;
+ NGIEngine *_vm;
bool Cmd_Scene(int argc, const char **argv);
};
diff --git a/engines/ngi/detection.cpp b/engines/ngi/detection.cpp
index 88d608fe38..c0e7f4529d 100644
--- a/engines/ngi/detection.cpp
+++ b/engines/ngi/detection.cpp
@@ -107,9 +107,9 @@ static const ADGameDescription gameDescriptions[] = {
} // End of namespace NGI
-class FullpipeMetaEngineStatic : public AdvancedMetaEngineStatic {
+class NGIMetaEngineStatic : public AdvancedMetaEngineStatic {
public:
- FullpipeMetaEngineStatic() : AdvancedMetaEngineStatic(NGI::gameDescriptions, sizeof(ADGameDescription), fullpipeGames) {
+ NGIMetaEngineStatic() : AdvancedMetaEngineStatic(NGI::gameDescriptions, sizeof(ADGameDescription), fullpipeGames) {
}
const char *getEngineId() const override {
@@ -125,4 +125,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(NGI_DETECTION, PLUGIN_TYPE_METAENGINE, FullpipeMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(NGI_DETECTION, PLUGIN_TYPE_METAENGINE, NGIMetaEngineStatic);
diff --git a/engines/ngi/fullpipe/scene03.cpp b/engines/ngi/fullpipe/scene03.cpp
index 7ccfc322f9..5a3c27f304 100644
--- a/engines/ngi/fullpipe/scene03.cpp
+++ b/engines/ngi/fullpipe/scene03.cpp
@@ -35,7 +35,7 @@
namespace NGI {
-void FullpipeEngine::setSwallowedEggsState() {
+void NGIEngine::setSwallowedEggsState() {
GameVar *v = _gameLoader->_gameVar->getSubVarByName("OBJSTATES")->getSubVarByName(sO_GulpedEggs);
g_vars->swallowedEgg1 = v->getSubVarByName(sO_Egg1);
diff --git a/engines/ngi/gameloader.cpp b/engines/ngi/gameloader.cpp
index b5259bc718..76a877f5f8 100644
--- a/engines/ngi/gameloader.cpp
+++ b/engines/ngi/gameloader.cpp
@@ -660,14 +660,14 @@ void GameLoader::restoreDefPicAniInfos() {
}
}
-GameVar *FullpipeEngine::getGameLoaderGameVar() {
+GameVar *NGIEngine::getGameLoaderGameVar() {
if (_gameLoader)
return _gameLoader->_gameVar;
else
return 0;
}
-InputController *FullpipeEngine::getGameLoaderInputController() {
+InputController *NGIEngine::getGameLoaderInputController() {
if (_gameLoader)
return _gameLoader->_inputController;
else
diff --git a/engines/ngi/gfx.cpp b/engines/ngi/gfx.cpp
index 4d0be4fb12..403a82883a 100644
--- a/engines/ngi/gfx.cpp
+++ b/engines/ngi/gfx.cpp
@@ -1175,7 +1175,7 @@ DynamicPhase *Shadows::findSize(int width, int height) {
return _items[idx].dynPhase;
}
-void FullpipeEngine::drawAlphaRectangle(int x1, int y1, int x2, int y2, int alpha) {
+void NGIEngine::drawAlphaRectangle(int x1, int y1, int x2, int y2, int alpha) {
for (int y = y1; y < y2; y++) {
uint32 *ptr = (uint32 *)g_fp->_backgroundSurface.getBasePtr(x1, y);
@@ -1191,7 +1191,7 @@ void FullpipeEngine::drawAlphaRectangle(int x1, int y1, int x2, int y2, int alph
}
}
-void FullpipeEngine::sceneFade(Scene *sc, bool direction) {
+void NGIEngine::sceneFade(Scene *sc, bool direction) {
for (int dim = 0; dim < 255; dim += 20) {
int ticks = g_fp->_system->getMillis();
sc->draw();
diff --git a/engines/ngi/init.cpp b/engines/ngi/init.cpp
index 5a9fd0d7b2..09f266df1d 100644
--- a/engines/ngi/init.cpp
+++ b/engines/ngi/init.cpp
@@ -31,7 +31,7 @@
namespace NGI {
-void FullpipeEngine::initObjectStates() {
+void NGIEngine::initObjectStates() {
setLevelStates();
setObjectState(sO_Dude, getObjectEnumState(sO_Dude, sO_NotCarryingEgg));
@@ -125,7 +125,7 @@ void FullpipeEngine::initObjectStates() {
setObjectState(sO_Boss, getObjectEnumState(sO_Boss, sO_WithHammer));
}
-void FullpipeEngine::setLevelStates() {
+void NGIEngine::setLevelStates() {
GameVar *v = _gameLoader->_gameVar->getSubVarByName("OBJSTATES")->getSubVarByName(sO_LiftButtons);
if (v) {
@@ -142,7 +142,7 @@ void FullpipeEngine::setLevelStates() {
}
}
-void FullpipeEngine::addCursor(CursorInfo *cursorInfo, Scene *inv, int pictureId, int hotspotX, int hotspotY, int itemPictureOffsX, int itemPictureOffsY) {
+void NGIEngine::addCursor(CursorInfo *cursorInfo, Scene *inv, int pictureId, int hotspotX, int hotspotY, int itemPictureOffsX, int itemPictureOffsY) {
cursorInfo->pictureId = pictureId;
cursorInfo->picture = inv->getPictureObjectById(pictureId, 0)->_picture;
cursorInfo->hotspotX = hotspotX;
@@ -153,7 +153,7 @@ void FullpipeEngine::addCursor(CursorInfo *cursorInfo, Scene *inv, int pictureId
getGameLoaderInputController()->addCursor(cursorInfo);
}
-void FullpipeEngine::initCursors() {
+void NGIEngine::initCursors() {
CursorInfo crs;
Scene *inv = accessScene(SC_INV);
@@ -185,14 +185,14 @@ void FullpipeEngine::initCursors() {
getGameLoaderInputController()->setCursorMode(0);
}
-void FullpipeEngine::initMap() {
+void NGIEngine::initMap() {
memset(_mapTable, 0, sizeof(_mapTable));
updateMapPiece(PIC_MAP_S01, 1);
updateMapPiece(PIC_MAP_A13, 1u);
}
-void FullpipeEngine::loadAllScenes() {
+void NGIEngine::loadAllScenes() {
accessScene(301);
accessScene(302);
accessScene(303);
diff --git a/engines/ngi/input.cpp b/engines/ngi/input.cpp
index 36d0167d2a..d1ba11f0e6 100644
--- a/engines/ngi/input.cpp
+++ b/engines/ngi/input.cpp
@@ -119,7 +119,7 @@ void InputController::setCursor(int cursorId) {
}
}
-void FullpipeEngine::setCursor(int id) {
+void NGIEngine::setCursor(int id) {
if (_inputController)
_inputController->setCursor(id);
}
@@ -133,7 +133,7 @@ const char *input_cheats[] = {
""
};
-void FullpipeEngine::defHandleKeyDown(int key) {
+void NGIEngine::defHandleKeyDown(int key) {
if (_currentCheat == -1) {
for (int i = 0; input_cheats[i][0]; i++)
if (toupper(key) == input_cheats[i][0]) {
@@ -182,7 +182,7 @@ void FullpipeEngine::defHandleKeyDown(int key) {
}
}
-void FullpipeEngine::winArcade() {
+void NGIEngine::winArcade() {
ExCommand *ex = new ExCommand(0, 17, MSG_CMN_WINARCADE, 0, 0, 0, 1, 0, 0, 0);
ex->_excFlags |= 3;
@@ -190,7 +190,7 @@ void FullpipeEngine::winArcade() {
}
-void FullpipeEngine::updateCursorCommon() {
+void NGIEngine::updateCursorCommon() {
GameObject *ani = _currentScene->getStaticANIObjectAtPos(_mouseVirtX, _mouseVirtY);
PictureObject *pic = _currentScene->getPictureObjectAtPos(_mouseVirtX, _mouseVirtY);
@@ -253,7 +253,7 @@ void FullpipeEngine::updateCursorCommon() {
_cursorId = PIC_CSR_DEFAULT;
}
-void FullpipeEngine::initArcadeKeys(const char *varname) {
+void NGIEngine::initArcadeKeys(const char *varname) {
_arcadeKeys.clear();
GameVar *var = getGameLoaderGameVar()->getSubVarByName(varname)->getSubVarByName("KEYPOS");
@@ -271,7 +271,7 @@ void FullpipeEngine::initArcadeKeys(const char *varname) {
}
}
-void FullpipeEngine::processArcade(ExCommand *cmd) {
+void NGIEngine::processArcade(ExCommand *cmd) {
if (!g_fp->_aniMan2)
return;
@@ -302,7 +302,7 @@ void FullpipeEngine::processArcade(ExCommand *cmd) {
cmd->_y = cmd->_sceneClickY - g_fp->_sceneRect.top;
}
-void FullpipeEngine::setArcadeOverlay(int picId) {
+void NGIEngine::setArcadeOverlay(int picId) {
_arcadeOverlayX = 800;
_arcadeOverlayY = 545;
@@ -317,7 +317,7 @@ void FullpipeEngine::setArcadeOverlay(int picId) {
_arcadeOverlayMidY = abs(dims2.y - dims.y) / 2;
}
-int FullpipeEngine::drawArcadeOverlay(int adjust) {
+int NGIEngine::drawArcadeOverlay(int adjust) {
_arcadeOverlayHelper->drawAt(_sceneRect.left + _arcadeOverlayX, _sceneRect.top + _arcadeOverlayY);
_arcadeOverlay->drawAt(_sceneRect.left + _arcadeOverlayX + _arcadeOverlayMidX, _sceneRect.top + _arcadeOverlayY + _arcadeOverlayMidY);
diff --git a/engines/ngi/inventory.cpp b/engines/ngi/inventory.cpp
index ef9712090f..6e90efbb44 100644
--- a/engines/ngi/inventory.cpp
+++ b/engines/ngi/inventory.cpp
@@ -493,7 +493,7 @@ void Inventory2::clear() {
_inventoryItems.clear();
}
-void FullpipeEngine::getAllInventory() {
+void NGIEngine::getAllInventory() {
Inventory2 *inv = getGameLoaderInventory();
for (uint i = 0; i < inv->getItemsPoolCount(); ++i ) {
diff --git a/engines/ngi/lift.cpp b/engines/ngi/lift.cpp
index fd1e3980af..ceb37ddd9d 100644
--- a/engines/ngi/lift.cpp
+++ b/engines/ngi/lift.cpp
@@ -34,7 +34,7 @@
namespace NGI {
-int FullpipeEngine::lift_getButtonIdP(int objid) {
+int NGIEngine::lift_getButtonIdP(int objid) {
switch (objid) {
case ST_LBN_0N:
return ST_LBN_0P;
@@ -71,7 +71,7 @@ int FullpipeEngine::lift_getButtonIdP(int objid) {
}
}
-int FullpipeEngine::lift_getButtonIdH(int objid) {
+int NGIEngine::lift_getButtonIdH(int objid) {
switch (objid) {
case ST_LBN_0P:
return ST_LBN_0H;
@@ -108,7 +108,7 @@ int FullpipeEngine::lift_getButtonIdH(int objid) {
}
}
-int FullpipeEngine::lift_getButtonIdN(int objid) {
+int NGIEngine::lift_getButtonIdN(int objid) {
switch (objid) {
case ST_LBN_0H:
case ST_LBN_0N:
@@ -165,14 +165,14 @@ int FullpipeEngine::lift_getButtonIdN(int objid) {
}
}
-void FullpipeEngine::lift_setButton(const char *name, int state) {
+void NGIEngine::lift_setButton(const char *name, int state) {
GameVar *var = g_fp->getGameLoaderGameVar()->getSubVarByName("OBJSTATES")->getSubVarByName(sO_LiftButtons);
if (var)
var->setSubVarAsInt(name, state);
}
-void FullpipeEngine::lift_init(Scene *sc, int enterSeq, int exitSeq) {
+void NGIEngine::lift_init(Scene *sc, int enterSeq, int exitSeq) {
_lastLiftButton = 0;
_liftEnterMQ = sc->getMessageQueueById(enterSeq);
@@ -219,7 +219,7 @@ void FullpipeEngine::lift_init(Scene *sc, int enterSeq, int exitSeq) {
}
}
-void FullpipeEngine::lift_exitSeq(ExCommand *cmd) {
+void NGIEngine::lift_exitSeq(ExCommand *cmd) {
if (cmd) {
MessageQueue *mq = _globalMessageQueueList->getMessageQueueById(cmd->_parId);
@@ -282,7 +282,7 @@ void FullpipeEngine::lift_exitSeq(ExCommand *cmd) {
mq->chain(0);
}
-void FullpipeEngine::lift_closedoorSeq() {
+void NGIEngine::lift_closedoorSeq() {
if (_lift->_movement) {
if (_lift->_movement->_id == MV_LFT_CLOSE) {
_lift->queueMessageQueue(0);
@@ -319,7 +319,7 @@ void FullpipeEngine::lift_closedoorSeq() {
delete mq;
}
-void FullpipeEngine::lift_walkAndGo() {
+void NGIEngine::lift_walkAndGo() {
MessageQueue *mq;
ExCommand *ex;
@@ -362,7 +362,7 @@ void FullpipeEngine::lift_walkAndGo() {
}
}
-void FullpipeEngine::lift_openLift() {
+void NGIEngine::lift_openLift() {
if (_lift->_movement) {
if (_lift->_movement->_id == MV_LFT_OPEN) {
_lift->queueMessageQueue(0);
@@ -387,12 +387,12 @@ void FullpipeEngine::lift_openLift() {
}
}
-void FullpipeEngine::lift_clickButton() {
+void NGIEngine::lift_clickButton() {
if (_lastLiftButton)
lift_walkAndGo();
}
-void FullpipeEngine::lift_goAnimation() {
+void NGIEngine::lift_goAnimation() {
if (_lastLiftButton) {
int parentId = _currentScene->_sceneId;
int buttonId = lift_getButtonIdN(_lastLiftButton->_statics->_staticsId);
@@ -443,7 +443,7 @@ void FullpipeEngine::lift_goAnimation() {
}
}
-void FullpipeEngine::lift_animateButton(StaticANIObject *button) {
+void NGIEngine::lift_animateButton(StaticANIObject *button) {
int butId = lift_getButtonIdP(button->_statics->_staticsId);
if (butId && butId != button->_statics->_staticsId) {
@@ -480,13 +480,13 @@ void FullpipeEngine::lift_animateButton(StaticANIObject *button) {
}
}
-void FullpipeEngine::lift_startExitQueue() {
+void NGIEngine::lift_startExitQueue() {
MessageQueue *mq = new MessageQueue(_liftExitMQ, 0, 0);
mq->chain(0);
}
-void FullpipeEngine::lift_hoverButton(ExCommand *cmd) {
+void NGIEngine::lift_hoverButton(ExCommand *cmd) {
if (_lastLiftButton) {
if (!(cmd->_param & 2) || _liftX != cmd->_x || _liftY != cmd->_y) {
_lastLiftButton->_statics = _lastLiftButton->getStaticsById(lift_getButtonIdN(_lastLiftButton->_statics->_staticsId));
@@ -495,7 +495,7 @@ void FullpipeEngine::lift_hoverButton(ExCommand *cmd) {
}
}
-bool FullpipeEngine::lift_checkButton(const char *varName) {
+bool NGIEngine::lift_checkButton(const char *varName) {
GameVar *var = g_fp->getGameLoaderGameVar()->getSubVarByName("OBJSTATES")->getSubVarByName(sO_LiftButtons);
if (var)
@@ -504,7 +504,7 @@ bool FullpipeEngine::lift_checkButton(const char *varName) {
return false;
}
-void FullpipeEngine::lift_setButtonStatics(Scene *sc, int buttonId) {
+void NGIEngine::lift_setButtonStatics(Scene *sc, int buttonId) {
for (uint i = 0; i < sc->_staticANIObjectList1.size(); i++) {
StaticANIObject *ani = sc->_staticANIObjectList1[i];
diff --git a/engines/ngi/metaengine.cpp b/engines/ngi/metaengine.cpp
index c3dad0c56f..92446cfbd9 100644
--- a/engines/ngi/metaengine.cpp
+++ b/engines/ngi/metaengine.cpp
@@ -32,25 +32,25 @@
namespace NGI {
-uint32 FullpipeEngine::getFeatures() const {
+uint32 NGIEngine::getFeatures() const {
return _gameDescription->flags;
}
-bool FullpipeEngine::isDemo() {
+bool NGIEngine::isDemo() {
return _gameDescription->flags & ADGF_DEMO;
}
-Common::Language FullpipeEngine::getLanguage() const {
+Common::Language NGIEngine::getLanguage() const {
return _gameDescription->language;
}
-const char *FullpipeEngine::getGameId() const {
+const char *NGIEngine::getGameId() const {
return _gameDescription->gameId;
}
} // End of namspace Fullpipe
-class FullpipeMetaEngine : public AdvancedMetaEngine {
+class NGIMetaEngine : public AdvancedMetaEngine {
public:
const char *getName() const override {
return "ngi";
@@ -66,7 +66,7 @@ public:
bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
};
-bool FullpipeMetaEngine::hasFeature(MetaEngineFeature f) const {
+bool NGIMetaEngine::hasFeature(MetaEngineFeature f) const {
return
(f == kSupportsListSaves) ||
(f == kSupportsDeleteSave) ||
@@ -78,14 +78,14 @@ bool FullpipeMetaEngine::hasFeature(MetaEngineFeature f) const {
(f == kSimpleSavesNames);
}
-bool NGI::FullpipeEngine::hasFeature(EngineFeature f) const {
+bool NGI::NGIEngine::hasFeature(EngineFeature f) const {
return
(f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
-SaveStateList FullpipeMetaEngine::listSaves(const char *target) const {
+SaveStateList NGIMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringArray filenames;
Common::String pattern("fullpipe.s##");
@@ -121,11 +121,11 @@ SaveStateList FullpipeMetaEngine::listSaves(const char *target) const {
return saveList;
}
-void FullpipeMetaEngine::removeSaveState(const char *target, int slot) const {
+void NGIMetaEngine::removeSaveState(const char *target, int slot) const {
g_system->getSavefileManager()->removeSavefile(NGI::getSavegameFile(slot));
}
-SaveStateDescriptor FullpipeMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
+SaveStateDescriptor NGIMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
Common::ScopedPtr<Common::InSaveFile> f(g_system->getSavefileManager()->openForLoading(
NGI::getSavegameFile(slot)));
@@ -149,15 +149,15 @@ SaveStateDescriptor FullpipeMetaEngine::querySaveMetaInfos(const char *target, i
return SaveStateDescriptor();
}
-bool FullpipeMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
+bool NGIMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
if (desc) {
- *engine = new NGI::FullpipeEngine(syst, desc);
+ *engine = new NGI::NGIEngine(syst, desc);
}
return desc != 0;
}
#if PLUGIN_ENABLED_DYNAMIC(NGI)
- REGISTER_PLUGIN_DYNAMIC(NGI, PLUGIN_TYPE_ENGINE, FullpipeMetaEngine);
+ REGISTER_PLUGIN_DYNAMIC(NGI, PLUGIN_TYPE_ENGINE, NGIMetaEngine);
#else
- REGISTER_PLUGIN_STATIC(NGI, PLUGIN_TYPE_ENGINE, FullpipeMetaEngine);
+ REGISTER_PLUGIN_STATIC(NGI, PLUGIN_TYPE_ENGINE, NGIMetaEngine);
#endif
diff --git a/engines/ngi/modal.cpp b/engines/ngi/modal.cpp
index 38fe1e1c69..07263f7c38 100644
--- a/engines/ngi/modal.cpp
+++ b/engines/ngi/modal.cpp
@@ -1047,7 +1047,7 @@ bool ModalMap::checkScenePass(PreloadItem *item) {
return res;
}
-void FullpipeEngine::openMap() {
+void NGIEngine::openMap() {
if (!_modalObject) {
ModalMap *map = new ModalMap;
@@ -2473,7 +2473,7 @@ bool ModalDemo::handleMessage(ExCommand *cmd) {
return false;
}
-void FullpipeEngine::openHelp() {
+void NGIEngine::openHelp() {
if (!_modalObject) {
ModalHelp *help = new ModalHelp;
@@ -2483,7 +2483,7 @@ void FullpipeEngine::openHelp() {
}
}
-void FullpipeEngine::openMainMenu() {
+void NGIEngine::openMainMenu() {
if (isDemo() && getLanguage() == Common::RU_RUS) {
ModalQuery *q = new ModalQuery;
diff --git a/engines/ngi/ngi.cpp b/engines/ngi/ngi.cpp
index 2ba4c81d18..f7a7e5f4a2 100644
--- a/engines/ngi/ngi.cpp
+++ b/engines/ngi/ngi.cpp
@@ -45,10 +45,10 @@
namespace NGI {
-FullpipeEngine *g_fp = nullptr;
+NGIEngine *g_fp = nullptr;
Vars *g_vars = nullptr;
-FullpipeEngine::FullpipeEngine(OSystem *syst, const ADGameDescription *gameDesc) :
+NGIEngine::NGIEngine(OSystem *syst, const ADGameDescription *gameDesc) :
Engine(syst),
_gameDescription(gameDesc),
_rnd("ngi"),
@@ -185,12 +185,12 @@ FullpipeEngine::FullpipeEngine(OSystem *syst, const ADGameDescription *gameDesc)
g_vars = new Vars;
}
-FullpipeEngine::~FullpipeEngine() {
+NGIEngine::~NGIEngine() {
delete g_vars;
g_vars = nullptr;
}
-void FullpipeEngine::restartGame() {
+void NGIEngine::restartGame() {
_floaters->stopAll();
clearGlobalMessageQueueList();
@@ -226,11 +226,11 @@ void FullpipeEngine::restartGame() {
}
}
-bool FullpipeEngine::shouldQuit() {
+bool NGIEngine::shouldQuit() {
return !_gameContinue || Engine::shouldQuit();
}
-Common::Error FullpipeEngine::loadGameState(int slot) {
+Common::Error NGIEngine::loadGameState(int slot) {
deleteModalObject();
if (_gameLoader->readSavegame(getSavegameFile(slot)))
@@ -239,18 +239,18 @@ Common::Error FullpipeEngine::loadGameState(int slot) {
return Common::kUnknownError;
}
-Common::Error FullpipeEngine::saveGameState(int slot, const Common::String &description, bool isAutosave) {
+Common::Error NGIEngine::saveGameState(int slot, const Common::String &description, bool isAutosave) {
if (_gameLoader->writeSavegame(_currentScene, getSavegameFile(slot), description))
return Common::kNoError;
else
return Common::kUnknownError;
}
-Common::String FullpipeEngine::getSaveStateName(int slot) const {
+Common::String NGIEngine::getSaveStateName(int slot) const {
return Common::String::format("%s.s%02d", getGameId(), slot);
}
-Common::Error FullpipeEngine::run() {
+Common::Error NGIEngine::run() {
const Graphics::PixelFormat format(4, 8, 8, 8, 8, 24, 16, 8, 0);
// Initialize backend
initGraphics(800, 600, &format);
@@ -336,7 +336,7 @@ Common::Error FullpipeEngine::run() {
return Common::kNoError;
}
-void FullpipeEngine::updateEvents() {
+void NGIEngine::updateEvents() {
Common::Event event;
Common::EventManager *eventMan = _system->getEventManager();
ExCommand *ex;
@@ -450,7 +450,7 @@ void FullpipeEngine::updateEvents() {
//}
}
-void FullpipeEngine::freeGameLoader() {
+void NGIEngine::freeGameLoader() {
setCursor(0);
_floaters->stopAll();
_gameLoader.reset();
@@ -459,7 +459,7 @@ void FullpipeEngine::freeGameLoader() {
_loaderScene = 0;
}
-void FullpipeEngine::cleanup() {
+void NGIEngine::cleanup() {
//cleanRecorder();
clearMessageHandlers();
clearMessages();
@@ -471,7 +471,7 @@ void FullpipeEngine::cleanup() {
stopAllSoundStreams();
}
-void FullpipeEngine::deleteModalObject() {
+void NGIEngine::deleteModalObject() {
if (!_modalObject)
return;
@@ -483,8 +483,8 @@ void FullpipeEngine::deleteModalObject() {
_modalObject = tmp;
}
-void FullpipeEngine::updateScreen() {
- debugC(4, kDebugDrawing, "FullpipeEngine::updateScreen()");
+void NGIEngine::updateScreen() {
+ debugC(4, kDebugDrawing, "NGIEngine::updateScreen()");
_mouseVirtX = _mouseScreenPos.x + _sceneRect.left;
_mouseVirtY = _mouseScreenPos.y + _sceneRect.top;
@@ -521,7 +521,7 @@ void FullpipeEngine::updateScreen() {
++_updateTicks;
}
-int FullpipeEngine::getObjectEnumState(const Common::String &name, const char *state) {
+int NGIEngine::getObjectEnumState(const Common::String &name, const char *state) {
GameVar *var = _gameLoader->_gameVar->getSubVarByName("OBJSTATES");
if (!var) {
@@ -538,7 +538,7 @@ int FullpipeEngine::getObjectEnumState(const Common::String &name, const char *s
return 0;
}
-int FullpipeEngine::getObjectState(const Common::String &objname) {
+int NGIEngine::getObjectState(const Common::String &objname) {
GameVar *var = _gameLoader->_gameVar->getSubVarByName("OBJSTATES");
if (var)
@@ -547,7 +547,7 @@ int FullpipeEngine::getObjectState(const Common::String &objname) {
return 0;
}
-void FullpipeEngine::setObjectState(const Common::String &name, int state) {
+void NGIEngine::setObjectState(const Common::String &name, int state) {
GameVar *var = _gameLoader->_gameVar->getSubVarByName("OBJSTATES");
if (!var) {
@@ -557,7 +557,7 @@ void FullpipeEngine::setObjectState(const Common::String &name, int state) {
var->setSubVarAsInt(name, state);
}
-void FullpipeEngine::disableSaves(ExCommand *ex) {
+void NGIEngine::disableSaves(ExCommand *ex) {
if (_isSaveAllowed) {
_isSaveAllowed = false;
@@ -577,7 +577,7 @@ void FullpipeEngine::disableSaves(ExCommand *ex) {
}
}
-bool FullpipeEngine::isSaveAllowed() {
+bool NGIEngine::isSaveAllowed() {
if (!g_fp->_isSaveAllowed)
return false;
diff --git a/engines/ngi/ngi.h b/engines/ngi/ngi.h
index 11040721ad..820ac5a55a 100644
--- a/engines/ngi/ngi.h
+++ b/engines/ngi/ngi.h
@@ -113,14 +113,14 @@ int global_messageHandler4(ExCommand *cmd);
void global_messageHandler_handleSound(ExCommand *cmd);
-class FullpipeEngine : public ::Engine {
+class NGIEngine : public ::Engine {
protected:
Common::Error run() override;
public:
- FullpipeEngine(OSystem *syst, const ADGameDescription *gameDesc);
- ~FullpipeEngine() override;
+ NGIEngine(OSystem *syst, const ADGameDescription *gameDesc);
+ ~NGIEngine() override;
void initialize();
void restartGame();
@@ -380,7 +380,7 @@ public:
};
-extern FullpipeEngine *g_fp;
+extern NGIEngine *g_fp;
extern Vars *g_vars;
} // End of namespace NGI
diff --git a/engines/ngi/scene.cpp b/engines/ngi/scene.cpp
index c10ab4fa3b..ab467ce069 100644
--- a/engines/ngi/scene.cpp
+++ b/engines/ngi/scene.cpp
@@ -35,7 +35,7 @@
namespace NGI {
-Scene *FullpipeEngine::accessScene(int sceneId) {
+Scene *NGIEngine::accessScene(int sceneId) {
SceneTag *t = 0;
for (SceneTagList::iterator s = _gameProject->_sceneTagList->begin(); s != _gameProject->_sceneTagList->end(); ++s) {
diff --git a/engines/ngi/scenes.cpp b/engines/ngi/scenes.cpp
index 2303b26d52..f9e6abd57e 100644
--- a/engines/ngi/scenes.cpp
+++ b/engines/ngi/scenes.cpp
@@ -492,7 +492,7 @@ static int scenesD[] = {
PIC_SCD_31, PIC_SCD_32, PIC_SCD_33, PIC_SCD_34, PIC_SCD_35, PIC_SCD_36, PIC_SCD_37, PIC_SCD_38, PIC_SCD_FIN, 0
};
-int FullpipeEngine::convertScene(int scene) {
+int NGIEngine::convertScene(int scene) {
if (!scene || scene >= SC_1)
return scene;
@@ -502,7 +502,7 @@ int FullpipeEngine::convertScene(int scene) {
return scenes[scene - 1];
}
-int FullpipeEngine::getSceneEntrance(int scene) {
+int NGIEngine::getSceneEntrance(int scene) {
for (int i = 0; i < 40; i++)
if (scenes[i] == scene)
return scenesD[i];
@@ -510,7 +510,7 @@ int FullpipeEngine::getSceneEntrance(int scene) {
return 0;
}
-int FullpipeEngine::getSceneFromTag(int tag) {
+int NGIEngine::getSceneFromTag(int tag) {
for (int i = 0; i < ARRAYSIZE(scenes); i++) {
if (scenes[i] == tag)
return i + 1;
@@ -519,7 +519,7 @@ int FullpipeEngine::getSceneFromTag(int tag) {
return 1;
}
-void FullpipeEngine::sceneAutoScrolling() {
+void NGIEngine::sceneAutoScrolling() {
if (_aniMan2 == _aniMan && _currentScene && !_currentScene->_messageQueueId) {
if (800 - _mouseScreenPos.x >= 47 || _sceneRect.right >= _sceneWidth - 1 || _aniMan->_ox <= _sceneRect.left + 230) {
if (_mouseScreenPos.x < 47 && _sceneRect.left > 0 && _aniMan->_ox < _sceneRect.right - 230)
@@ -530,7 +530,7 @@ void FullpipeEngine::sceneAutoScrolling() {
}
}
-bool FullpipeEngine::sceneSwitcher(const EntranceInfo &entrance) {
+bool NGIEngine::sceneSwitcher(const EntranceInfo &entrance) {
GameVar *sceneVar;
Common::Point sceneDim;
@@ -1128,7 +1128,7 @@ int defaultUpdateCursor() {
return g_fp->_cursorId;
}
-void FullpipeEngine::updateMapPiece(int mapId, int update) {
+void NGIEngine::updateMapPiece(int mapId, int update) {
for (int i = 0; i < 200; i++) {
int hiWord = (_mapTable[i] >> 16) & 0xffff;
@@ -1143,7 +1143,7 @@ void FullpipeEngine::updateMapPiece(int mapId, int update) {
}
}
-void FullpipeEngine::updateMap(PreloadItem *pre) {
+void NGIEngine::updateMap(PreloadItem *pre) {
switch (pre->sceneId) {
case SC_1:
updateMapPiece(PIC_MAP_S01, 1);
diff --git a/engines/ngi/sound.cpp b/engines/ngi/sound.cpp
index 460a407091..8d44382098 100644
--- a/engines/ngi/sound.cpp
+++ b/engines/ngi/sound.cpp
@@ -222,7 +222,7 @@ void Sound::stop() {
g_fp->_mixer->stopHandle(*_handle);
}
-void FullpipeEngine::setSceneMusicParameters(GameVar *gvar) {
+void NGIEngine::setSceneMusicParameters(GameVar *gvar) {
stopSoundStream2();
if (_mixer->isSoundHandleActive(_soundStream3))
@@ -278,12 +278,12 @@ void FullpipeEngine::setSceneMusicParameters(GameVar *gvar) {
_trackStartDelay = var->getSubVarAsInt("STARTDELAY");
}
-void FullpipeEngine::updateTrackDelay() {
+void NGIEngine::updateTrackDelay() {
_sceneTrackIsPlaying = false;
_trackStartDelay = _musicMinDelay + (_musicMaxDelay - _musicMinDelay) * (_updateTicks % 10) / 9;
}
-void FullpipeEngine::startSceneTrack() {
+void NGIEngine::startSceneTrack() {
if (_sceneTrackIsPlaying) {
if (!_mixer->isSoundHandleActive(_soundStream1)) { // Simulate end of sound callback
updateTrackDelay();
@@ -312,7 +312,7 @@ void FullpipeEngine::startSceneTrack() {
}
}
-int FullpipeEngine::getSceneTrack() {
+int NGIEngine::getSceneTrack() {
int res;
if (_sceneTrackHasSequence) {
@@ -340,13 +340,13 @@ int FullpipeEngine::getSceneTrack() {
return res;
}
-void FullpipeEngine::startSoundStream1(const Common::String &trackName) {
+void NGIEngine::startSoundStream1(const Common::String &trackName) {
stopAllSoundStreams();
playOggSound(trackName, _soundStream1);
}
-void FullpipeEngine::playOggSound(const Common::String &trackName, Audio::SoundHandle &stream) {
+void NGIEngine::playOggSound(const Common::String &trackName, Audio::SoundHandle &stream) {
#ifdef USE_VORBIS
if (_mixer->isSoundHandleActive(stream))
return;
@@ -362,14 +362,14 @@ void FullpipeEngine::playOggSound(const Common::String &trackName, Audio::SoundH
#endif
}
-void FullpipeEngine::stopAllSounds() {
+void NGIEngine::stopAllSounds() {
for (int i = 0; i < _currSoundListCount; i++)
for (int j = 0; j < _currSoundList1[i]->getCount(); j++) {
_currSoundList1[i]->getSoundByIndex(j).stop();
}
}
-void FullpipeEngine::toggleMute() {
+void NGIEngine::toggleMute() {
if (_soundEnabled) {
_sfxVolume = _sfxVolume != -10000 ? -10000 : 0;
@@ -377,7 +377,7 @@ void FullpipeEngine::toggleMute() {
}
}
-void FullpipeEngine::playSound(int id, int flag) {
+void NGIEngine::playSound(int id, int flag) {
Sound *sound = 0;
for (int i = 0; i < _currSoundListCount; i++) {
@@ -395,7 +395,7 @@ void FullpipeEngine::playSound(int id, int flag) {
sound->play(flag);
}
-void FullpipeEngine::playTrack(GameVar *sceneVar, const char *name, bool delayed) {
+void NGIEngine::playTrack(GameVar *sceneVar, const char *name, bool delayed) {
if (_mixer->isSoundHandleActive(_soundStream3))
_mixer->stopHandle(_soundStream4);
@@ -485,7 +485,7 @@ void global_messageHandler_handleSound(ExCommand *cmd) {
}
}
-void FullpipeEngine::stopSoundStream2() {
+void NGIEngine::stopSoundStream2() {
_stream2playing = false;
if (_mixer->isSoundHandleActive(_soundStream3)) {
@@ -494,7 +494,7 @@ void FullpipeEngine::stopSoundStream2() {
}
}
-void FullpipeEngine::stopAllSoundStreams() {
+void NGIEngine::stopAllSoundStreams() {
_mixer->stopHandle(_soundStream1);
_mixer->stopHandle(_soundStream2);
_mixer->stopHandle(_soundStream3);
@@ -503,7 +503,7 @@ void FullpipeEngine::stopAllSoundStreams() {
_stream2playing = false;
}
-void FullpipeEngine::stopAllSoundInstances(int id) {
+void NGIEngine::stopAllSoundInstances(int id) {
for (int i = 0; i < _currSoundListCount; i++) {
Sound *sound = _currSoundList1[i]->getSoundItemById(id);
@@ -512,7 +512,7 @@ void FullpipeEngine::stopAllSoundInstances(int id) {
}
}
-void FullpipeEngine::updateSoundVolume() {
+void NGIEngine::updateSoundVolume() {
ConfMan.setInt("sfx_volume", MAX((_sfxVolume + 10000) / 39, 255));
syncSoundSettings();
@@ -522,7 +522,7 @@ void FullpipeEngine::updateSoundVolume() {
}
}
-void FullpipeEngine::setMusicVolume(int vol) {
+void NGIEngine::setMusicVolume(int vol) {
_musicVolume = vol;
ConfMan.setInt("music_volume", _musicVolume);
diff --git a/engines/ngi/stateloader.cpp b/engines/ngi/stateloader.cpp
index bbb6401ba8..2df28fc963 100644
--- a/engines/ngi/stateloader.cpp
+++ b/engines/ngi/stateloader.cpp
@@ -275,7 +275,7 @@ void gameLoaderSavegameCallback(MfcArchive *archive, bool mode) {
g_fp->_mapTable[i] = archive->readUint32LE();
}
-bool FullpipeEngine::loadGam(const char *fname, int scene) {
+bool NGIEngine::loadGam(const char *fname, int scene) {
_gameLoader.reset(new GameLoader());
if (!_gameLoader->loadFile(fname))
diff --git a/engines/ngi/utils.cpp b/engines/ngi/utils.cpp
index a0d8872d1f..ae53f24375 100644
--- a/engines/ngi/utils.cpp
+++ b/engines/ngi/utils.cpp
@@ -530,7 +530,7 @@ byte *transCyrillic(const Common::String &str) {
return tmp;
}
-void FullpipeEngine::loadGameObjH() {
+void NGIEngine::loadGameObjH() {
Common::File file;
if (!file.open("gameobj.h"))
@@ -562,7 +562,7 @@ void FullpipeEngine::loadGameObjH() {
}
}
-Common::String FullpipeEngine::gameIdToStr(uint16 id) {
+Common::String NGIEngine::gameIdToStr(uint16 id) {
if (_gameObjH.contains(id))
return _gameObjH[id];
Commit: a70a5cb5b34a87bb96d726590a71b18767b7deb7
https://github.com/scummvm/scummvm/commit/a70a5cb5b34a87bb96d726590a71b18767b7deb7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-04T00:05:36+02:00
Commit Message:
NGI: Rename guard defines
Changed paths:
engines/ngi/anihandler.h
engines/ngi/behavior.h
engines/ngi/console.h
engines/ngi/constants.h
engines/ngi/floaters.h
engines/ngi/gameloader.h
engines/ngi/gfx.h
engines/ngi/input.h
engines/ngi/interaction.h
engines/ngi/inventory.h
engines/ngi/messages.h
engines/ngi/modal.h
engines/ngi/motion.h
engines/ngi/ngi.h
engines/ngi/ngiarchive.h
engines/ngi/objectnames.h
engines/ngi/objects.h
engines/ngi/scene.h
engines/ngi/scenes.h
engines/ngi/sound.h
engines/ngi/statesaver.cpp
engines/ngi/statics.h
engines/ngi/utils.h
diff --git a/engines/ngi/anihandler.h b/engines/ngi/anihandler.h
index 5dc88e66ab..ddbd6f73cf 100644
--- a/engines/ngi/anihandler.h
+++ b/engines/ngi/anihandler.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef FULLPIPE_ANIHANDLER_H
-#define FULLPIPE_ANIHANDLER_H
+#ifndef NGI_ANIHANDLER_H
+#define NGI_ANIHANDLER_H
namespace NGI {
@@ -115,4 +115,4 @@ public:
} // End of namespace NGI
-#endif /* FULLPIPE_ANIHANDLER_H */
+#endif /* NGI_ANIHANDLER_H */
diff --git a/engines/ngi/behavior.h b/engines/ngi/behavior.h
index 5a02903942..ed4e5801b8 100644
--- a/engines/ngi/behavior.h
+++ b/engines/ngi/behavior.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef FULLPIPE_BEHAVIOR_H
-#define FULLPIPE_BEHAVIOR_H
+#ifndef NGI_BEHAVIOR_H
+#define NGI_BEHAVIOR_H
namespace NGI {
@@ -86,4 +86,4 @@ class BehaviorManager : public CObject {
} // End of namespace NGI
-#endif /* FULLPIPE_BEHAVIOR_H */
+#endif /* NGI_BEHAVIOR_H */
diff --git a/engines/ngi/console.h b/engines/ngi/console.h
index 6e4941ba0c..2d9b626a91 100644
--- a/engines/ngi/console.h
+++ b/engines/ngi/console.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef FULLPIPE_CONSOLE_H
-#define FULLPIPE_CONSOLE_H
+#ifndef NGI_CONSOLE_H
+#define NGI_CONSOLE_H
#include "gui/debugger.h"
@@ -41,4 +41,4 @@ private:
} // End of namespace NGI
-#endif /* FULLPIPE_CONSOLE_H */
+#endif /* NGI_CONSOLE_H */
diff --git a/engines/ngi/constants.h b/engines/ngi/constants.h
index 96aca1291b..c0767db0cf 100644
--- a/engines/ngi/constants.h
+++ b/engines/ngi/constants.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef FULLPIPE_CONSTANTS_H
-#define FULLPIPE_CONSTANTS_H
+#ifndef NGI_CONSTANTS_H
+#define NGI_CONSTANTS_H
namespace NGI {
@@ -1734,4 +1734,4 @@ namespace NGI {
} // End of namespace NGI
-#endif /* FULLPIPE_CONSTANTS_H */
+#endif /* NGI_CONSTANTS_H */
diff --git a/engines/ngi/floaters.h b/engines/ngi/floaters.h
index 3fe0666c6b..4c8b473c43 100644
--- a/engines/ngi/floaters.h
+++ b/engines/ngi/floaters.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef FULLPIPE_FLOATERS_H
-#define FULLPIPE_FLOATERS_H
+#ifndef NGI_FLOATERS_H
+#define NGI_FLOATERS_H
#include "common/array.h"
#include "common/ptr.h"
@@ -73,4 +73,4 @@ public:
} // End of namespace NGI
-#endif /* FULLPIPE_FLOATERS_H */
+#endif /* NGI_FLOATERS_H */
diff --git a/engines/ngi/gameloader.h b/engines/ngi/gameloader.h
index 3dd53ef453..c60d3c0be8 100644
--- a/engines/ngi/gameloader.h
+++ b/engines/ngi/gameloader.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef FULLPIPE_GAMELOADER_H
-#define FULLPIPE_GAMELOADER_H
+#ifndef NGI_GAMELOADER_H
+#define NGI_GAMELOADER_H
#include "common/ptr.h"
#include "engines/savestate.h"
@@ -32,7 +32,7 @@
namespace NGI {
-#define FULLPIPE_SAVEGAME_VERSION 2
+#define NGI_SAVEGAME_VERSION 2
class SceneTag;
class MctlCompound;
@@ -153,4 +153,4 @@ MctlCompound *getCurrSceneSc2MotionController();
} // End of namespace NGI
-#endif /* FULLPIPE_GAMELOADER_H */
+#endif /* NGI_GAMELOADER_H */
diff --git a/engines/ngi/gfx.h b/engines/ngi/gfx.h
index 91290af4e7..e096104557 100644
--- a/engines/ngi/gfx.h
+++ b/engines/ngi/gfx.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef FULLPIPE_GFX_H
-#define FULLPIPE_GFX_H
+#ifndef NGI_GFX_H
+#define NGI_GFX_H
#include "common/ptr.h"
@@ -240,4 +240,4 @@ class Shadows : public CObject {
} // End of namespace NGI
-#endif /* FULLPIPE_GFX_H */
+#endif /* NGI_GFX_H */
diff --git a/engines/ngi/input.h b/engines/ngi/input.h
index 7a20561b8d..e9256375c9 100644
--- a/engines/ngi/input.h
+++ b/engines/ngi/input.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef FULLPIPE_INPUT_H
-#define FULLPIPE_INPUT_H
+#ifndef NGI_INPUT_H
+#define NGI_INPUT_H
namespace NGI {
@@ -73,4 +73,4 @@ class InputController {
} // End of namespace NGI
-#endif /* FULLPIPE_INPUT_H */
+#endif /* NGI_INPUT_H */
diff --git a/engines/ngi/interaction.h b/engines/ngi/interaction.h
index 2430f82cb9..ca44bde2bc 100644
--- a/engines/ngi/interaction.h
+++ b/engines/ngi/interaction.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef FULLPIPE_INTERACTION_H
-#define FULLPIPE_INTERACTION_H
+#ifndef NGI_INTERACTION_H
+#define NGI_INTERACTION_H
#include "ngi/utils.h"
@@ -99,4 +99,4 @@ struct EntranceInfo {
} // End of namespace NGI
-#endif /* FULLPIPE_INTERACTION_H */
+#endif /* NGI_INTERACTION_H */
diff --git a/engines/ngi/inventory.h b/engines/ngi/inventory.h
index 46c782d7ae..6fbe7ba7e7 100644
--- a/engines/ngi/inventory.h
+++ b/engines/ngi/inventory.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef FULLPIPE_INVENTORY_H
-#define FULLPIPE_INVENTORY_H
+#ifndef NGI_INVENTORY_H
+#define NGI_INVENTORY_H
namespace NGI {
@@ -131,4 +131,4 @@ class Inventory2 : public Inventory {
} // End of namespace NGI
-#endif /* FULLPIPE_INVENTORY_H */
+#endif /* NGI_INVENTORY_H */
diff --git a/engines/ngi/messages.h b/engines/ngi/messages.h
index 75cc1370f0..fa49b338e3 100644
--- a/engines/ngi/messages.h
+++ b/engines/ngi/messages.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef FULLPIPE_MESSAGEQUEUE_H
-#define FULLPIPE_MESSAGEQUEUE_H
+#ifndef NGI_MESSAGEQUEUE_H
+#define NGI_MESSAGEQUEUE_H
#include "ngi/utils.h"
#include "ngi/inventory.h"
@@ -204,4 +204,4 @@ void postExCommand(int parentId, int keyCode, int x, int y, int f20, int f16);
} // End of namespace NGI
-#endif /* FULLPIPE_MESSAGEQUEUE_H */
+#endif /* NGI_MESSAGEQUEUE_H */
diff --git a/engines/ngi/modal.h b/engines/ngi/modal.h
index 6c8b502a4b..055d670a76 100644
--- a/engines/ngi/modal.h
+++ b/engines/ngi/modal.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef FULLPIPE_MODAL_H
-#define FULLPIPE_MODAL_H
+#ifndef NGI_MODAL_H
+#define NGI_MODAL_H
#include "video/avi_decoder.h"
@@ -351,4 +351,4 @@ class ModalDemo : public BaseModalObject {
} // End of namespace NGI
-#endif /* FULLPIPE_MODAL_H */
+#endif /* NGI_MODAL_H */
diff --git a/engines/ngi/motion.h b/engines/ngi/motion.h
index eea6e66ace..99eb9f3fbd 100644
--- a/engines/ngi/motion.h
+++ b/engines/ngi/motion.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef FULLPIPE_MOTION_H
-#define FULLPIPE_MOTION_H
+#ifndef NGI_MOTION_H
+#define NGI_MOTION_H
#include "ngi/anihandler.h"
@@ -413,4 +413,4 @@ public:
} // End of namespace NGI
-#endif /* FULLPIPE_MOTION_H */
+#endif /* NGI_MOTION_H */
diff --git a/engines/ngi/ngi.h b/engines/ngi/ngi.h
index 820ac5a55a..deab1a31d3 100644
--- a/engines/ngi/ngi.h
+++ b/engines/ngi/ngi.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef FULLPIPE_FULLPIPE_H
-#define FULLPIPE_FULLPIPE_H
+#ifndef NGI_FULLPIPE_H
+#define NGI_FULLPIPE_H
#include "audio/mixer.h"
#include "common/scummsys.h"
@@ -385,4 +385,4 @@ extern Vars *g_vars;
} // End of namespace NGI
-#endif /* FULLPIPE_FULLPIPE_H */
+#endif /* NGI_FULLPIPE_H */
diff --git a/engines/ngi/ngiarchive.h b/engines/ngi/ngiarchive.h
index f3f5d30b5b..1998ec45f5 100644
--- a/engines/ngi/ngiarchive.h
+++ b/engines/ngi/ngiarchive.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef FULLPIPE_NGIARCHIVE_H
-#define FULLPIPE_NGIARCHIVE_H
+#ifndef NGI_NGIARCHIVE_H
+#define NGI_NGIARCHIVE_H
#include "common/ptr.h"
#include "common/str.h"
diff --git a/engines/ngi/objectnames.h b/engines/ngi/objectnames.h
index 8bb94ecc76..3bd79b2e29 100644
--- a/engines/ngi/objectnames.h
+++ b/engines/ngi/objectnames.h
@@ -22,8 +22,8 @@
// This file is used in order to avoid usage of constants in Russian accross the code
-#ifndef FULLPIPE_OBJECTNAMES_H
-#define FULLPIPE_OBJECTNAMES_H
+#ifndef NGI_OBJECTNAMES_H
+#define NGI_OBJECTNAMES_H
namespace NGI {
@@ -257,4 +257,4 @@ namespace NGI {
} // End of namespace NGI
-#endif /* FULLPIPE_OBJECTNAMES_H */
+#endif /* NGI_OBJECTNAMES_H */
diff --git a/engines/ngi/objects.h b/engines/ngi/objects.h
index 4190a80fde..a78643748f 100644
--- a/engines/ngi/objects.h
+++ b/engines/ngi/objects.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef FULLPIPE_OBJECTS_H
-#define FULLPIPE_OBJECTS_H
+#ifndef NGI_OBJECTS_H
+#define NGI_OBJECTS_H
#include "common/ptr.h"
#include "ngi/utils.h"
@@ -102,4 +102,4 @@ class GameVar : public CObject {
} // End of namespace NGI
-#endif /* FULLPIPE_OBJECTS_H */
+#endif /* NGI_OBJECTS_H */
diff --git a/engines/ngi/scene.h b/engines/ngi/scene.h
index 9d0c179e56..3dc1f59dde 100644
--- a/engines/ngi/scene.h
+++ b/engines/ngi/scene.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef FULLPIPE_SCENE_H
-#define FULLPIPE_SCENE_H
+#ifndef NGI_SCENE_H
+#define NGI_SCENE_H
#include "common/ptr.h"
#include "ngi/gfx.h"
@@ -117,4 +117,4 @@ class SceneTagList : public Common::List<SceneTag>, public CObject {
} // End of namespace NGI
-#endif /* FULLPIPE_SCENE_H */
+#endif /* NGI_SCENE_H */
diff --git a/engines/ngi/scenes.h b/engines/ngi/scenes.h
index 2854e1e75f..56203b4973 100644
--- a/engines/ngi/scenes.h
+++ b/engines/ngi/scenes.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef FULLPIPE_SCENES_H
-#define FULLPIPE_SCENES_H
+#ifndef NGI_SCENES_H
+#define NGI_SCENES_H
namespace NGI {
@@ -687,4 +687,4 @@ struct Ring {
} // End of namespace NGI
-#endif /* FULLPIPE_SCENES_H */
+#endif /* NGI_SCENES_H */
diff --git a/engines/ngi/sound.h b/engines/ngi/sound.h
index 74c5853fb4..25e48c5640 100644
--- a/engines/ngi/sound.h
+++ b/engines/ngi/sound.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef FULLPIPE_SOUND_H
-#define FULLPIPE_SOUND_H
+#ifndef NGI_SOUND_H
+#define NGI_SOUND_H
#include "common/array.h"
#include "common/ptr.h"
@@ -75,4 +75,4 @@ class SoundList : public CObject {
} // End of namespace NGI
-#endif /* FULLPIPE_SOUND_H */
+#endif /* NGI_SOUND_H */
diff --git a/engines/ngi/statesaver.cpp b/engines/ngi/statesaver.cpp
index 94236442da..9d27c80989 100644
--- a/engines/ngi/statesaver.cpp
+++ b/engines/ngi/statesaver.cpp
@@ -130,7 +130,7 @@ bool GameLoader::writeSavegame(Scene *sc, const char *fname, const Common::Strin
FullpipeSavegameHeader header2;
strcpy(header2.id, "SVMCR");
- header2.version = FULLPIPE_SAVEGAME_VERSION;
+ header2.version = NGI_SAVEGAME_VERSION;
TimeDate curTime;
g_system->getTimeAndDate(curTime);
diff --git a/engines/ngi/statics.h b/engines/ngi/statics.h
index d8fd08b855..8955feb2dd 100644
--- a/engines/ngi/statics.h
+++ b/engines/ngi/statics.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef FULLPIPE_STATICS_H
-#define FULLPIPE_STATICS_H
+#ifndef NGI_STATICS_H
+#define NGI_STATICS_H
#include "ngi/gfx.h"
@@ -265,4 +265,4 @@ public:
} // End of namespace NGI
-#endif /* FULLPIPE_STATICS_H */
+#endif /* NGI_STATICS_H */
diff --git a/engines/ngi/utils.h b/engines/ngi/utils.h
index 236077437a..b931c46e4a 100644
--- a/engines/ngi/utils.h
+++ b/engines/ngi/utils.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef FULLPIPE_UTILS_H
-#define FULLPIPE_UTILS_H
+#ifndef NGI_UTILS_H
+#define NGI_UTILS_H
#include "common/hash-ptr.h"
#include "common/hash-str.h"
@@ -197,4 +197,4 @@ byte *transCyrillic(const Common::String &str);
} // End of namespace NGI
-#endif /* FULLPIPE_UTILS_H */
+#endif /* NGI_UTILS_H */
More information about the Scummvm-git-logs
mailing list