[Scummvm-git-logs] scummvm master -> 9fae57889e8bf6337ee2112cb552611503c36209
bluegr
noreply at scummvm.org
Thu Sep 17 23:52:20 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
9fae57889e ALL: add missing include guards
Commit: 9fae57889e8bf6337ee2112cb552611503c36209
https://github.com/scummvm/scummvm/commit/9fae57889e8bf6337ee2112cb552611503c36209
Author: Michael Kuerbis (michael_kuerbis at web.de)
Date: 2026-09-18T02:52:15+03:00
Commit Message:
ALL: add missing include guards
Assisted-by: Copilot:GPT-5-Mini Resharper clang-tidy
Changed paths:
backends/imgui/imgui_utils.h
common/compression/vise.h
engines/agi/wagparser.h
engines/agos/intern_detection.h
engines/ags/engine/ac/route_finder_jps.h
engines/ags/engine/platform/base/sys_main.h
engines/ags/game_scanner.h
engines/bagel/hodjnpodj/battlefish/init.h
engines/bagel/hodjnpodj/hnplibs/stdafx.h
engines/bagel/hodjnpodj/metagame/bgen/stdafx.h
engines/director/blank-score.h
engines/director/graphics-data.h
engines/director/palette-fade.h
engines/freescape/games/castle/castle.h
engines/freescape/games/dark/dark.h
engines/freescape/games/driller/c64.music.h
engines/freescape/games/driller/driller.h
engines/freescape/games/eclipse/eclipse.h
engines/glk/agt/exec.h
engines/glk/agt/interp.h
engines/glk/jacl/constants.h
engines/glk/jacl/language.h
engines/glk/jacl/prototypes.h
engines/glk/jacl/types.h
engines/glk/jacl/version.h
engines/groovie/lzss.h
engines/hadesch/rooms/monster.h
engines/mm/mm1/gfx/bitmap_font.h
engines/prince/curve_values.h
engines/prince/hero_set.h
engines/prince/musNum.h
engines/prince/option_text.h
engines/prince/variatxt.h
engines/queen/midiadlib.h
engines/saga/ite8.h
engines/saga/shared_detection_defines.h
engines/saga/small8.h
engines/sludge/functionlist.h
engines/sludge/keymapper_tables.h
engines/sludge/version.h
engines/sword25/gfx/timedrenderobject.h
engines/teenagent/actor.h
engines/ultima/nuvie/sound/adplug/mid.h
engines/ultima/nuvie/sound/adplug/silent_opl.h
engines/ultima/nuvie/usecode/u6_object_types.h
engines/wintermute/ext/scene_achievements_tables.h
engines/wintermute/keymapper_tables.h
engines/zvision/file/file_manager.h
engines/zvision/sound/volume_manager.h
graphics/blit/blit-alpha.h
graphics/pm5544.h
video/4xm_decoder.h
video/4xm_utils.h
diff --git a/backends/imgui/imgui_utils.h b/backends/imgui/imgui_utils.h
index ca9f8431280..10940aa681e 100644
--- a/backends/imgui/imgui_utils.h
+++ b/backends/imgui/imgui_utils.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef IMGUI_IMGUI_UTILS_H
+#define IMGUI_IMGUI_UTILS_H
+
#include "backends/imgui/IconsMaterialSymbols.h"
#ifndef IMGUI_DEFINE_MATH_OPERATORS
@@ -45,3 +48,5 @@ void Palette(const Graphics::Palette &palette);
bool toggleButton(const char *label, bool *p_value, bool inverse = false);
} // namespace ImGuiEx
+
+#endif // IMGUI_IMGUI_UTILS_H
diff --git a/common/compression/vise.h b/common/compression/vise.h
index 355f32abe95..00d1dee1710 100644
--- a/common/compression/vise.h
+++ b/common/compression/vise.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef COMPRESSION_VISE_H
+#define COMPRESSION_VISE_H
+
/**
* @file
* Installer VISE decompressor used in engines:
@@ -33,3 +36,5 @@ namespace Common {
Common::Archive *createMacVISEArchive(Common::SeekableReadStream *stream);
} // End of namespace Common
+
+#endif // COMPRESSION_VISE_H
diff --git a/engines/agi/wagparser.h b/engines/agi/wagparser.h
index d1e7a3f9d6b..dca4b9971ab 100644
--- a/engines/agi/wagparser.h
+++ b/engines/agi/wagparser.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef AGI_WAGPARSER_H
+#define AGI_WAGPARSER_H
+
namespace Agi {
/**
@@ -305,3 +308,5 @@ protected:
};
} // End of namespace Agi
+
+#endif // AGI_WAGPARSER_H
diff --git a/engines/agos/intern_detection.h b/engines/agos/intern_detection.h
index 6cc5170ae3a..2084464f3bb 100644
--- a/engines/agos/intern_detection.h
+++ b/engines/agos/intern_detection.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef AGOS_INTERN_DETECTION_H
+#define AGOS_INTERN_DETECTION_H
+
// Game detection - related enums, taken from agos/intern.h
namespace AGOS {
@@ -81,3 +84,5 @@ enum GameFileTypes {
} // End of namespace AGOS
+
+#endif // AGOS_INTERN_DETECTION_H
diff --git a/engines/ags/engine/ac/route_finder_jps.h b/engines/ags/engine/ac/route_finder_jps.h
index 03a63321538..6752a1bea5c 100644
--- a/engines/ags/engine/ac/route_finder_jps.h
+++ b/engines/ags/engine/ac/route_finder_jps.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef AGS_ROUTE_FINDER_JPS_H
+#define AGS_ROUTE_FINDER_JPS_H
+
#include "common/std/queue.h"
#include "common/std/vector.h"
#include "common/std/algorithm.h"
@@ -192,3 +195,5 @@ inline bool Navigation::Walkable(int x, int y) const {
}
} // namespace AGS3
+
+#endif // AGS_ROUTE_FINDER_JPS_H
diff --git a/engines/ags/engine/platform/base/sys_main.h b/engines/ags/engine/platform/base/sys_main.h
index 80e0e0912a6..e808d02c253 100644
--- a/engines/ags/engine/platform/base/sys_main.h
+++ b/engines/ags/engine/platform/base/sys_main.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef AGS_SYS_MAIN_H
+#define AGS_SYS_MAIN_H
+
//=============================================================================
//
// The main backend interface.
@@ -100,3 +103,5 @@ void *sys_win_get_window();
#endif
} // namespace AGS3
+
+#endif // AGS_SYS_MAIN_H
diff --git a/engines/ags/game_scanner.h b/engines/ags/game_scanner.h
index 3c6953cd20d..b176fd5ad1a 100644
--- a/engines/ags/game_scanner.h
+++ b/engines/ags/game_scanner.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef AGS_GAME_SCANNER_H
+#define AGS_GAME_SCANNER_H
+
#include "common/array.h"
#include "common/fs.h"
@@ -73,3 +76,5 @@ public:
#endif
} // namespace AGS3
+
+#endif // AGS_GAME_SCANNER_H
diff --git a/engines/bagel/hodjnpodj/battlefish/init.h b/engines/bagel/hodjnpodj/battlefish/init.h
index 3031afdcd0f..d39ea867598 100644
--- a/engines/bagel/hodjnpodj/battlefish/init.h
+++ b/engines/bagel/hodjnpodj/battlefish/init.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef BAGEL_INIT_H
+#define BAGEL_INIT_H
+
#include "bagel/afxwin.h"
#include "bagel/hodjnpodj/hnplibs/gamedll.h"
@@ -31,3 +34,5 @@ extern HWND FAR PASCAL RunBFish(HWND hParentWnd, LPGAMESTRUCT lpGameInfo);
} // namespace Battlefish
} // namespace HodjNPodj
} // namespace Bagel
+
+#endif // BAGEL_INIT_H
diff --git a/engines/bagel/hodjnpodj/hnplibs/stdafx.h b/engines/bagel/hodjnpodj/hnplibs/stdafx.h
index 186ed1be817..0a6249333a1 100644
--- a/engines/bagel/hodjnpodj/hnplibs/stdafx.h
+++ b/engines/bagel/hodjnpodj/hnplibs/stdafx.h
@@ -19,5 +19,10 @@
*
*/
+#ifndef BAGEL_HNPLIBS_STDAFX_H
+#define BAGEL_HNPLIBS_STDAFX_H
+
#include "bagel/afxwin.h"
//
+
+#endif // BAGEL_HNPLIBS_STDAFX_H
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/stdafx.h b/engines/bagel/hodjnpodj/metagame/bgen/stdafx.h
index 03834b114c7..34875f8603b 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/stdafx.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/stdafx.h
@@ -19,4 +19,9 @@
*
*/
+#ifndef BAGEL_BGEN_STDAFX_H
+#define BAGEL_BGEN_STDAFX_H
+
#include "bagel/afxwin.h"
+
+#endif // BAGEL_BGEN_STDAFX_H
diff --git a/engines/director/blank-score.h b/engines/director/blank-score.h
index 55a40101d6d..a37fed88586 100644
--- a/engines/director/blank-score.h
+++ b/engines/director/blank-score.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef DIRECTOR_BLANK_SCORE_H
+#define DIRECTOR_BLANK_SCORE_H
+
static const byte kBlankScoreD2[] = {
0x00, 0x00, 0x00, 0x06, // _framesStreamSize
0x00, 0x02 // frame with empty channel information
@@ -33,3 +36,5 @@ static const byte kBlankScoreD4[] = {
0x00, 0x00, // skipped
0x00, 0x02 // frame with empty channel information
};
+
+#endif // DIRECTOR_BLANK_SCORE_H
diff --git a/engines/director/graphics-data.h b/engines/director/graphics-data.h
index c48a72affc7..a2075f5f4a7 100644
--- a/engines/director/graphics-data.h
+++ b/engines/director/graphics-data.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef DIRECTOR_GRAPHICS_DATA_H
+#define DIRECTOR_GRAPHICS_DATA_H
+
// The following builtin palettes are extracted from the resource forks
// in the Director for Windows 4 projector executable.
@@ -1111,3 +1114,5 @@ struct TileStruct {
{ 16, 16, tile7, ARRAYSIZE(tile7) },
{ 16, 16, tile8, ARRAYSIZE(tile8) },
};
+
+#endif // DIRECTOR_GRAPHICS_DATA_H
diff --git a/engines/director/palette-fade.h b/engines/director/palette-fade.h
index 76f687f8523..33ca8c16e56 100644
--- a/engines/director/palette-fade.h
+++ b/engines/director/palette-fade.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef DIRECTOR_PALETTE_FADE_H
+#define DIRECTOR_PALETTE_FADE_H
+
static const byte kWhitePalette[768] = {
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, // 0 (0x00)
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, // 4 (0x04)
@@ -170,3 +173,5 @@ static const int kFadeColorFramesD5[30] = {
};
static const int kFadeColorWait = 30;
+
+#endif // DIRECTOR_PALETTE_FADE_H
diff --git a/engines/freescape/games/castle/castle.h b/engines/freescape/games/castle/castle.h
index 056fdd026f1..9de76ce46a3 100644
--- a/engines/freescape/games/castle/castle.h
+++ b/engines/freescape/games/castle/castle.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef FREESCAPE_CASTLE_H
+#define FREESCAPE_CASTLE_H
+
namespace Freescape {
// Offsets of the assets inside a Castle Master Amiga game image
@@ -284,3 +287,5 @@ private:
};
}
+
+#endif // FREESCAPE_CASTLE_H
diff --git a/engines/freescape/games/dark/dark.h b/engines/freescape/games/dark/dark.h
index bc19f84b180..353cbc06ee5 100644
--- a/engines/freescape/games/dark/dark.h
+++ b/engines/freescape/games/dark/dark.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef FREESCAPE_DARK_H
+#define FREESCAPE_DARK_H
+
#include "audio/mixer.h"
#include "common/array.h"
#include "freescape/music.h"
@@ -189,3 +192,5 @@ private:
};
}
+
+#endif // FREESCAPE_DARK_H
diff --git a/engines/freescape/games/driller/c64.music.h b/engines/freescape/games/driller/c64.music.h
index 745e35f0992..1829cbe9338 100644
--- a/engines/freescape/games/driller/c64.music.h
+++ b/engines/freescape/games/driller/c64.music.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef FREESCAPE_C64_MUSIC_H
+#define FREESCAPE_C64_MUSIC_H
+
#include "audio/sid.h"
#include "common/debug.h"
#include "freescape/music.h"
@@ -243,3 +246,5 @@ private:
};
} // namespace Freescape
+
+#endif // FREESCAPE_C64_MUSIC_H
diff --git a/engines/freescape/games/driller/driller.h b/engines/freescape/games/driller/driller.h
index c7708995e87..a07cd764f41 100644
--- a/engines/freescape/games/driller/driller.h
+++ b/engines/freescape/games/driller/driller.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef FREESCAPE_DRILLER_H
+#define FREESCAPE_DRILLER_H
+
#include "audio/audiostream.h"
#include "audio/mixer.h"
@@ -162,3 +165,5 @@ enum DrillerReleaseFlags {
};
}
+
+#endif // FREESCAPE_DRILLER_H
diff --git a/engines/freescape/games/eclipse/eclipse.h b/engines/freescape/games/eclipse/eclipse.h
index 9c8932dfc17..4808823eb80 100644
--- a/engines/freescape/games/eclipse/eclipse.h
+++ b/engines/freescape/games/eclipse/eclipse.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef FREESCAPE_ECLIPSE_H
+#define FREESCAPE_ECLIPSE_H
+
#include "common/file.h"
#include "freescape/music.h"
@@ -197,3 +200,5 @@ private:
};
}
+
+#endif // FREESCAPE_ECLIPSE_H
diff --git a/engines/glk/agt/exec.h b/engines/glk/agt/exec.h
index 7985a687f82..d51468aa44e 100644
--- a/engines/glk/agt/exec.h
+++ b/engines/glk/agt/exec.h
@@ -19,6 +19,8 @@
*
*/
+#ifndef GLK_AGT_EXEC_H
+#define GLK_AGT_EXEC_H
namespace Glk {
namespace AGT {
@@ -269,3 +271,5 @@ extern rbool it_locked(integer obj, word noun);
} // End of namespace AGT
} // End of namespace Glk
+
+#endif // GLK_AGT_EXEC_H
diff --git a/engines/glk/agt/interp.h b/engines/glk/agt/interp.h
index 8a19f161d4b..c3a645c9ea5 100644
--- a/engines/glk/agt/interp.h
+++ b/engines/glk/agt/interp.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef GLK_AGT_INTERP_H
+#define GLK_AGT_INTERP_H
+
#include "common/file.h"
#ifndef GLK_AGT_INTERP
@@ -537,3 +540,5 @@ extern void agt_newgame(fc_type fc);
} // End of namespace Glk
#endif
+
+#endif // GLK_AGT_INTERP_H
diff --git a/engines/glk/jacl/constants.h b/engines/glk/jacl/constants.h
index 2d3fa677204..4df21cdafda 100644
--- a/engines/glk/jacl/constants.h
+++ b/engines/glk/jacl/constants.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef GLK_JACL_CONSTANTS_H
+#define GLK_JACL_CONSTANTS_H
+
namespace Glk {
namespace JACL {
@@ -181,3 +184,5 @@ namespace JACL {
} // End of namespace JACL
} // End of namespace Glk
+
+#endif // GLK_JACL_CONSTANTS_H
diff --git a/engines/glk/jacl/language.h b/engines/glk/jacl/language.h
index 4a59225b8ac..c2980a353d8 100644
--- a/engines/glk/jacl/language.h
+++ b/engines/glk/jacl/language.h
@@ -18,6 +18,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
+
+#ifndef GLK_JACL_LANGUAGE_H
+#define GLK_JACL_LANGUAGE_H
+
namespace Glk {
namespace JACL {
@@ -568,3 +572,5 @@ namespace JACL {
} // End of namespace JACL
} // End of namespace Glk
+
+#endif // GLK_JACL_LANGUAGE_H
diff --git a/engines/glk/jacl/prototypes.h b/engines/glk/jacl/prototypes.h
index dd840f72b11..0d0c5b06e5f 100644
--- a/engines/glk/jacl/prototypes.h
+++ b/engines/glk/jacl/prototypes.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef GLK_JACL_PROTOTYPES_H
+#define GLK_JACL_PROTOTYPES_H
+
namespace Glk {
namespace JACL {
@@ -198,3 +201,5 @@ extern void jacl_sleep(unsigned int mseconds);
} // End of namespace JACL
} // End of namespace Glk
+
+#endif // GLK_JACL_PROTOTYPES_H
diff --git a/engines/glk/jacl/types.h b/engines/glk/jacl/types.h
index 5f81b5ba10b..16b184b192c 100644
--- a/engines/glk/jacl/types.h
+++ b/engines/glk/jacl/types.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef GLK_JACL_TYPES_H
+#define GLK_JACL_TYPES_H
+
#include "glk/jacl/constants.h"
#include "common/file.h"
@@ -221,3 +224,5 @@ public:
} // End of namespace JACL
} // End of namespace Glk
+
+#endif // GLK_JACL_TYPES_H
diff --git a/engines/glk/jacl/version.h b/engines/glk/jacl/version.h
index 3afebc2660c..7548c97d17a 100644
--- a/engines/glk/jacl/version.h
+++ b/engines/glk/jacl/version.h
@@ -19,7 +19,12 @@
*
*/
+#ifndef GLK_JACL_VERSION_H
+#define GLK_JACL_VERSION_H
+
#define J_VERSION 2
#define J_RELEASE 9
#define J_BUILD 0
#define INTERPRETER_VERSION 209
+
+#endif // GLK_JACL_VERSION_H
diff --git a/engines/groovie/lzss.h b/engines/groovie/lzss.h
index 49c2f94476c..cbf2ccaed7c 100644
--- a/engines/groovie/lzss.h
+++ b/engines/groovie/lzss.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef GROOVIE_LZSS_H
+#define GROOVIE_LZSS_H
+
#include "common/stream.h"
namespace Groovie {
@@ -40,3 +43,5 @@ public:
};
} // End of Groovie namespace
+
+#endif // GROOVIE_LZSS_H
diff --git a/engines/hadesch/rooms/monster.h b/engines/hadesch/rooms/monster.h
index d3686f278df..368ac9029bb 100644
--- a/engines/hadesch/rooms/monster.h
+++ b/engines/hadesch/rooms/monster.h
@@ -20,6 +20,10 @@
* Copyright 2020 Google
*
*/
+
+#ifndef HADESCH_MONSTER_H
+#define HADESCH_MONSTER_H
+
namespace Hadesch {
enum {
@@ -203,3 +207,5 @@ private:
};
}
+
+#endif // HADESCH_MONSTER_H
diff --git a/engines/mm/mm1/gfx/bitmap_font.h b/engines/mm/mm1/gfx/bitmap_font.h
index 13457a08a13..5960f7d97ed 100644
--- a/engines/mm/mm1/gfx/bitmap_font.h
+++ b/engines/mm/mm1/gfx/bitmap_font.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef MM_BITMAP_FONT_H
+#define MM_BITMAP_FONT_H
+
#include "mm/shared/utils/bitmap_font.h"
namespace MM {
@@ -45,3 +48,5 @@ public:
} // namespace Gfx
} // namespace MM1
} // namespace MM
+
+#endif // MM_BITMAP_FONT_H
diff --git a/engines/prince/curve_values.h b/engines/prince/curve_values.h
index 927c1448c6d..bb8130ef3a0 100644
--- a/engines/prince/curve_values.h
+++ b/engines/prince/curve_values.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef PRINCE_CURVE_VALUES_H
+#define PRINCE_CURVE_VALUES_H
+
namespace Prince {
const int curveValues[17][4] = {
@@ -42,3 +45,5 @@ const int curveValues[17][4] = {
};
} // End of namespace Prince
+
+#endif // PRINCE_CURVE_VALUES_H
diff --git a/engines/prince/hero_set.h b/engines/prince/hero_set.h
index 914c955663a..7b320c29c57 100644
--- a/engines/prince/hero_set.h
+++ b/engines/prince/hero_set.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef PRINCE_HERO_SET_H
+#define PRINCE_HERO_SET_H
+
#include "common/scummsys.h"
namespace Prince {
@@ -241,3 +244,5 @@ const HeroSetAnimNames *heroSetTable[7] = {
};
} // End of namespace Prince
+
+#endif // PRINCE_HERO_SET_H
diff --git a/engines/prince/musNum.h b/engines/prince/musNum.h
index a94d95b54f3..2419d566699 100644
--- a/engines/prince/musNum.h
+++ b/engines/prince/musNum.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef PRINCE_MUSNUM_H
+#define PRINCE_MUSNUM_H
+
namespace Prince {
enum RoomMus {
@@ -84,3 +87,5 @@ enum RoomMus {
};
} // End of namespace Prince
+
+#endif // PRINCE_MUSNUM_H
diff --git a/engines/prince/option_text.h b/engines/prince/option_text.h
index 0da71bad06c..81fc98a7c6d 100644
--- a/engines/prince/option_text.h
+++ b/engines/prince/option_text.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef PRINCE_OPTION_TEXT_H
+#define PRINCE_OPTION_TEXT_H
+
namespace Prince {
// PL - Mazovia coding
@@ -158,3 +161,5 @@ const char *optionsTextHE[] = {
};
} // End of namespace Prince
+
+#endif // PRINCE_OPTION_TEXT_H
diff --git a/engines/prince/variatxt.h b/engines/prince/variatxt.h
index fe198a2b2d1..574679d986d 100644
--- a/engines/prince/variatxt.h
+++ b/engines/prince/variatxt.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef PRINCE_VARIATXT_H
+#define PRINCE_VARIATXT_H
+
#include "common/stream.h"
namespace Prince {
@@ -37,3 +40,5 @@ private:
};
} // End of namespace Prince
+
+#endif // PRINCE_VARIATXT_H
diff --git a/engines/queen/midiadlib.h b/engines/queen/midiadlib.h
index b66bfc9abc8..4a2505d5bd4 100644
--- a/engines/queen/midiadlib.h
+++ b/engines/queen/midiadlib.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef QUEEN_MIDIADLIB_H
+#define QUEEN_MIDIADLIB_H
+
#include "audio/fmopl.h"
#include "audio/mididrv.h"
@@ -125,3 +128,5 @@ private:
};
} // End of namespace Queen
+
+#endif // QUEEN_MIDIADLIB_H
diff --git a/engines/saga/ite8.h b/engines/saga/ite8.h
index ecaa499f6ba..63299db852f 100644
--- a/engines/saga/ite8.h
+++ b/engines/saga/ite8.h
@@ -1,3 +1,6 @@
+#ifndef SAGA_ITE8_H
+#define SAGA_ITE8_H
+
static byte font_ite8[] = {
0x00, 0x08, 0x00, 0x07, 0x00, 0xbc, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -349,3 +352,5 @@ static byte font_ite8[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0xf0, 0xf0, 0x00,
};
+
+#endif // SAGA_ITE8_H
diff --git a/engines/saga/shared_detection_defines.h b/engines/saga/shared_detection_defines.h
index fed4e2d9e19..655784faf74 100644
--- a/engines/saga/shared_detection_defines.h
+++ b/engines/saga/shared_detection_defines.h
@@ -19,8 +19,13 @@
*
*/
+#ifndef SAGA_SHARED_DETECTION_DEFINES_H
+#define SAGA_SHARED_DETECTION_DEFINES_H
+
// Default scenes
#define ITE_DEFAULT_SCENE 32
#define IHNM_DEFAULT_SCENE 151
#define ITEDEMO_DEFAULT_SCENE 68
#define IHNMDEMO_DEFAULT_SCENE 144
+
+#endif // SAGA_SHARED_DETECTION_DEFINES_H
diff --git a/engines/saga/small8.h b/engines/saga/small8.h
index ca385ad5578..77ad5640753 100644
--- a/engines/saga/small8.h
+++ b/engines/saga/small8.h
@@ -1,3 +1,6 @@
+#ifndef SAGA_SMALL8_H
+#define SAGA_SMALL8_H
+
static byte font_small8[] = {
0x00, 0x08, 0x00, 0x07, 0x00, 0xa0, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -321,3 +324,5 @@ static byte font_small8[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0,
};
+
+#endif // SAGA_SMALL8_H
diff --git a/engines/sludge/functionlist.h b/engines/sludge/functionlist.h
index 3d6d201cca3..3d81eaafcb2 100644
--- a/engines/sludge/functionlist.h
+++ b/engines/sludge/functionlist.h
@@ -18,6 +18,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
+
+#ifndef SLUDGE_FUNCTIONLIST_H
+#define SLUDGE_FUNCTIONLIST_H
+
/*
This is the list of the built in functions
@@ -203,3 +207,5 @@ static builtInFunctionData builtInFunctionArray[] = {
const static int NUM_FUNCS = ARRAYSIZE(builtInFunctionArray);
} // End of namespace Sludge
+
+#endif // SLUDGE_FUNCTIONLIST_H
diff --git a/engines/sludge/keymapper_tables.h b/engines/sludge/keymapper_tables.h
index 2903f509b45..551c323cb87 100644
--- a/engines/sludge/keymapper_tables.h
+++ b/engines/sludge/keymapper_tables.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef SLUDGE_KEYMAPPER_TABLES_H
+#define SLUDGE_KEYMAPPER_TABLES_H
+
#include "backends/keymapper/action.h"
#include "backends/keymapper/keymapper.h"
#include "backends/keymapper/standard-actions.h"
@@ -601,3 +604,5 @@ inline Common::KeymapArray getSludgeKeymaps(const char *target, const Common::St
}
} // End of namespace Sludge
+
+#endif // SLUDGE_KEYMAPPER_TABLES_H
diff --git a/engines/sludge/version.h b/engines/sludge/version.h
index 1bd7fdd3493..a1cc270871a 100644
--- a/engines/sludge/version.h
+++ b/engines/sludge/version.h
@@ -18,6 +18,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
+
+#ifndef SLUDGE_VERSION_H
+#define SLUDGE_VERSION_H
+
#define MAJOR_VERSION 2
#define MINOR_VERSION 2
#define RELEASE_VERSION 1
@@ -35,3 +39,5 @@ namespace Sludge {
extern int gameVersion;
} // End of namespace Sludge
+
+#endif // SLUDGE_VERSION_H
diff --git a/engines/sword25/gfx/timedrenderobject.h b/engines/sword25/gfx/timedrenderobject.h
index b6dab30804c..b1efe0e709c 100644
--- a/engines/sword25/gfx/timedrenderobject.h
+++ b/engines/sword25/gfx/timedrenderobject.h
@@ -28,6 +28,9 @@
*
*/
+#ifndef SWORD25_TIMEDRENDEROBJECT_H
+#define SWORD25_TIMEDRENDEROBJECT_H
+
#include "sword25/kernel/common.h"
#include "sword25/gfx/renderobject.h"
@@ -53,3 +56,5 @@ public:
};
} // End of namespace Sword25
+
+#endif // SWORD25_TIMEDRENDEROBJECT_H
diff --git a/engines/teenagent/actor.h b/engines/teenagent/actor.h
index ba7d5dbfbd6..468b825eefa 100644
--- a/engines/teenagent/actor.h
+++ b/engines/teenagent/actor.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef TEENAGENT_ACTOR_H
+#define TEENAGENT_ACTOR_H
+
#include "teenagent/animation.h"
#include "common/rect.h"
@@ -45,3 +48,5 @@ public:
};
} // End of namespace TeenAgent
+
+#endif // TEENAGENT_ACTOR_H
diff --git a/engines/ultima/nuvie/sound/adplug/mid.h b/engines/ultima/nuvie/sound/adplug/mid.h
index 615ce38e0d1..ad4861d9574 100644
--- a/engines/ultima/nuvie/sound/adplug/mid.h
+++ b/engines/ultima/nuvie/sound/adplug/mid.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef ULTIMA_MID_H
+#define ULTIMA_MID_H
+
#include "ultima/nuvie/sound/adplug/adplug_player.h"
namespace Ultima {
@@ -113,3 +116,5 @@ public:
} // End of namespace Nuvie
} // End of namespace Ultima
+
+#endif // ULTIMA_MID_H
diff --git a/engines/ultima/nuvie/sound/adplug/silent_opl.h b/engines/ultima/nuvie/sound/adplug/silent_opl.h
index d79e5bd9f4c..d42a69fa121 100644
--- a/engines/ultima/nuvie/sound/adplug/silent_opl.h
+++ b/engines/ultima/nuvie/sound/adplug/silent_opl.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef ULTIMA_SILENT_OPL_H
+#define ULTIMA_SILENT_OPL_H
+
#include "ultima/nuvie/sound/adplug/opl.h"
namespace Ultima {
@@ -32,3 +35,5 @@ public:
} // End of namespace Nuvie
} // End of namespace Ultima
+
+#endif // ULTIMA_SILENT_OPL_H
diff --git a/engines/ultima/nuvie/usecode/u6_object_types.h b/engines/ultima/nuvie/usecode/u6_object_types.h
index 13574d32a0d..8533e354884 100644
--- a/engines/ultima/nuvie/usecode/u6_object_types.h
+++ b/engines/ultima/nuvie/usecode/u6_object_types.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef ULTIMA_U6_OBJECT_TYPES_H
+#define ULTIMA_U6_OBJECT_TYPES_H
+
namespace Ultima {
namespace Nuvie {
@@ -191,3 +194,5 @@ const U6ObjectType U6ObjectTypes[] = {
} // End of namespace Nuvie
} // End of namespace Ultima
+
+#endif // ULTIMA_U6_OBJECT_TYPES_H
diff --git a/engines/wintermute/ext/scene_achievements_tables.h b/engines/wintermute/ext/scene_achievements_tables.h
index 8adef1f88d6..4cac44da6bd 100644
--- a/engines/wintermute/ext/scene_achievements_tables.h
+++ b/engines/wintermute/ext/scene_achievements_tables.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef WINTERMUTE_SCENE_ACHIEVEMENTS_TABLES_H
+#define WINTERMUTE_SCENE_ACHIEVEMENTS_TABLES_H
+
/*
* This file is based on WME Lite.
* http://dead-code.org/redir.php?target=wmelite
@@ -79,3 +82,5 @@ static const AchievementsList achievementsList[] = {
};
} // End of namespace Wintermute
+
+#endif // WINTERMUTE_SCENE_ACHIEVEMENTS_TABLES_H
diff --git a/engines/wintermute/keymapper_tables.h b/engines/wintermute/keymapper_tables.h
index 8228cf895ac..4ff29ac771b 100644
--- a/engines/wintermute/keymapper_tables.h
+++ b/engines/wintermute/keymapper_tables.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef WINTERMUTE_KEYMAPPER_TABLES_H
+#define WINTERMUTE_KEYMAPPER_TABLES_H
+
#include "backends/keymapper/action.h"
#include "backends/keymapper/keymapper.h"
#include "backends/keymapper/standard-actions.h"
@@ -2338,3 +2341,5 @@ inline Common::KeymapArray getWintermuteKeymaps(const char *target, const Common
}
} // End of namespace Wintermute
+
+#endif // WINTERMUTE_KEYMAPPER_TABLES_H
diff --git a/engines/zvision/file/file_manager.h b/engines/zvision/file/file_manager.h
index fa57e4ee968..7f1afe4dbd2 100644
--- a/engines/zvision/file/file_manager.h
+++ b/engines/zvision/file/file_manager.h
@@ -19,13 +19,13 @@
*
*/
+#ifndef ZVISION_FILE_MANAGER
+#define ZVISION_FILE_MANAGER
+
#include "common/file.h"
#include "common/path.h"
#include "zvision/zvision.h"
-#ifndef ZVISION_FILE_MANAGER
-#define ZVISION_FILE_MANAGER
-
namespace ZVision {
class FileManager {
@@ -43,4 +43,4 @@ private:
} // End of namespace ZVision
-#endif
+#endif // ZVISION_FILE_MANAGER
diff --git a/engines/zvision/sound/volume_manager.h b/engines/zvision/sound/volume_manager.h
index 76950dc679d..9e84622d659 100644
--- a/engines/zvision/sound/volume_manager.h
+++ b/engines/zvision/sound/volume_manager.h
@@ -19,12 +19,13 @@
*
*/
+#ifndef ZVISION_VOLUME_MANAGER
+#define ZVISION_VOLUME_MANAGER
+
#include "common/scummsys.h"
#include "math/angle.h"
#include "zvision/zvision.h"
-#ifndef ZVISION_VOLUME_MANAGER
-#define ZVISION_VOLUME_MANAGER
namespace ZVision {
@@ -63,4 +64,4 @@ private:
} // End of namespace ZVision
-#endif
+#endif // ZVISION_VOLUME_MANAGER
diff --git a/graphics/blit/blit-alpha.h b/graphics/blit/blit-alpha.h
index 1aa4cb52075..ed9d00ee7b2 100644
--- a/graphics/blit/blit-alpha.h
+++ b/graphics/blit/blit-alpha.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef GRAPHICS_BLIT_BLIT_ALPHA_H
+#define GRAPHICS_BLIT_BLIT_ALPHA_H
+
#include "graphics/blit.h"
namespace Graphics {
@@ -499,3 +502,5 @@ void BlendBlit::fillT(Args &args, const TSpriteBlendMode &blendMode) {
}
} // End of namespace Graphics
+
+#endif // GRAPHICS_BLIT_BLIT_ALPHA_H
diff --git a/graphics/pm5544.h b/graphics/pm5544.h
index 63da1b8c75b..91b914cfe2e 100644
--- a/graphics/pm5544.h
+++ b/graphics/pm5544.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef GRAPHICS_PM5544_H
+#define GRAPHICS_PM5544_H
+
namespace Graphics {
class ManagedSurface;
@@ -35,3 +38,5 @@ class ManagedSurface;
ManagedSurface *renderPM5544(int width, int height);
} // End of namespace Graphics
+
+#endif // GRAPHICS_PM5544_H
diff --git a/video/4xm_decoder.h b/video/4xm_decoder.h
index cd926826b98..42756d2cda5 100644
--- a/video/4xm_decoder.h
+++ b/video/4xm_decoder.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef VIDEO_4XM_DECODER_H
+#define VIDEO_4XM_DECODER_H
+
#include "common/ptr.h"
#include "video/video_decoder.h"
@@ -64,3 +67,5 @@ private:
};
} // namespace Video
+
+#endif // VIDEO_4XM_DECODER_H
diff --git a/video/4xm_utils.h b/video/4xm_utils.h
index 53d97479b17..f298c437fa6 100644
--- a/video/4xm_utils.h
+++ b/video/4xm_utils.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef VIDEO_4XM_UTILS_H
+#define VIDEO_4XM_UTILS_H
+
#include "common/array.h"
#include "common/compression/huffman.h"
#include "common/debug.h"
@@ -106,3 +109,5 @@ inline int readInt(BitStream &bs, size_t n) {
} // namespace FourXM
} // namespace Video
+
+#endif // VIDEO_4XM_UTILS_H
More information about the Scummvm-git-logs
mailing list