libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-31 16:03:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improvements to --disable-* stuff. Now less ugly #ifdefs with #includes.

Browse Source 
svn-id: r18100
This commit is contained in:
Eugene Sandulenko 2005-05-14 23:28:22 +00:00
parent 3588b96d4f
commit 80ee8188d3
16 changed files with 30 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/scaler.cpp
View File

@ -103,10 +103,8 @@ void InitScalers(uint32 BitFormat) {
InitLUT(BitFormat);
}
#ifdef DISABLE_HQ_SCALERS
void InitLUT(uint32 BitFormat) {}
#else
void InitLUT(uint32 BitFormat) {
#ifndef DISABLE_HQ_SCALERS
int r, g, b;
int Y, u, v;
int gInc, gShift;
@ -133,8 +131,8 @@ void InitLUT(uint32 BitFormat) {
}
}
}
}
#endif
}
/**
* Trivial 'scaler' - in fact it doesn't do any scaling but just copies the

5
scumm/actor.cpp
View File

@ -23,6 +23,7 @@
#include "stdafx.h"
#include "scumm/scumm.h"
#include "scumm/actor.h"
#include "scumm/akos.h"
#include "scumm/boxes.h"
#include "scumm/charset.h"
#include "scumm/costume.h"
@ -35,10 +36,6 @@
#include "scumm/util.h"
#include "scumm/wiz_he.h"
#ifndef DISABLE_SCUMM_7_8
#include "scumm/akos.h"
#endif
namespace Scumm {
byte Actor::kInvalidBox = 0;

2
scumm/akos.h
View File

@ -20,7 +20,7 @@
*
*/
#ifndef AKOS_H
#if !defined(AKOS_H) && !defined(DISABLE_SCUMM_7_8)
#define AKOS_H
#include "scumm/base-costume.h"

7
scumm/cursor.cpp
View File

@ -22,16 +22,13 @@
#include "stdafx.h"
#include "common/system.h"
#include "common/util.h"
#include "scumm/bomp.h"
#include "scumm/charset.h"
#include "scumm/intern.h"
#include "scumm/object.h"
#include "scumm/resource_v7he.h"
#include "scumm/saveload.h"
#include "scumm/scumm.h"
#include "scumm/bomp.h"
#ifndef DISABLE_HE
#include "scumm/resource_v7he.h"
#endif
namespace Scumm {

2
scumm/imuse_digi/dimuse.h
View File

@ -18,7 +18,7 @@
* $Header$
*/
#ifndef IMUSE_DIGI_H
#if !defined(IMUSE_DIGI_H) && !defined(DISABLE_SCUMM_7_8)
#define IMUSE_DIGI_H
#include "common/scummsys.h"

10
scumm/input.cpp
View File

@ -30,18 +30,12 @@
#include "scumm/debugger.h"
#include "scumm/dialogs.h"
#include "scumm/insane/insane.h"
#include "scumm/imuse.h"
#include "scumm/logic_he.h"
#include "scumm/scumm.h"
#include "scumm/sound.h"
#ifndef DISABLE_SCUMM_7_8
#include "scumm/insane/insane.h"
#endif
#ifndef DISABLE_HE
#include "scumm/logic_he.h"
#endif
#ifdef _WIN32_WCE
#define KEY_ALL_SKIP 3457

2
scumm/insane/insane.h
View File

@ -19,7 +19,7 @@
*
*/
#ifndef INSANE_H
#if !defined(INSANE_H) && !defined(DISABLE_SCUMM_7_8)
#define INSANE_H
#include "base/engine.h"

5
scumm/logic_he.h
View File

@ -19,6 +19,9 @@
*
*/
#if !defined(LOGIC_HE_H) && !defined(DISABLE_HE)
#define LOGIC_HE_H
#include "stdafx.h"
#include "scumm/intern.h"
@ -105,3 +108,5 @@ private:
};
} // End of namespace Scumm
#endif

2
scumm/resource.cpp
View File

