diff options
44 files changed, 88 insertions, 88 deletions
diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h index 31200f6296..5dc2f81897 100644 --- a/engines/scumm/actor.h +++ b/engines/scumm/actor.h @@ -22,8 +22,8 @@ */ -#ifndef ACTOR_H -#define ACTOR_H +#ifndef SCUMM_ACTOR_H +#define SCUMM_ACTOR_H #include "common/scummsys.h" #include "scumm/saveload.h" diff --git a/engines/scumm/akos.h b/engines/scumm/akos.h index 1a849903d8..c5a5fc1348 100644 --- a/engines/scumm/akos.h +++ b/engines/scumm/akos.h @@ -21,8 +21,8 @@ * */ -#ifndef AKOS_H -#define AKOS_H +#ifndef SCUMM_AKOS_H +#define SCUMM_AKOS_H #include "scumm/base-costume.h" diff --git a/engines/scumm/base-costume.h b/engines/scumm/base-costume.h index 3e8d84a9ee..02930c6603 100644 --- a/engines/scumm/base-costume.h +++ b/engines/scumm/base-costume.h @@ -21,8 +21,8 @@ * */ -#ifndef BASE_COSTUME_H -#define BASE_COSTUME_H +#ifndef SCUMM_BASE_COSTUME_H +#define SCUMM_BASE_COSTUME_H #include "common/scummsys.h" #include "scumm/actor.h" // for CostumeData diff --git a/engines/scumm/bomp.h b/engines/scumm/bomp.h index b3dfbcabdc..7a38f45b9c 100644 --- a/engines/scumm/bomp.h +++ b/engines/scumm/bomp.h @@ -20,8 +20,8 @@ * */ -#ifndef BOMP_H -#define BOMP_H +#ifndef SCUMM_BOMP_H +#define SCUMM_BOMP_H #include "common/scummsys.h" diff --git a/engines/scumm/boxes.h b/engines/scumm/boxes.h index c78fd63e74..f2c0597a25 100644 --- a/engines/scumm/boxes.h +++ b/engines/scumm/boxes.h @@ -21,8 +21,8 @@ * */ -#ifndef BOXES_H -#define BOXES_H +#ifndef SCUMM_BOXES_H +#define SCUMM_BOXES_H #include "common/rect.h" diff --git a/engines/scumm/charset.h b/engines/scumm/charset.h index 04aecb98cb..5039d31573 100644 --- a/engines/scumm/charset.h +++ b/engines/scumm/charset.h @@ -19,8 +19,8 @@ * $Id$ */ -#ifndef CHARSET_H -#define CHARSET_H +#ifndef SCUMM_CHARSET_H +#define SCUMM_CHARSET_H #include "common/scummsys.h" #include "common/rect.h" diff --git a/engines/scumm/costume.h b/engines/scumm/costume.h index 56c97e0a8c..0bdcc5c679 100644 --- a/engines/scumm/costume.h +++ b/engines/scumm/costume.h @@ -19,8 +19,8 @@ * $Id$ */ -#ifndef COSTUME_H -#define COSTUME_H +#ifndef SCUMM_COSTUME_H +#define SCUMM_COSTUME_H #include "scumm/base-costume.h" diff --git a/engines/scumm/gfx.h b/engines/scumm/gfx.h index 9206d8d4e7..a4683095a2 100644 --- a/engines/scumm/gfx.h +++ b/engines/scumm/gfx.h @@ -21,8 +21,8 @@ * */ -#ifndef GFX_H -#define GFX_H +#ifndef SCUMM_GFX_H +#define SCUMM_GFX_H #include "graphics/surface.h" diff --git a/engines/scumm/he/animation_he.h b/engines/scumm/he/animation_he.h index bb847fdef6..78b0a747e0 100644 --- a/engines/scumm/he/animation_he.h +++ b/engines/scumm/he/animation_he.h @@ -21,8 +21,8 @@ * */ -#ifndef ANIMATION_H -#define ANIMATION_H +#ifndef SCUMM_HE_ANIMATION_H +#define SCUMM_HE_ANIMATION_H #include "common/file.h" diff --git a/engines/scumm/he/cup_player_he.h b/engines/scumm/he/cup_player_he.h index 317a371a0e..1295cec7a1 100644 --- a/engines/scumm/he/cup_player_he.h +++ b/engines/scumm/he/cup_player_he.h @@ -21,8 +21,8 @@ */ -#if !defined(CUP_PLAYER_HE_H) && !defined(DISABLE_HE) -#define CUP_PLAYER_HE_H +#if !defined(SCUMM_HE_CUP_PLAYER_HE_H) && !defined(DISABLE_HE) +#define SCUMM_HE_CUP_PLAYER_HE_H #include "common/stream.h" diff --git a/engines/scumm/he/floodfill_he.h b/engines/scumm/he/floodfill_he.h index 7d0fa7073f..6369e4712e 100644 --- a/engines/scumm/he/floodfill_he.h +++ b/engines/scumm/he/floodfill_he.h @@ -21,8 +21,8 @@ * */ -#if !defined(FLOODFILL_HE_H) && !defined(DISABLE_HE) -#define FLOODFILL_HE_H +#if !defined(SCUMM_HE_FLOODFILL_HE_H) && !defined(DISABLE_HE) +#define SCUMM_HE_FLOODFILL_HE_H #include "common/rect.h" diff --git a/engines/scumm/he/intern_he.h b/engines/scumm/he/intern_he.h index bb22e04a1d..7cc172dcd7 100644 --- a/engines/scumm/he/intern_he.h +++ b/engines/scumm/he/intern_he.h @@ -21,8 +21,8 @@ * */ -#ifndef SCUMM_INTERN_HE_H -#define SCUMM_INTERN_HE_H +#ifndef SCUMM_HE_INTERN_HE_H +#define SCUMM_HE_INTERN_HE_H #include "scumm/intern.h" #ifndef DISABLE_HE diff --git a/engines/scumm/he/logic_he.h b/engines/scumm/he/logic_he.h index 59476f2e3b..42dc9b0e08 100644 --- a/engines/scumm/he/logic_he.h +++ b/engines/scumm/he/logic_he.h @@ -20,8 +20,8 @@ * */ -#if !defined(LOGIC_HE_H) && !defined(DISABLE_HE) -#define LOGIC_HE_H +#if !defined(SCUMM_HE_LOGIC_HE_H) && !defined(DISABLE_HE) +#define SCUMM_HE_LOGIC_HE_H #include "common/stdafx.h" diff --git a/engines/scumm/he/resource_he.h b/engines/scumm/he/resource_he.h index d6bd09253d..c287108abc 100644 --- a/engines/scumm/he/resource_he.h +++ b/engines/scumm/he/resource_he.h @@ -24,8 +24,8 @@ * */ -#if !defined(RESOURCE_HE_H) && !defined(DISABLE_HE) -#define RESOURCE_HE_H +#if !defined(SCUMM_HE_RESOURCE_HE_H) && !defined(DISABLE_HE) +#define SCUMM_HE_RESOURCE_HE_H namespace Scumm { diff --git a/engines/scumm/he/sprite_he.h b/engines/scumm/he/sprite_he.h index 5396c1fed4..d7fbbe2f63 100644 --- a/engines/scumm/he/sprite_he.h +++ b/engines/scumm/he/sprite_he.h @@ -21,8 +21,8 @@ * */ -#if !defined(SPRITE_HE_H) && !defined(DISABLE_HE) -#define SPRITE_HE_H +#if !defined(SCUMM_HE_SPRITE_HE_H) && !defined(DISABLE_HE) +#define SCUMM_HE_SPRITE_HE_H namespace Scumm { diff --git a/engines/scumm/he/wiz_he.h b/engines/scumm/he/wiz_he.h index bbb0fc50bb..95a69c517e 100644 --- a/engines/scumm/he/wiz_he.h +++ b/engines/scumm/he/wiz_he.h @@ -21,8 +21,8 @@ * */ -#if !defined(WIZ_HE_H) && !defined(DISABLE_HE) -#define WIZ_HE_H +#if !defined(SCUMM_HE_WIZ_HE_H) && !defined(DISABLE_HE) +#define SCUMM_HE_WIZ_HE_H #include "common/rect.h" diff --git a/engines/scumm/imuse/imuse.h b/engines/scumm/imuse/imuse.h index a82d82cca7..fe779a1360 100644 --- a/engines/scumm/imuse/imuse.h +++ b/engines/scumm/imuse/imuse.h @@ -21,8 +21,8 @@ * */ -#ifndef IMUSE_H -#define IMUSE_H +#ifndef SCUMM_IMUSE_H +#define SCUMM_IMUSE_H #include "common/scummsys.h" #include "common/mutex.h" diff --git a/engines/scumm/imuse/imuse_internal.h b/engines/scumm/imuse/imuse_internal.h index 40035fb053..1a70563c8f 100644 --- a/engines/scumm/imuse/imuse_internal.h +++ b/engines/scumm/imuse/imuse_internal.h @@ -20,8 +20,8 @@ * $Id$ */ -#ifndef DEFINED_IMUSE_INTERNAL -#define DEFINED_IMUSE_INTERNAL +#ifndef SCUMM_IMUSE_INTERNAL +#define SCUMM_IMUSE_INTERNAL #include "common/scummsys.h" #include "scumm/imuse/imuse.h" diff --git a/engines/scumm/imuse/instrument.h b/engines/scumm/imuse/instrument.h index 960c887534..98e4a6cbad 100644 --- a/engines/scumm/imuse/instrument.h +++ b/engines/scumm/imuse/instrument.h @@ -20,8 +20,8 @@ * $Id$ */ -#ifndef INSTRUMENT_H -#define INSTRUMENT_H +#ifndef SCUMM_IMUSE_INSTRUMENT_H +#define SCUMM_IMUSE_INSTRUMENT_H #include "common/stdafx.h" #include "common/scummsys.h" diff --git a/engines/scumm/imuse/sysex.h b/engines/scumm/imuse/sysex.h index ba16282a2c..b573906887 100644 --- a/engines/scumm/imuse/sysex.h +++ b/engines/scumm/imuse/sysex.h @@ -20,8 +20,8 @@ * $Id$ */ -#ifndef DEFINED_SYSEX_H -#define DEFINED_SYSEX_H +#ifndef SCUMM_IMUSE_SYSEX_H +#define SCUMM_IMUSE_SYSEX_H #include "common/stdafx.h" #include "common/util.h" diff --git a/engines/scumm/imuse_digi/dimuse.h b/engines/scumm/imuse_digi/dimuse.h index fe8120c758..f3e4e608fc 100644 --- a/engines/scumm/imuse_digi/dimuse.h +++ b/engines/scumm/imuse_digi/dimuse.h @@ -19,8 +19,8 @@ * $Id$ */ -#if !defined(IMUSE_DIGI_H) && !defined(DISABLE_SCUMM_7_8) -#define IMUSE_DIGI_H +#if !defined(SCUMM_IMUSE_DIGI_H) && !defined(DISABLE_SCUMM_7_8) +#define SCUMM_IMUSE_DIGI_H #include "common/scummsys.h" #include "common/util.h" diff --git a/engines/scumm/imuse_digi/dimuse_bndmgr.h b/engines/scumm/imuse_digi/dimuse_bndmgr.h index e9d0f264d3..60bce790bf 100644 --- a/engines/scumm/imuse_digi/dimuse_bndmgr.h +++ b/engines/scumm/imuse_digi/dimuse_bndmgr.h @@ -19,8 +19,8 @@ * $Id$ */ -#ifndef BUNDLE_MGR_H -#define BUNDLE_MGR_H +#ifndef SCUMM_IMUSE_DIGI_BUNDLE_MGR_H +#define SCUMM_IMUSE_DIGI_BUNDLE_MGR_H #include "common/scummsys.h" #include "common/file.h" diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.h b/engines/scumm/imuse_digi/dimuse_sndmgr.h index efae717d60..d351e2ca70 100644 --- a/engines/scumm/imuse_digi/dimuse_sndmgr.h +++ b/engines/scumm/imuse_digi/dimuse_sndmgr.h @@ -19,8 +19,8 @@ * $Id$ */ -#ifndef IMUSE_DIGI_SNDMGR_H -#define IMUSE_DIGI_SNDMGR_H +#ifndef SCUMM_IMUSE_DIGI_SNDMGR_H +#define SCUMM_IMUSE_DIGI_SNDMGR_H #include "common/stdafx.h" #include "common/scummsys.h" diff --git a/engines/scumm/insane/insane.h b/engines/scumm/insane/insane.h index c7ebf74935..a99a28f6e0 100644 --- a/engines/scumm/insane/insane.h +++ b/engines/scumm/insane/insane.h @@ -20,8 +20,8 @@ * */ -#if !defined(INSANE_H) && !defined(DISABLE_SCUMM_7_8) -#define INSANE_H +#if !defined(SCUMM_INSANE_H) && !defined(DISABLE_SCUMM_7_8) +#define SCUMM_INSANE_H #include "engines/engine.h" #include "scumm/intern.h" diff --git a/engines/scumm/nut_renderer.h b/engines/scumm/nut_renderer.h index 4fb01fc572..1d5ee4a018 100644 --- a/engines/scumm/nut_renderer.h +++ b/engines/scumm/nut_renderer.h @@ -19,8 +19,8 @@ * $Id$ */ -#if !defined(NUT_RENDERER_H) && !defined(DISABLE_SCUMM_7_8) -#define NUT_RENDERER_H +#if !defined(SCUMM_NUT_RENDERER_H) && !defined(DISABLE_SCUMM_7_8) +#define SCUMM_NUT_RENDERER_H #include "common/file.h" #include "graphics/surface.h" diff --git a/engines/scumm/object.h b/engines/scumm/object.h index c06689240c..35233a3bb0 100644 --- a/engines/scumm/object.h +++ b/engines/scumm/object.h @@ -19,8 +19,8 @@ * $Id$ */ -#ifndef OBJECT_H -#define OBJECT_H +#ifndef SCUMM_OBJECT_H +#define SCUMM_OBJECT_H namespace Scumm { diff --git a/engines/scumm/player_mod.h b/engines/scumm/player_mod.h index 155cb154d1..6146c1c4a2 100644 --- a/engines/scumm/player_mod.h +++ b/engines/scumm/player_mod.h @@ -21,8 +21,8 @@ * */ -#ifndef PLAYER_MOD_H -#define PLAYER_MOD_H +#ifndef SCUMM_PLAYER_MOD_H +#define SCUMM_PLAYER_MOD_H #include "scumm/scumm.h" #include "sound/audiostream.h" diff --git a/engines/scumm/player_nes.h b/engines/scumm/player_nes.h index e79e139343..6140460838 100644 --- a/engines/scumm/player_nes.h +++ b/engines/scumm/player_nes.h @@ -21,8 +21,8 @@ * */ -#ifndef PLAYER_NES_H -#define PLAYER_NES_H +#ifndef SCUMM_PLAYER_NES_H +#define SCUMM_PLAYER_NES_H #include "common/scummsys.h" #include "scumm/music.h" diff --git a/engines/scumm/player_v1.h b/engines/scumm/player_v1.h index f1c9a5ea1e..5b6d3e704a 100644 --- a/engines/scumm/player_v1.h +++ b/engines/scumm/player_v1.h @@ -21,8 +21,8 @@ * */ -#ifndef PLAYER_V1_H -#define PLAYER_V1_H +#ifndef SCUMM_PLAYER_V1_H +#define SCUMM_PLAYER_V1_H #include "scumm/player_v2.h" diff --git a/engines/scumm/player_v2.h b/engines/scumm/player_v2.h index 91479487f9..cfcd986958 100644 --- a/engines/scumm/player_v2.h +++ b/engines/scumm/player_v2.h @@ -21,8 +21,8 @@ * */ -#ifndef PLAYER_V2_H -#define PLAYER_V2_H +#ifndef SCUMM_PLAYER_V2_H +#define SCUMM_PLAYER_V2_H #include "common/scummsys.h" #include "common/mutex.h" diff --git a/engines/scumm/player_v2a.h b/engines/scumm/player_v2a.h index 11d8470336..9e3348181d 100644 --- a/engines/scumm/player_v2a.h +++ b/engines/scumm/player_v2a.h @@ -21,8 +21,8 @@ * */ -#ifndef PLAYER_V2A_H -#define PLAYER_V2A_H +#ifndef SCUMM_PLAYER_V2A_H +#define SCUMM_PLAYER_V2A_H #include "common/scummsys.h" #include "scumm/music.h" diff --git a/engines/scumm/player_v3a.h b/engines/scumm/player_v3a.h index 9fea053830..acfbb24ef1 100644 --- a/engines/scumm/player_v3a.h +++ b/engines/scumm/player_v3a.h @@ -21,8 +21,8 @@ * */ -#ifndef PLAYER_V3A_H -#define PLAYER_V3A_H +#ifndef SCUMM_PLAYER_V3A_H +#define SCUMM_PLAYER_V3A_H #include "common/scummsys.h" #include "scumm/music.h" diff --git a/engines/scumm/resource.h b/engines/scumm/resource.h index 318582b5cb..789249abd7 100644 --- a/engines/scumm/resource.h +++ b/engines/scumm/resource.h @@ -19,8 +19,8 @@ * $Id$ */ -#ifndef RESOURCE_H -#define RESOURCE_H +#ifndef SCUMM_RESOURCE_H +#define SCUMM_RESOURCE_H namespace Scumm { diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h index 659b37a330..36bc3cb4b3 100644 --- a/engines/scumm/saveload.h +++ b/engines/scumm/saveload.h @@ -20,8 +20,8 @@ * */ -#ifndef SAVELOAD_H -#define SAVELOAD_H +#ifndef SCUMM_SAVELOAD_H +#define SCUMM_SAVELOAD_H #include "common/scummsys.h" #include <stddef.h> diff --git a/engines/scumm/script.h b/engines/scumm/script.h index 5655d164f5..776c5276a7 100644 --- a/engines/scumm/script.h +++ b/engines/scumm/script.h @@ -21,8 +21,8 @@ * */ -#ifndef SCRIPT_H -#define SCRIPT_H +#ifndef SCUMM_SCRIPT_H +#define SCUMM_SCRIPT_H #include "engines/engine.h" diff --git a/engines/scumm/smush/channel.h b/engines/scumm/smush/channel.h index ff81996e6f..37b55030ea 100644 --- a/engines/scumm/smush/channel.h +++ b/engines/scumm/smush/channel.h @@ -20,8 +20,8 @@ * */ -#ifndef SMUSH_CHANNEL_H -#define SMUSH_CHANNEL_H +#ifndef SCUMM_SMUSH_CHANNEL_H +#define SCUMM_SMUSH_CHANNEL_H #include "common/util.h" diff --git a/engines/scumm/smush/chunk.h b/engines/scumm/smush/chunk.h index fbb0194fff..f88f9d37a2 100644 --- a/engines/scumm/smush/chunk.h +++ b/engines/scumm/smush/chunk.h @@ -20,8 +20,8 @@ * */ -#ifndef CHUNK_H -#define CHUNK_H +#ifndef SCUMM_SMUSH_CHUNK_H +#define SCUMM_SMUSH_CHUNK_H #include "common/scummsys.h" #include "common/str.h" diff --git a/engines/scumm/smush/codec37.h b/engines/scumm/smush/codec37.h index 10b371143d..6ad3e6b72e 100644 --- a/engines/scumm/smush/codec37.h +++ b/engines/scumm/smush/codec37.h @@ -20,8 +20,8 @@ * */ -#ifndef SMUSH_CODEC37_H -#define SMUSH_CODEC37_H +#ifndef SCUMM_SMUSH_CODEC37_H +#define SCUMM_SMUSH_CODEC37_H #include "common/scummsys.h" diff --git a/engines/scumm/smush/codec47.h b/engines/scumm/smush/codec47.h index 017f518e7e..ccb4b4ccfd 100644 --- a/engines/scumm/smush/codec47.h +++ b/engines/scumm/smush/codec47.h @@ -20,8 +20,8 @@ * */ -#ifndef SMUSH_CODEC_47_H -#define SMUSH_CODEC_47_H +#ifndef SCUMM_SMUSH_CODEC_47_H +#define SCUMM_SMUSH_CODEC_47_H #include "common/scummsys.h" diff --git a/engines/scumm/smush/smush_font.h b/engines/scumm/smush/smush_font.h index 65bee940c2..6e38f0b31f 100644 --- a/engines/scumm/smush/smush_font.h +++ b/engines/scumm/smush/smush_font.h @@ -20,8 +20,8 @@ * */ -#ifndef SMUSH_FONT_H -#define SMUSH_FONT_H +#ifndef SCUMM_SMUSH_FONT_H +#define SCUMM_SMUSH_FONT_H #include "common/scummsys.h" #include "scumm/nut_renderer.h" diff --git a/engines/scumm/smush/smush_mixer.h b/engines/scumm/smush/smush_mixer.h index 05e33b6a8f..456c2b4203 100644 --- a/engines/scumm/smush/smush_mixer.h +++ b/engines/scumm/smush/smush_mixer.h @@ -20,8 +20,8 @@ * */ -#ifndef SMUSH_MIXER_H -#define SMUSH_MIXER_H +#ifndef SCUMM_SMUSH_MIXER_H +#define SCUMM_SMUSH_MIXER_H #include "common/stdafx.h" #include "scumm/sound.h" diff --git a/engines/scumm/smush/smush_player.h b/engines/scumm/smush/smush_player.h index a10ddd2fd4..64240e5216 100644 --- a/engines/scumm/smush/smush_player.h +++ b/engines/scumm/smush/smush_player.h @@ -20,8 +20,8 @@ * */ -#if !defined(SMUSH_PLAYER_H) && !defined(DISABLE_SCUMM_7_8) -#define SMUSH_PLAYER_H +#if !defined(SCUMM_SMUSH_PLAYER_H) && !defined(DISABLE_SCUMM_7_8) +#define SCUMM_SMUSH_PLAYER_H #include "common/util.h" #include "scumm/smush/chunk.h" diff --git a/engines/scumm/usage_bits.h b/engines/scumm/usage_bits.h index 36fd7cc610..55154e3793 100644 --- a/engines/scumm/usage_bits.h +++ b/engines/scumm/usage_bits.h @@ -20,8 +20,8 @@ * */ -#ifndef USAGE_BITS_H -#define USAGE_BITS_H +#ifndef SCUMM_USAGE_BITS_H +#define SCUMM_USAGE_BITS_H namespace Scumm { diff --git a/engines/scumm/verbs.h b/engines/scumm/verbs.h index 87cf7f3955..46ef502cba 100644 --- a/engines/scumm/verbs.h +++ b/engines/scumm/verbs.h @@ -19,8 +19,8 @@ * $Id$ */ -#ifndef VERBS_H -#define VERBS_H +#ifndef SCUMM_VERBS_H +#define SCUMM_VERBS_H #include "common/scummsys.h" #include "common/rect.h" |