libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-26 22:38:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FULLPIPE: Rename engine to NGI (files)

Browse Source
This commit is contained in:
Eugene Sandulenko 2020-10-03 23:47:47 +02:00
parent 64f727ca3d
commit aef74baff1
92 changed files with 672 additions and 666 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
engines/fullpipe/module.mk
View File

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

10
engines/fullpipe/anihandler.cpp → engines/ngi/anihandler.cpp
View File

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

0
engines/fullpipe/anihandler.h → engines/ngi/anihandler.h
View File

10
engines/fullpipe/behavior.cpp → engines/ngi/behavior.cpp
View File

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

0
engines/fullpipe/behavior.h → engines/ngi/behavior.h
View File

2
engines/fullpipe/configure.engine → engines/ngi/configure.engine
View File

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

10
engines/fullpipe/console.cpp → engines/ngi/console.cpp
View File

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

0
engines/fullpipe/console.h → engines/ngi/console.h
View File

0
engines/fullpipe/constants.h → engines/ngi/constants.h
View File

7
engines/fullpipe/detection.cpp → engines/ngi/detection.cpp
View File

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

18
engines/fullpipe/floaters.cpp → engines/ngi/floaters.cpp
View File

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

0
engines/fullpipe/floaters.h → engines/ngi/floaters.h
View File

28
engines/fullpipe/fullpipe.cpp → engines/ngi/fullpipe.cpp
View File

