From a70a5cb5b34a87bb96d726590a71b18767b7deb7 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko <sev@scummvm.org>
Date: Sun, 4 Oct 2020 00:02:37 +0200
Subject: [PATCH] NGI: Rename guard defines

---
 engines/ngi/anihandler.h   | 6 +++---
 engines/ngi/behavior.h     | 6 +++---
 engines/ngi/console.h      | 6 +++---
 engines/ngi/constants.h    | 6 +++---
 engines/ngi/floaters.h     | 6 +++---
 engines/ngi/gameloader.h   | 8 ++++----
 engines/ngi/gfx.h          | 6 +++---
 engines/ngi/input.h        | 6 +++---
 engines/ngi/interaction.h  | 6 +++---
 engines/ngi/inventory.h    | 6 +++---
 engines/ngi/messages.h     | 6 +++---
 engines/ngi/modal.h        | 6 +++---
 engines/ngi/motion.h       | 6 +++---
 engines/ngi/ngi.h          | 6 +++---
 engines/ngi/ngiarchive.h   | 4 ++--
 engines/ngi/objectnames.h  | 6 +++---
 engines/ngi/objects.h      | 6 +++---
 engines/ngi/scene.h        | 6 +++---
 engines/ngi/scenes.h       | 6 +++---
 engines/ngi/sound.h        | 6 +++---
 engines/ngi/statesaver.cpp | 2 +-
 engines/ngi/statics.h      | 6 +++---
 engines/ngi/utils.h        | 6 +++---
 23 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/engines/ngi/anihandler.h b/engines/ngi/anihandler.h
index 5dc88e66ab1..ddbd6f73cf8 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 5a029039422..ed4e5801b8d 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 6e4941ba0c9..2d9b626a91a 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 96aca1291b4..c0767db0cf3 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 3fe0666c6ba..4c8b473c437 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 3dd53ef453b..c60d3c0be86 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 91290af4e73..e0961045579 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 7a20561b8d3..e9256375c97 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 2430f82cb9d..ca44bde2bca 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 46c782d7ae9..6fbe7ba7e72 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 75cc1370f03..fa49b338e33 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 6c8b502a4b6..055d670a765 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 eea6e66acec..99eb9f3fbd3 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 820ac5a55a7..deab1a31d3d 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 f3f5d30b5bd..1998ec45f56 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 8bb94ecc767..3bd79b2e291 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 4190a80fdee..a78643748f7 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 9d0c179e56d..3dc1f59dde3 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 2854e1e75f6..56203b4973e 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 74c5853fb46..25e48c56403 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 94236442dad..9d27c80989b 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 d8fd08b8553..8955feb2dd3 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 236077437ac..b931c46e4ab 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 */