@ -256,6 +256,7 @@ void ScummEngine::askForDisk(const char *filename, int disknum) {
char buf[128];
if (_version == 8) {
#ifndef DISABLE_SCUMM_7_8
char result;
_imuseDigital->stopAllSounds();
@ -270,6 +271,7 @@ void ScummEngine::askForDisk(const char *filename, int disknum) {
if (!result) {
error("Cannot find file: '%s'", filename);
}
#endif
} else {
sprintf(buf, "Cannot find file: '%s'", filename);
InfoDialog dialog(this, (char*)buf);

2
scumm/resource_v7he.h
View File

@ -23,7 +23,7 @@
*
*/
#ifndef RESOURCE_V7HE_H
#if !defined(RESOURCE_V7HE_H) && !defined(DISABLE_HE)
#define RESOURCE_V7HE_H
namespace Scumm {

9
scumm/script_v6.cpp
View File

@ -28,10 +28,13 @@
#include "scumm/actor.h"
#include "scumm/charset.h"
#include "scumm/imuse.h"
#include "scumm/imuse_digi/dimuse.h"
#include "scumm/insane/insane.h"
#include "scumm/intern.h"
#include "scumm/object.h"
#include "scumm/resource.h"
#include "scumm/scumm.h"
#include "scumm/smush/smush_player.h"
#include "scumm/sound.h"
#include "scumm/util.h"
#include "scumm/verbs.h"
@ -39,12 +42,6 @@
#include "sound/mididrv.h"
#include "sound/mixer.h"
#ifndef DISABLE_SCUMM_7_8
#include "scumm/imuse_digi/dimuse.h"
#include "scumm/insane/insane.h"
#include "scumm/smush/smush_player.h"
#endif
namespace Scumm {
#define OPCODE(x) _OPCODE(ScummEngine_v6, x)

16
scumm/scumm.cpp
View File

@ -34,32 +34,26 @@
#include "gui/message.h"
#include "gui/newgui.h"
#include "scumm/akos.h"
#include "scumm/charset.h"
#include "scumm/costume.h"
#include "scumm/debugger.h"
#include "scumm/dialogs.h"
#include "scumm/imuse.h"
#include "scumm/imuse_digi/dimuse.h"
#include "scumm/insane/insane.h"
#include "scumm/intern.h"
#include "scumm/logic_he.h"
#include "scumm/player_nes.h"
#include "scumm/player_v1.h"
#include "scumm/player_v2.h"
#include "scumm/player_v2a.h"
#include "scumm/player_v3a.h"
#include "scumm/resource_v7he.h"
#include "scumm/sound.h"
#include "scumm/scumm.h"
#include "scumm/util.h"
#ifndef DISABLE_HE
#include "scumm/logic_he.h"
#include "scumm/resource_v7he.h"
#endif
#ifndef DISABLE_SCUMM_7_8
#include "scumm/akos.h"
#include "scumm/imuse_digi/dimuse.h"
#include "scumm/insane/insane.h"
#endif
#ifdef __PALM_OS__
#include "extras/palm-scumm-md5.h"
#else

2
scumm/smush/smush_player.h
View File

@ -19,7 +19,7 @@
*
*/
#ifndef SMUSH_PLAYER_H
#if !defined(SMUSH_PLAYER_H) && !defined(DISABLE_SCUMM_7_8)
#define SMUSH_PLAYER_H
#include "common/util.h"

5
scumm/sound.cpp
View File

@ -23,15 +23,12 @@
#include "stdafx.h"
#include "scumm/actor.h"
#include "scumm/imuse.h"
#include "scumm/imuse_digi/dimuse.h"
#include "scumm/scumm.h"
#include "scumm/saveload.h"
#include "scumm/sound.h"
#include "scumm/util.h"
#ifndef DISABLE_SCUMM_7_8
#include "scumm/imuse_digi/dimuse.h"
#endif
#include "common/config-manager.h"
#include "common/timer.h"
#include "common/util.h"

5
scumm/vars.cpp
View File

@ -25,11 +25,8 @@
#include "common/config-manager.h"
#include "scumm/scumm.h"
#include "scumm/intern.h"
#include "sound/mididrv.h"
#ifndef DISABLE_HE
#include "scumm/logic_he.h"
#endif
#include "sound/mididrv.h"
namespace Scumm {

2
scumm/wiz_he.h
View File

@ -20,7 +20,7 @@
*
*/
#ifndef WIZ_HE_H
#if !defined(WIZ_HE_H) && !defined(DISABLE_HE)
#define WIZ_HE_H
#include "common/rect.h"