@ -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() {

3
engines/fullpipe/fullpipe.h → engines/ngi/fullpipe.h
View File

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

18
engines/fullpipe/scenes/scene01.cpp → engines/ngi/fullpipe/scene01.cpp
View File

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

20
engines/fullpipe/scenes/scene02.cpp → engines/ngi/fullpipe/scene02.cpp
View File

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

18
engines/fullpipe/scenes/scene03.cpp → engines/ngi/fullpipe/scene03.cpp
View File

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

26
engines/fullpipe/scenes/scene04.cpp → engines/ngi/fullpipe/scene04.cpp
View File

@ -20,20 +20,20 @@
*
*/
#include "fullpipe/fullpipe.h"
#include "ngi/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/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"

24
engines/fullpipe/scenes/scene05.cpp → engines/ngi/fullpipe/scene05.cpp
View File

@ -20,19 +20,19 @@
*
*/
#include "fullpipe/fullpipe.h"
#include "ngi/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/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 {

26
engines/fullpipe/scenes/scene06.cpp → engines/ngi/fullpipe/scene06.cpp
View File

@ -20,20 +20,20 @@
*
*/
#include "fullpipe/fullpipe.h"
#include "ngi/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/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 {

20
engines/fullpipe/scenes/scene07.cpp → engines/ngi/fullpipe/scene07.cpp
View File

@ -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 "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/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 {

26
engines/fullpipe/scenes/scene08.cpp → engines/ngi/fullpipe/scene08.cpp
View File

@ -20,20 +20,20 @@
*
*/
#include "fullpipe/fullpipe.h"
#include "ngi/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/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 {

18
engines/fullpipe/scenes/scene09.cpp → engines/ngi/fullpipe/scene09.cpp
View File

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

18
engines/fullpipe/scenes/scene10.cpp → engines/ngi/fullpipe/scene10.cpp
View File

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

18
engines/fullpipe/scenes/scene11.cpp → engines/ngi/fullpipe/scene11.cpp
View File

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

22
engines/fullpipe/scenes/scene12.cpp → engines/ngi/fullpipe/scene12.cpp
View File

@ -20,18 +20,18 @@
*
*/
#include "fullpipe/fullpipe.h"
#include "ngi/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/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 {

18
engines/fullpipe/scenes/scene13.cpp → engines/ngi/fullpipe/scene13.cpp
View File

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

20
engines/fullpipe/scenes/scene14.cpp → engines/ngi/fullpipe/scene14.cpp
View File

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

18
engines/fullpipe/scenes/scene15.cpp → engines/ngi/fullpipe/scene15.cpp
View File

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

18
engines/fullpipe/scenes/scene16.cpp → engines/ngi/fullpipe/scene16.cpp
View File

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

20
engines/fullpipe/scenes/scene17.cpp → engines/ngi/fullpipe/scene17.cpp
View File

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

18
engines/fullpipe/scenes/scene18and19.cpp → engines/ngi/fullpipe/scene18and19.cpp
View File

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

20
engines/fullpipe/scenes/scene20.cpp → engines/ngi/fullpipe/scene20.cpp
View File

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

18
engines/fullpipe/scenes/scene21.cpp → engines/ngi/fullpipe/scene21.cpp
View File

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

18
engines/fullpipe/scenes/scene22.cpp → engines/ngi/fullpipe/scene22.cpp
View File

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

20
engines/fullpipe/scenes/scene23.cpp → engines/ngi/fullpipe/scene23.cpp
View File

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

18
engines/fullpipe/scenes/scene24.cpp → engines/ngi/fullpipe/scene24.cpp
View File

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

18
engines/fullpipe/scenes/scene25.cpp → engines/ngi/fullpipe/scene25.cpp
View File

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

18
engines/fullpipe/scenes/scene26.cpp → engines/ngi/fullpipe/scene26.cpp
View File

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

18
engines/fullpipe/scenes/scene27.cpp → engines/ngi/fullpipe/scene27.cpp
View File

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

20
engines/fullpipe/scenes/scene28.cpp → engines/ngi/fullpipe/scene28.cpp
View File

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

18
engines/fullpipe/scenes/scene29.cpp → engines/ngi/fullpipe/scene29.cpp
View File

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

18
engines/fullpipe/scenes/scene30.cpp → engines/ngi/fullpipe/scene30.cpp
View File

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

18
engines/fullpipe/scenes/scene31.cpp → engines/ngi/fullpipe/scene31.cpp
View File

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

18
engines/fullpipe/scenes/scene32.cpp → engines/ngi/fullpipe/scene32.cpp
View File

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

18
engines/fullpipe/scenes/scene33.cpp → engines/ngi/fullpipe/scene33.cpp
View File

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

20
engines/fullpipe/scenes/scene34.cpp → engines/ngi/fullpipe/scene34.cpp
View File

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

20
engines/fullpipe/scenes/scene35.cpp → engines/ngi/fullpipe/scene35.cpp
View File

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

18
engines/fullpipe/scenes/scene36.cpp → engines/ngi/fullpipe/scene36.cpp
View File

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

18
engines/fullpipe/scenes/scene37.cpp → engines/ngi/fullpipe/scene37.cpp
View File

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

18
engines/fullpipe/scenes/scene38.cpp → engines/ngi/fullpipe/scene38.cpp
View File

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

16
engines/fullpipe/scenes/sceneDbg.cpp → engines/ngi/fullpipe/sceneDbg.cpp
View File

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

20
engines/fullpipe/scenes/sceneFinal.cpp → engines/ngi/fullpipe/sceneFinal.cpp
View File

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

14
engines/fullpipe/scenes/sceneIntro.cpp → engines/ngi/fullpipe/sceneIntro.cpp
View File

@ -20,14 +20,14 @@
*
*/
#include "fullpipe/fullpipe.h"
#include "ngi/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/constants.h"
#include "ngi/gameloader.h"
#include "ngi/motion.h"
#include "ngi/scenes.h"
#include "ngi/modal.h"
#include "ngi/statics.h"
namespace Fullpipe {

14
engines/fullpipe/scenes/sceneIntroDemo.cpp → engines/ngi/fullpipe/sceneIntroDemo.cpp
View File

@ -20,14 +20,14 @@
*
*/
#include "fullpipe/fullpipe.h"
#include "ngi/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/constants.h"
#include "ngi/gameloader.h"
#include "ngi/motion.h"
#include "ngi/scenes.h"
#include "ngi/modal.h"
#include "ngi/statics.h"
namespace Fullpipe {

20
engines/fullpipe/gameloader.cpp → engines/ngi/gameloader.cpp
View File

@ -20,17 +20,17 @@
*
*/
#include "fullpipe/fullpipe.h"
#include "ngi/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/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 {

6
engines/fullpipe/gameloader.h → engines/ngi/gameloader.h
View File

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

14
engines/fullpipe/gfx.cpp → engines/ngi/gfx.cpp
View File

@ -20,14 +20,14 @@
*
*/
#include "fullpipe/fullpipe.h"
#include "ngi/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/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"

0
engines/fullpipe/gfx.h → engines/ngi/gfx.h
View File

12
engines/fullpipe/init.cpp → engines/ngi/init.cpp
View File

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

18
engines/fullpipe/input.cpp → engines/ngi/input.cpp
View File

@ -20,16 +20,16 @@
*
*/
#include "fullpipe/fullpipe.h"
#include "ngi/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/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 {

0
engines/fullpipe/input.h → engines/ngi/input.h
View File

10
engines/fullpipe/interaction.cpp → engines/ngi/interaction.cpp
View File

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

2
engines/fullpipe/interaction.h → engines/ngi/interaction.h
View File

@ -23,7 +23,7 @@
#ifndef FULLPIPE_INTERACTION_H
#define FULLPIPE_INTERACTION_H
#include "fullpipe/utils.h"
#include "ngi/utils.h"
namespace Fullpipe {

12
engines/fullpipe/inventory.cpp → engines/ngi/inventory.cpp
View File

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

0
engines/fullpipe/inventory.h → engines/ngi/inventory.h
View File

18
engines/fullpipe/lift.cpp → engines/ngi/lift.cpp
View File

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

16
engines/fullpipe/messagehandlers.cpp → engines/ngi/messagehandlers.cpp
View File

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

12
engines/fullpipe/messages.cpp → engines/ngi/messages.cpp
View File

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

10
engines/fullpipe/messages.h → engines/ngi/messages.h
View File

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

16
engines/fullpipe/metaengine.cpp → engines/ngi/metaengine.cpp
View File

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

18
engines/fullpipe/modal.cpp → engines/ngi/modal.cpp
View File

@ -20,16 +20,16 @@
*
*/
#include "fullpipe/fullpipe.h"
#include "ngi/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/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"

0
engines/fullpipe/modal.h → engines/ngi/modal.h
View File

80
engines/ngi/module.mk Normal file
View File

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

10
engines/fullpipe/motion.cpp → engines/ngi/motion.cpp
View File

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

2
engines/fullpipe/motion.h → engines/ngi/motion.h
View File

@ -23,7 +23,7 @@
#ifndef FULLPIPE_MOTION_H
#define FULLPIPE_MOTION_H
#include "fullpipe/anihandler.h"
#include "ngi/anihandler.h"
namespace Fullpipe {

4
engines/fullpipe/ngiarchive.cpp → engines/ngi/ngiarchive.cpp
View File

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

0
engines/fullpipe/ngiarchive.h → engines/ngi/ngiarchive.h
View File

0
engines/fullpipe/objectnames.h → engines/ngi/objectnames.h
View File

2
engines/fullpipe/objects.h → engines/ngi/objects.h
View File

@ -24,7 +24,7 @@
#define FULLPIPE_OBJECTS_H
#include "common/ptr.h"
#include "fullpipe/utils.h"
#include "ngi/utils.h"
namespace Fullpipe {

14
engines/fullpipe/scene.cpp → engines/ngi/scene.cpp
View File

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

2
engines/fullpipe/scene.h → engines/ngi/scene.h
View File

@ -24,7 +24,7 @@
#define FULLPIPE_SCENE_H
#include "common/ptr.h"
#include "fullpipe/gfx.h"
#include "ngi/gfx.h"
namespace Fullpipe {

24
engines/fullpipe/scenes.cpp → engines/ngi/scenes.cpp
View File

@ -20,20 +20,20 @@
*
*/
#include "fullpipe/fullpipe.h"
#include "ngi/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 "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 "fullpipe/constants.h"
#include "fullpipe/objectnames.h"
#include "fullpipe/scenes.h"
#include "fullpipe/interaction.h"
#include "ngi/constants.h"
#include "ngi/objectnames.h"
#include "ngi/scenes.h"
#include "ngi/interaction.h"
namespace Fullpipe {

0
engines/fullpipe/scenes.h → engines/ngi/scenes.h
View File

14
engines/fullpipe/sound.cpp → engines/ngi/sound.cpp
View File

@ -20,14 +20,14 @@
*
*/
#include "fullpipe/fullpipe.h"
#include "ngi/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/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"

0
engines/fullpipe/sound.h → engines/ngi/sound.h
View File

14
engines/fullpipe/stateloader.cpp → engines/ngi/stateloader.cpp
View File

@ -20,14 +20,14 @@
*
*/
#include "fullpipe/fullpipe.h"
#include "ngi/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/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"

6
engines/fullpipe/statesaver.cpp → engines/ngi/statesaver.cpp
View File

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

18
engines/fullpipe/statics.cpp → engines/ngi/statics.cpp
View File

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

2
engines/fullpipe/statics.h → engines/ngi/statics.h
View File

@ -23,7 +23,7 @@
#ifndef FULLPIPE_STATICS_H
#define FULLPIPE_STATICS_H
#include "fullpipe/gfx.h"
#include "ngi/gfx.h"
namespace Fullpipe {

12
engines/fullpipe/utils.cpp → engines/ngi/utils.cpp
View File

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

0
engines/fullpipe/utils.h → engines/ngi/utils.h
View File