[Scummvm-git-logs] scummvm master -> c6bf55f1fce8ab8027b07ebed3fdc057dd551a65
sluicebox
noreply at scummvm.org
Wed Nov 15 00:42:40 UTC 2023
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c6bf55f1fc SCI: Update header guards
Commit: c6bf55f1fce8ab8027b07ebed3fdc057dd551a65
https://github.com/scummvm/scummvm/commit/c6bf55f1fce8ab8027b07ebed3fdc057dd551a65
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-11-14T16:40:53-08:00
Commit Message:
SCI: Update header guards
Changed paths:
engines/sci/engine/features.h
engines/sci/engine/scriptdebug.h
engines/sci/engine/seg_manager.h
engines/sci/engine/selector.h
engines/sci/engine/state.h
engines/sci/engine/tts.h
engines/sci/graphics/animate.h
engines/sci/graphics/cache.h
engines/sci/graphics/celobj32.h
engines/sci/graphics/compare.h
engines/sci/graphics/controls16.h
engines/sci/graphics/controls32.h
engines/sci/graphics/coordadjuster.h
engines/sci/graphics/cursor.h
engines/sci/graphics/cursor32.h
engines/sci/graphics/fontkorean.h
engines/sci/graphics/fontsjis.h
engines/sci/graphics/frameout.h
engines/sci/graphics/helpers.h
engines/sci/graphics/helpers_detection_enums.h
engines/sci/graphics/lists32.h
engines/sci/graphics/maccursor32.h
engines/sci/graphics/macfont.h
engines/sci/graphics/maciconbar.h
engines/sci/graphics/menu.h
engines/sci/graphics/paint16.h
engines/sci/graphics/paint32.h
engines/sci/graphics/palette.h
engines/sci/graphics/palette32.h
engines/sci/graphics/picture.h
engines/sci/graphics/plane32.h
engines/sci/graphics/portrait.h
engines/sci/graphics/ports.h
engines/sci/graphics/remap.h
engines/sci/graphics/remap32.h
engines/sci/graphics/scifont.h
engines/sci/graphics/scifx.h
engines/sci/graphics/screen.h
engines/sci/graphics/screen_item32.h
engines/sci/graphics/text16.h
engines/sci/graphics/text32.h
engines/sci/graphics/transitions.h
engines/sci/graphics/transitions32.h
engines/sci/graphics/video32.h
engines/sci/graphics/view.h
engines/sci/sound/audio.h
engines/sci/sound/audio32.h
engines/sci/sound/decoders/sol.h
engines/sci/sound/drivers/mididriver.h
engines/sci/sound/midiparser_sci.h
engines/sci/sound/music.h
engines/sci/sound/soundcmd.h
engines/sci/sound/sync.h
engines/sci/video/robot_decoder.h
engines/sci/video/seq_decoder.h
diff --git a/engines/sci/engine/features.h b/engines/sci/engine/features.h
index 78a05fe20e6..4c401acf58d 100644
--- a/engines/sci/engine/features.h
+++ b/engines/sci/engine/features.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef SCI_INCLUDE_FEATURES_H
-#define SCI_INCLUDE_FEATURES_H
+#ifndef SCI_ENGINE_FEATURES_H
+#define SCI_ENGINE_FEATURES_H
#include "sci/resource/resource.h"
#include "sci/engine/seg_manager.h"
@@ -330,4 +330,4 @@ private:
} // End of namespace Sci
-#endif // SCI_INCLUDE_ENGINE_H
+#endif // SCI_ENGINE_FEATURES_H
diff --git a/engines/sci/engine/scriptdebug.h b/engines/sci/engine/scriptdebug.h
index 7fa6db727e5..302adeb8fe1 100644
--- a/engines/sci/engine/scriptdebug.h
+++ b/engines/sci/engine/scriptdebug.h
@@ -42,6 +42,6 @@ bool printObject(reg_t obj);
bool matchKernelBreakpointPattern(const Common::String &pattern, const Common::String &name);
-}
+} // End of namespace Sci
-#endif
+#endif // SCI_ENGINE_SCRIPTDEBUG_H
diff --git a/engines/sci/engine/seg_manager.h b/engines/sci/engine/seg_manager.h
index b200ae6730a..7fa958d2a2a 100644
--- a/engines/sci/engine/seg_manager.h
+++ b/engines/sci/engine/seg_manager.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef SCI_ENGINE_SEGMAN_H
-#define SCI_ENGINE_SEGMAN_H
+#ifndef SCI_ENGINE_SEG_MANAGER_H
+#define SCI_ENGINE_SEG_MANAGER_H
#include "common/scummsys.h"
#include "common/serializer.h"
@@ -509,4 +509,4 @@ private:
} // End of namespace Sci
-#endif // SCI_ENGINE_SEGMAN_H
+#endif // SCI_ENGINE_SEG_MANAGER_H
diff --git a/engines/sci/engine/selector.h b/engines/sci/engine/selector.h
index ae498eb45e7..77f0430f4f8 100644
--- a/engines/sci/engine/selector.h
+++ b/engines/sci/engine/selector.h
@@ -250,4 +250,4 @@ void updateInfoFlagViewVisible(Object *obj, int index, bool fromPropertyOp = fal
} // End of namespace Sci
-#endif // SCI_ENGINE_KERNEL_H
+#endif // SCI_ENGINE_SELECTOR_H
diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h
index 5233ea1a93a..b84a2a08f32 100644
--- a/engines/sci/engine/state.h
+++ b/engines/sci/engine/state.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef SCI_INCLUDE_ENGINE_H
-#define SCI_INCLUDE_ENGINE_H
+#ifndef SCI_ENGINE_STATE_H
+#define SCI_ENGINE_STATE_H
#include "common/scummsys.h"
#include "common/array.h"
@@ -224,4 +224,4 @@ struct EngineState : public Common::Serializable {
} // End of namespace Sci
-#endif // SCI_INCLUDE_ENGINE_H
+#endif // SCI_ENGINE_STATE_H
diff --git a/engines/sci/engine/tts.h b/engines/sci/engine/tts.h
index 55a4aea1b1f..2f8253354b5 100644
--- a/engines/sci/engine/tts.h
+++ b/engines/sci/engine/tts.h
@@ -19,6 +19,9 @@
*
*/
+#ifndef SCI_ENGINE_TTS_H
+#define SCI_ENGINE_TTS_H
+
#include "common/text-to-speech.h"
#include "sci/sci.h"
@@ -42,3 +45,5 @@ private:
};
} // End of namespace Sci
+
+#endif // SCI_ENGINE_TTS_H
diff --git a/engines/sci/graphics/animate.h b/engines/sci/graphics/animate.h
index ea91ad6e32d..c6fcb156b51 100644
--- a/engines/sci/graphics/animate.h
+++ b/engines/sci/graphics/animate.h
@@ -139,4 +139,4 @@ private:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_ANIMATE_H
diff --git a/engines/sci/graphics/cache.h b/engines/sci/graphics/cache.h
index de63cc21428..64cbc9fb4d8 100644
--- a/engines/sci/graphics/cache.h
+++ b/engines/sci/graphics/cache.h
@@ -62,4 +62,4 @@ private:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_CACHE_H
diff --git a/engines/sci/graphics/celobj32.h b/engines/sci/graphics/celobj32.h
index e71450fb977..74f64bb5936 100644
--- a/engines/sci/graphics/celobj32.h
+++ b/engines/sci/graphics/celobj32.h
@@ -600,6 +600,7 @@ public:
CelObjColor *duplicate() const override;
const SciSpan<const byte> getResPointer() const override;
};
+
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_CELOBJ32_H
diff --git a/engines/sci/graphics/compare.h b/engines/sci/graphics/compare.h
index 2fbc83a2634..04000dfa55c 100644
--- a/engines/sci/graphics/compare.h
+++ b/engines/sci/graphics/compare.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef SCI_GRAPHICS_GFX_H
-#define SCI_GRAPHICS_GFX_H
+#ifndef SCI_GRAPHICS_COMPARE_H
+#define SCI_GRAPHICS_COMPARE_H
#include "common/hashmap.h"
@@ -63,4 +63,4 @@ private:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_COMPARE_H
diff --git a/engines/sci/graphics/controls16.h b/engines/sci/graphics/controls16.h
index 4d030f3993f..2f42db59545 100644
--- a/engines/sci/graphics/controls16.h
+++ b/engines/sci/graphics/controls16.h
@@ -84,4 +84,4 @@ private:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_CONTROLS16_H
diff --git a/engines/sci/graphics/controls32.h b/engines/sci/graphics/controls32.h
index d0cc210e5ff..245374284f4 100644
--- a/engines/sci/graphics/controls32.h
+++ b/engines/sci/graphics/controls32.h
@@ -485,4 +485,4 @@ private:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_CONTROLS32_H
diff --git a/engines/sci/graphics/coordadjuster.h b/engines/sci/graphics/coordadjuster.h
index 3e3bd2d0894..5d44f23a1a1 100644
--- a/engines/sci/graphics/coordadjuster.h
+++ b/engines/sci/graphics/coordadjuster.h
@@ -54,4 +54,4 @@ private:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_COORDADJUSTER_H
diff --git a/engines/sci/graphics/cursor.h b/engines/sci/graphics/cursor.h
index e7cba51c80f..f8f331f7189 100644
--- a/engines/sci/graphics/cursor.h
+++ b/engines/sci/graphics/cursor.h
@@ -142,4 +142,4 @@ private:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_CURSOR_H
diff --git a/engines/sci/graphics/cursor32.h b/engines/sci/graphics/cursor32.h
index 98d65d177d1..04400e56d53 100644
--- a/engines/sci/graphics/cursor32.h
+++ b/engines/sci/graphics/cursor32.h
@@ -223,4 +223,5 @@ public:
};
} // End of namespace Sci
-#endif
+
+#endif // SCI_GRAPHICS_CURSOR32_H
diff --git a/engines/sci/graphics/fontkorean.h b/engines/sci/graphics/fontkorean.h
index 29704c88ec6..a0fabe4d7ab 100644
--- a/engines/sci/graphics/fontkorean.h
+++ b/engines/sci/graphics/fontkorean.h
@@ -56,4 +56,5 @@ private:
};
} // End of namespace Sci
-#endif
+
+#endif // SCI_GRAPHICS_FONTKOREAN_H
diff --git a/engines/sci/graphics/fontsjis.h b/engines/sci/graphics/fontsjis.h
index 96f44cb4e22..d982de6c95d 100644
--- a/engines/sci/graphics/fontsjis.h
+++ b/engines/sci/graphics/fontsjis.h
@@ -53,4 +53,4 @@ private:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_FONTSJIS_H
diff --git a/engines/sci/graphics/frameout.h b/engines/sci/graphics/frameout.h
index 9e38dfe9558..e2703878476 100644
--- a/engines/sci/graphics/frameout.h
+++ b/engines/sci/graphics/frameout.h
@@ -446,4 +446,4 @@ public:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_FRAMEOUT_H
diff --git a/engines/sci/graphics/helpers.h b/engines/sci/graphics/helpers.h
index 3379ab2cf00..fce70837f50 100644
--- a/engines/sci/graphics/helpers.h
+++ b/engines/sci/graphics/helpers.h
@@ -298,4 +298,4 @@ struct PalSchedule {
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_HELPERS_H
diff --git a/engines/sci/graphics/helpers_detection_enums.h b/engines/sci/graphics/helpers_detection_enums.h
index 725ea7b109e..85966a6b00f 100644
--- a/engines/sci/graphics/helpers_detection_enums.h
+++ b/engines/sci/graphics/helpers_detection_enums.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef SCI_HELPERS_DETECTION_ENUMS_H
-#define SCI_HELPERS_DETECTION_ENUMS_H
+#ifndef SCI_GRAPHICS_HELPERS_DETECTION_ENUMS_H
+#define SCI_GRAPHICS_HELPERS_DETECTION_ENUMS_H
namespace Sci {
// Game view types, sorted by the number of colors
@@ -35,4 +35,4 @@ enum ViewType {
} // End of namespace Sci
-#endif // SCI_HELPERS_DETECTION_ENUMS_H
+#endif // SCI_GRAPHICS_HELPERS_DETECTION_ENUMS_H
diff --git a/engines/sci/graphics/lists32.h b/engines/sci/graphics/lists32.h
index 52bc02b0a60..ffaa5524630 100644
--- a/engines/sci/graphics/lists32.h
+++ b/engines/sci/graphics/lists32.h
@@ -340,4 +340,5 @@ public:
};
} // End of namespace Sci
-#endif
+
+#endif // SCI_GRAPHICS_LISTS32_H
diff --git a/engines/sci/graphics/maccursor32.h b/engines/sci/graphics/maccursor32.h
index 323ac67e37e..19c3cdccac7 100644
--- a/engines/sci/graphics/maccursor32.h
+++ b/engines/sci/graphics/maccursor32.h
@@ -100,4 +100,4 @@ private:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_MACCURSOR32_H
diff --git a/engines/sci/graphics/macfont.h b/engines/sci/graphics/macfont.h
index 41d339a3dc5..8c7905e2fbd 100644
--- a/engines/sci/graphics/macfont.h
+++ b/engines/sci/graphics/macfont.h
@@ -102,4 +102,4 @@ private:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_MACFONT_H
diff --git a/engines/sci/graphics/maciconbar.h b/engines/sci/graphics/maciconbar.h
index 386f8fe8445..b8941e89529 100644
--- a/engines/sci/graphics/maciconbar.h
+++ b/engines/sci/graphics/maciconbar.h
@@ -76,4 +76,4 @@ private:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_MACICONBAR_H
diff --git a/engines/sci/graphics/menu.h b/engines/sci/graphics/menu.h
index 1e4493ed00a..cf13f4d1a01 100644
--- a/engines/sci/graphics/menu.h
+++ b/engines/sci/graphics/menu.h
@@ -131,4 +131,4 @@ private:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_MENU_H
diff --git a/engines/sci/graphics/paint16.h b/engines/sci/graphics/paint16.h
index 010da1f07f9..c290a76d353 100644
--- a/engines/sci/graphics/paint16.h
+++ b/engines/sci/graphics/paint16.h
@@ -102,4 +102,4 @@ private:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_PAINT16_H
diff --git a/engines/sci/graphics/paint32.h b/engines/sci/graphics/paint32.h
index 22e001ebd02..4bbbff0fc67 100644
--- a/engines/sci/graphics/paint32.h
+++ b/engines/sci/graphics/paint32.h
@@ -68,4 +68,4 @@ private:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_PAINT32_H
diff --git a/engines/sci/graphics/palette.h b/engines/sci/graphics/palette.h
index 221c0e7a667..cbf35626e7d 100644
--- a/engines/sci/graphics/palette.h
+++ b/engines/sci/graphics/palette.h
@@ -133,4 +133,4 @@ protected:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_PALETTE_H
diff --git a/engines/sci/graphics/palette32.h b/engines/sci/graphics/palette32.h
index 065952441a3..21b58c43f19 100644
--- a/engines/sci/graphics/palette32.h
+++ b/engines/sci/graphics/palette32.h
@@ -673,4 +673,4 @@ private:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_PALETTE32_H
diff --git a/engines/sci/graphics/picture.h b/engines/sci/graphics/picture.h
index c46e7453e33..d0537937699 100644
--- a/engines/sci/graphics/picture.h
+++ b/engines/sci/graphics/picture.h
@@ -97,4 +97,4 @@ private:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_PICTURE_H
diff --git a/engines/sci/graphics/plane32.h b/engines/sci/graphics/plane32.h
index 7aa40b57e43..43aba51386e 100644
--- a/engines/sci/graphics/plane32.h
+++ b/engines/sci/graphics/plane32.h
@@ -514,4 +514,4 @@ public:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_PLANE32_H
diff --git a/engines/sci/graphics/portrait.h b/engines/sci/graphics/portrait.h
index fc0e6bda29c..23ddde238da 100644
--- a/engines/sci/graphics/portrait.h
+++ b/engines/sci/graphics/portrait.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef SCI_GRAPHICS_PORTRAITS_H
-#define SCI_GRAPHICS_PORTRAITS_H
+#ifndef SCI_GRAPHICS_PORTRAIT_H
+#define SCI_GRAPHICS_PORTRAIT_H
#include "sci/util.h"
@@ -83,4 +83,4 @@ private:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_PORTRAIT_H
diff --git a/engines/sci/graphics/ports.h b/engines/sci/graphics/ports.h
index 15975f742d4..0f65fe3df7a 100644
--- a/engines/sci/graphics/ports.h
+++ b/engines/sci/graphics/ports.h
@@ -141,4 +141,4 @@ private:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_PORTS_H
diff --git a/engines/sci/graphics/remap.h b/engines/sci/graphics/remap.h
index 42d8d0ce33c..d7693c194a3 100644
--- a/engines/sci/graphics/remap.h
+++ b/engines/sci/graphics/remap.h
@@ -63,4 +63,4 @@ private:
};
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_REMAP_H
diff --git a/engines/sci/graphics/remap32.h b/engines/sci/graphics/remap32.h
index e2e71f224a5..e634219df97 100644
--- a/engines/sci/graphics/remap32.h
+++ b/engines/sci/graphics/remap32.h
@@ -380,5 +380,7 @@ private:
*/
int16 _blockedRangeCount;
};
+
} // End of namespace Sci
-#endif
+
+#endif // SCI_GRAPHICS_REMAP32_H
diff --git a/engines/sci/graphics/scifont.h b/engines/sci/graphics/scifont.h
index 2354c928304..c3a7deb8a46 100644
--- a/engines/sci/graphics/scifont.h
+++ b/engines/sci/graphics/scifont.h
@@ -90,4 +90,4 @@ private:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_SCIFONT_H
diff --git a/engines/sci/graphics/scifx.h b/engines/sci/graphics/scifx.h
index cd68c1fafb1..4c6f3b2ef9f 100644
--- a/engines/sci/graphics/scifx.h
+++ b/engines/sci/graphics/scifx.h
@@ -19,10 +19,15 @@
*
*/
+#ifndef SCI_GRAPHICS_SCIFX_H
+#define SCI_GRAPHICS_SCIFX_H
+
namespace Sci {
void setupCustomPaletteMods(GfxScreen *screen);
void doCustomViewPalette(GfxScreen *screen, GuiResourceId view, int16 loop, int16 cel);
void doCustomPicPalette(GfxScreen *screen, GuiResourceId pic);
-}
+} // End of namespace Sci
+
+#endif // SCI_GRAPHICS_SCIFX_H
diff --git a/engines/sci/graphics/screen.h b/engines/sci/graphics/screen.h
index 793d4cb86b4..d72a6c39245 100644
--- a/engines/sci/graphics/screen.h
+++ b/engines/sci/graphics/screen.h
@@ -475,4 +475,4 @@ public:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_SCREEN_H
diff --git a/engines/sci/graphics/screen_item32.h b/engines/sci/graphics/screen_item32.h
index 3aeadad9c57..b617a2d2c0d 100644
--- a/engines/sci/graphics/screen_item32.h
+++ b/engines/sci/graphics/screen_item32.h
@@ -365,6 +365,7 @@ public:
void sort();
void unsort();
};
+
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_SCREEN_ITEM32_H
diff --git a/engines/sci/graphics/text16.h b/engines/sci/graphics/text16.h
index 09ea718e30d..5dbd4106a2d 100644
--- a/engines/sci/graphics/text16.h
+++ b/engines/sci/graphics/text16.h
@@ -112,4 +112,4 @@ private:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_TEXT16_H
diff --git a/engines/sci/graphics/text32.h b/engines/sci/graphics/text32.h
index 9f46d7d50ca..06a96622b8b 100644
--- a/engines/sci/graphics/text32.h
+++ b/engines/sci/graphics/text32.h
@@ -288,4 +288,4 @@ public:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_TEXT32_H
diff --git a/engines/sci/graphics/transitions.h b/engines/sci/graphics/transitions.h
index 61681143da5..5db8c9b338c 100644
--- a/engines/sci/graphics/transitions.h
+++ b/engines/sci/graphics/transitions.h
@@ -105,4 +105,4 @@ private:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_TRANSITIONS_H
diff --git a/engines/sci/graphics/transitions32.h b/engines/sci/graphics/transitions32.h
index a588b892992..ca9c9b69a3f 100644
--- a/engines/sci/graphics/transitions32.h
+++ b/engines/sci/graphics/transitions32.h
@@ -457,4 +457,5 @@ private:
};
} // End of namespace Sci
-#endif
+
+#endif // SCI_GRAPHICS_TRANSITIONS32_H
diff --git a/engines/sci/graphics/video32.h b/engines/sci/graphics/video32.h
index 482937dae77..1707ef0cb95 100644
--- a/engines/sci/graphics/video32.h
+++ b/engines/sci/graphics/video32.h
@@ -817,6 +817,7 @@ private:
RobotDecoder _robotPlayer;
DuckPlayer _duckPlayer;
};
+
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_VIDEO32_H
diff --git a/engines/sci/graphics/view.h b/engines/sci/graphics/view.h
index 40bc342bc1c..affcf256dbe 100644
--- a/engines/sci/graphics/view.h
+++ b/engines/sci/graphics/view.h
@@ -112,4 +112,4 @@ private:
} // End of namespace Sci
-#endif
+#endif // SCI_GRAPHICS_VIEW_H
diff --git a/engines/sci/sound/audio.h b/engines/sci/sound/audio.h
index 30333eeab1d..8b138ff68d9 100644
--- a/engines/sci/sound/audio.h
+++ b/engines/sci/sound/audio.h
@@ -20,8 +20,8 @@
*/
/* Sound engine */
-#ifndef SCI_AUDIO_H
-#define SCI_AUDIO_H
+#ifndef SCI_SOUND_AUDIO_H
+#define SCI_SOUND_AUDIO_H
#include "sci/engine/vm_types.h"
#include "audio/mixer.h"
@@ -92,4 +92,4 @@ private:
} // End of namespace Sci
-#endif // SCI_AUDIO_H
+#endif // SCI_SOUND_AUDIO_H
diff --git a/engines/sci/sound/audio32.h b/engines/sci/sound/audio32.h
index 8c38f347b50..cfa8691d027 100644
--- a/engines/sci/sound/audio32.h
+++ b/engines/sci/sound/audio32.h
@@ -19,8 +19,9 @@
*
*/
-#ifndef SCI_AUDIO32_H
-#define SCI_AUDIO32_H
+#ifndef SCI_SOUND_AUDIO32_H
+#define SCI_SOUND_AUDIO32_H
+
#include "audio/audiostream.h" // for AudioStream, SeekableAudioStream (...
#include "audio/mixer.h" // for Mixer, SoundHandle
#include "audio/rate.h" // for Audio::st_volume_t, RateConverter
@@ -655,4 +656,5 @@ public:
};
} // End of namespace Sci
-#endif
+
+#endif // SCI_SOUND_AUDIO32_H
diff --git a/engines/sci/sound/decoders/sol.h b/engines/sci/sound/decoders/sol.h
index 320e423d61d..1542ed1dba5 100644
--- a/engines/sci/sound/decoders/sol.h
+++ b/engines/sci/sound/decoders/sol.h
@@ -21,6 +21,7 @@
#ifndef SCI_SOUND_DECODERS_SOL_H
#define SCI_SOUND_DECODERS_SOL_H
+
#include "audio/audiostream.h"
#include "common/stream.h"
@@ -76,5 +77,7 @@ public:
};
Audio::SeekableAudioStream *makeSOLStream(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse);
-}
-#endif
+
+} // End of namespace Sci
+
+#endif // SCI_SOUND_DECODERS_SOL_H
diff --git a/engines/sci/sound/drivers/mididriver.h b/engines/sci/sound/drivers/mididriver.h
index 5f97852b16d..fb126b5bb47 100644
--- a/engines/sci/sound/drivers/mididriver.h
+++ b/engines/sci/sound/drivers/mididriver.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef SCI_SFX_SOFTSEQ_MIDIDRIVER_H
-#define SCI_SFX_SOFTSEQ_MIDIDRIVER_H
+#ifndef SCI_SOUND_DRIVERS_MIDIDRIVER_H
+#define SCI_SOUND_DRIVERS_MIDIDRIVER_H
#include "sci/sci.h"
#include "sci/util.h"
@@ -153,4 +153,4 @@ extern MidiPlayer *MidiPlayer_PC9801_create(SciVersion version);
} // End of namespace Sci
-#endif // SCI_SFX_SOFTSEQ_MIDIDRIVER_H
+#endif // SCI_SOUND_DRIVERS_MIDIDRIVER_H
diff --git a/engines/sci/sound/midiparser_sci.h b/engines/sci/sound/midiparser_sci.h
index 12b21814803..15017cb67e5 100644
--- a/engines/sci/sound/midiparser_sci.h
+++ b/engines/sci/sound/midiparser_sci.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef SCI_MIDIPARSER_H
-#define SCI_MIDIPARSER_H
+#ifndef SCI_SOUND_MIDIPARSER_H
+#define SCI_SOUND_MIDIPARSER_H
#include "sci/resource/resource.h"
#include "sci/sound/music.h"
@@ -132,4 +132,4 @@ protected:
} // End of namespace Sci
-#endif
+#endif // SCI_SOUND_MIDIPARSER_H
diff --git a/engines/sci/sound/music.h b/engines/sci/sound/music.h
index 8abc6321184..bfa3deb1e49 100644
--- a/engines/sci/sound/music.h
+++ b/engines/sci/sound/music.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef SCI_MUSIC_H
-#define SCI_MUSIC_H
+#ifndef SCI_SOUND_MUSIC_H
+#define SCI_SOUND_MUSIC_H
#include "common/serializer.h"
#include "common/mutex.h"
@@ -311,4 +311,4 @@ private:
} // End of namespace Sci
-#endif
+#endif // SCI_SOUND_MUSIC_H
diff --git a/engines/sci/sound/soundcmd.h b/engines/sci/sound/soundcmd.h
index e11de319a3e..bc0f98f9034 100644
--- a/engines/sci/sound/soundcmd.h
+++ b/engines/sci/sound/soundcmd.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef SCI_SOUNDCMD_H
-#define SCI_SOUNDCMD_H
+#ifndef SCI_SOUND_SOUNDCMD_H
+#define SCI_SOUND_SOUNDCMD_H
#include "common/list.h"
#include "audio/mididrv.h" // for MusicType
@@ -129,4 +129,4 @@ private:
} // End of namespace Sci
-#endif // SCI_SOUNDCMD_H
+#endif // SCI_SOUND_SOUNDCMD_H
diff --git a/engines/sci/sound/sync.h b/engines/sci/sound/sync.h
index aec3509d6fa..88a7cf4bf72 100644
--- a/engines/sci/sound/sync.h
+++ b/engines/sci/sound/sync.h
@@ -57,4 +57,5 @@ public:
};
} // End of namespace Sci
-#endif
+
+#endif // SCI_SOUND_SYNC_H
diff --git a/engines/sci/video/robot_decoder.h b/engines/sci/video/robot_decoder.h
index 5504b880f1c..226854c54f4 100644
--- a/engines/sci/video/robot_decoder.h
+++ b/engines/sci/video/robot_decoder.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef SCI_SOUND_DECODERS_ROBOT_H
-#define SCI_SOUND_DECODERS_ROBOT_H
+#ifndef SCI_VIDEO_DECODERS_ROBOT_H
+#define SCI_VIDEO_DECODERS_ROBOT_H
#include "audio/audiostream.h" // for AudioStream
#include "audio/rate.h" // for st_sample_t
@@ -1367,5 +1367,7 @@ private:
*/
uint8 _verticalScaleFactor;
};
+
} // end of namespace Sci
-#endif
+
+#endif // SCI_VIDEO_DECODERS_ROBOT_H
diff --git a/engines/sci/video/seq_decoder.h b/engines/sci/video/seq_decoder.h
index f6add5a57c3..62e9a44c316 100644
--- a/engines/sci/video/seq_decoder.h
+++ b/engines/sci/video/seq_decoder.h
@@ -86,4 +86,4 @@ private:
} // End of namespace Sci
-#endif
+#endif // SCI_VIDEO_SEQ_DECODER_H
More information about the Scummvm-git-logs
mailing list