diff options
-rw-r--r-- | scumm/imuse_player.cpp | 1 | ||||
-rw-r--r-- | scumm/midiparser_eup.cpp | 1 | ||||
-rw-r--r-- | scumm/midiparser_ro.cpp | 1 | ||||
-rw-r--r-- | scumm/nut_renderer.cpp | 1 | ||||
-rw-r--r-- | scumm/palette.cpp | 1 | ||||
-rw-r--r-- | scumm/palette_he.cpp | 1 | ||||
-rw-r--r-- | scumm/player_v1.cpp | 1 | ||||
-rw-r--r-- | scumm/resource_v3.cpp | 1 | ||||
-rw-r--r-- | scumm/room.cpp | 2 | ||||
-rw-r--r-- | scumm/script_v100he.cpp | 1 | ||||
-rw-r--r-- | scumm/script_v6.cpp | 1 | ||||
-rw-r--r-- | scumm/script_v6he.cpp | 1 | ||||
-rw-r--r-- | scumm/script_v7he.cpp | 1 | ||||
-rw-r--r-- | scumm/script_v80he.cpp | 1 | ||||
-rw-r--r-- | scumm/script_v90he.cpp | 1 | ||||
-rw-r--r-- | scumm/vars.cpp | 1 |
16 files changed, 0 insertions, 17 deletions
diff --git a/scumm/imuse_player.cpp b/scumm/imuse_player.cpp index 6dbcdd66b4..8d2fc62982 100644 --- a/scumm/imuse_player.cpp +++ b/scumm/imuse_player.cpp @@ -30,7 +30,6 @@ #include "sound/midiparser.h" - namespace Scumm { //////////////////////////////////////// diff --git a/scumm/midiparser_eup.cpp b/scumm/midiparser_eup.cpp index 5e9280d240..3d06b05f2c 100644 --- a/scumm/midiparser_eup.cpp +++ b/scumm/midiparser_eup.cpp @@ -24,7 +24,6 @@ #include "sound/mididrv.h" #include "common/util.h" - namespace Scumm { /** diff --git a/scumm/midiparser_ro.cpp b/scumm/midiparser_ro.cpp index 650c449247..bca7524da3 100644 --- a/scumm/midiparser_ro.cpp +++ b/scumm/midiparser_ro.cpp @@ -24,7 +24,6 @@ #include "sound/mididrv.h" #include "common/util.h" - namespace Scumm { ////////////////////////////////////////////////// diff --git a/scumm/nut_renderer.cpp b/scumm/nut_renderer.cpp index d8b6ed0d79..6ecd4a01c0 100644 --- a/scumm/nut_renderer.cpp +++ b/scumm/nut_renderer.cpp @@ -24,7 +24,6 @@ #include "scumm/bomp.h" #include "scumm/util.h" - namespace Scumm { NutRenderer::NutRenderer(ScummEngine *vm) : diff --git a/scumm/palette.cpp b/scumm/palette.cpp index f1a49819d0..0fa200c231 100644 --- a/scumm/palette.cpp +++ b/scumm/palette.cpp @@ -28,7 +28,6 @@ #include "scumm/resource.h" #include "scumm/util.h" - namespace Scumm { void ScummEngine::setupC64Palette() { diff --git a/scumm/palette_he.cpp b/scumm/palette_he.cpp index 929481191a..6b0520549f 100644 --- a/scumm/palette_he.cpp +++ b/scumm/palette_he.cpp @@ -27,7 +27,6 @@ #include "scumm/resource.h" #include "scumm/util.h" - namespace Scumm { void ScummEngine_v70he::remapHEPalette(const uint8 *src, uint8 *dst) { diff --git a/scumm/player_v1.cpp b/scumm/player_v1.cpp index 0ca5c7af46..6f57b9eb99 100644 --- a/scumm/player_v1.cpp +++ b/scumm/player_v1.cpp @@ -33,7 +33,6 @@ namespace Scumm { #define TIMER_BASE_FREQ 1193000 #define FIXP_SHIFT 16 - Player_V1::Player_V1(ScummEngine *scumm, bool pcjr) : Player_V2(scumm, pcjr) { // Initialize channel code for (int i = 0; i < 4; ++i) diff --git a/scumm/resource_v3.cpp b/scumm/resource_v3.cpp index 4ce8e21efd..f143992ffa 100644 --- a/scumm/resource_v3.cpp +++ b/scumm/resource_v3.cpp @@ -29,7 +29,6 @@ namespace Scumm { extern const char *resTypeFromId(int id); - void ScummEngine_v3old::readResTypeList(int id, uint32 tag, const char *name) { int num; int i; diff --git a/scumm/room.cpp b/scumm/room.cpp index 1b30e54225..37d9b7ff6d 100644 --- a/scumm/room.cpp +++ b/scumm/room.cpp @@ -31,10 +31,8 @@ #include "scumm/sound.h" #include "scumm/util.h" - namespace Scumm { - /** * Start a 'scene' by loading the specified room with the given main actor. * The actor is placed next to the object indicated by objectNr. diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp index 7f79436ff0..302d891181 100644 --- a/scumm/script_v100he.cpp +++ b/scumm/script_v100he.cpp @@ -20,7 +20,6 @@ * */ - #include "common/stdafx.h" #include "common/config-manager.h" diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 34648bac5b..601471eefc 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -20,7 +20,6 @@ * */ - #include "common/stdafx.h" #include "common/config-manager.h" diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp index 57b897d993..fed4828704 100644 --- a/scumm/script_v6he.cpp +++ b/scumm/script_v6he.cpp @@ -20,7 +20,6 @@ * */ - #include "common/stdafx.h" #include "common/config-manager.h" diff --git a/scumm/script_v7he.cpp b/scumm/script_v7he.cpp index 2467e30e6a..99ef7c0157 100644 --- a/scumm/script_v7he.cpp +++ b/scumm/script_v7he.cpp @@ -20,7 +20,6 @@ * */ - #include "common/stdafx.h" #include "common/config-manager.h" diff --git a/scumm/script_v80he.cpp b/scumm/script_v80he.cpp index f10316d663..91cfc947c5 100644 --- a/scumm/script_v80he.cpp +++ b/scumm/script_v80he.cpp @@ -20,7 +20,6 @@ * */ - #include "common/stdafx.h" #include "common/config-file.h" diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp index 828ff7d287..44dec17984 100644 --- a/scumm/script_v90he.cpp +++ b/scumm/script_v90he.cpp @@ -20,7 +20,6 @@ * */ - #include "common/stdafx.h" #include "common/config-manager.h" diff --git a/scumm/vars.cpp b/scumm/vars.cpp index d48ad18276..b2c90ea405 100644 --- a/scumm/vars.cpp +++ b/scumm/vars.cpp @@ -20,7 +20,6 @@ * */ - #include "common/stdafx.h" #include "common/config-manager.h" #include "scumm/scumm.h" |