[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.355,1.356 akos.h,1.38,1.39 cursor.cpp,2.40,2.41 input.cpp,2.30,2.31 logic_he.h,2.8,2.9 resource.cpp,1.325,1.326 resource_v7he.h,1.13,1.14 script_v6.cpp,1.437,1.438 scumm.cpp,1.512,1.513 sound.cpp,1.461,1.462 vars.cpp,1.137,1.138 wiz_he.h,2.21,2.22
Eugene Sandulenko
sev at users.sourceforge.net
Sat May 14 16:29:06 CEST 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4183/scumm
Modified Files:
actor.cpp akos.h cursor.cpp input.cpp logic_he.h resource.cpp
resource_v7he.h script_v6.cpp scumm.cpp sound.cpp vars.cpp
wiz_he.h
Log Message:
Improvements to --disable-* stuff. Now less ugly #ifdefs with #includes.
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -d -r1.355 -r1.356
--- actor.cpp 14 May 2005 22:56:38 -0000 1.355
+++ actor.cpp 14 May 2005 23:28:21 -0000 1.356
@@ -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;
Index: akos.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- akos.h 1 May 2005 14:21:58 -0000 1.38
+++ akos.h 14 May 2005 23:28:21 -0000 1.39
@@ -20,7 +20,7 @@
*
*/
-#ifndef AKOS_H
+#if !defined(AKOS_H) && !defined(DISABLE_SCUMM_7_8)
#define AKOS_H
#include "scumm/base-costume.h"
Index: cursor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/cursor.cpp,v
retrieving revision 2.40
retrieving revision 2.41
diff -u -d -r2.40 -r2.41
--- cursor.cpp 14 May 2005 22:56:38 -0000 2.40
+++ cursor.cpp 14 May 2005 23:28:21 -0000 2.41
@@ -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 {
Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/input.cpp,v
retrieving revision 2.30
retrieving revision 2.31
diff -u -d -r2.30 -r2.31
--- input.cpp 14 May 2005 22:56:38 -0000 2.30
+++ input.cpp 14 May 2005 23:28:21 -0000 2.31
@@ -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
Index: logic_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/logic_he.h,v
retrieving revision 2.8
retrieving revision 2.9
diff -u -d -r2.8 -r2.9
--- logic_he.h 14 May 2005 01:28:02 -0000 2.8
+++ logic_he.h 14 May 2005 23:28:21 -0000 2.9
@@ -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 @@
};
} // End of namespace Scumm
+
+#endif
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -d -r1.325 -r1.326
--- resource.cpp 14 May 2005 22:56:39 -0000 1.325
+++ resource.cpp 14 May 2005 23:28:21 -0000 1.326
@@ -256,6 +256,7 @@
char buf[128];
if (_version == 8) {
+#ifndef DISABLE_SCUMM_7_8
char result;
_imuseDigital->stopAllSounds();
@@ -270,6 +271,7 @@
if (!result) {
error("Cannot find file: '%s'", filename);
}
+#endif
} else {
sprintf(buf, "Cannot find file: '%s'", filename);
InfoDialog dialog(this, (char*)buf);
Index: resource_v7he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v7he.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- resource_v7he.h 10 May 2005 22:56:10 -0000 1.13
+++ resource_v7he.h 14 May 2005 23:28:21 -0000 1.14
@@ -23,7 +23,7 @@
*
*/
-#ifndef RESOURCE_V7HE_H
+#if !defined(RESOURCE_V7HE_H) && !defined(DISABLE_HE)
#define RESOURCE_V7HE_H
namespace Scumm {
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -d -r1.437 -r1.438
--- script_v6.cpp 14 May 2005 22:56:39 -0000 1.437
+++ script_v6.cpp 14 May 2005 23:28:21 -0000 1.438
@@ -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)
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.512
retrieving revision 1.513
diff -u -d -r1.512 -r1.513
--- scumm.cpp 14 May 2005 22:56:39 -0000 1.512
+++ scumm.cpp 14 May 2005 23:28:21 -0000 1.513
@@ -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
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -d -r1.461 -r1.462
--- sound.cpp 14 May 2005 22:56:39 -0000 1.461
+++ sound.cpp 14 May 2005 23:28:21 -0000 1.462
@@ -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"
Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- vars.cpp 14 May 2005 22:56:41 -0000 1.137
+++ vars.cpp 14 May 2005 23:28:21 -0000 1.138
@@ -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 {
Index: wiz_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.h,v
retrieving revision 2.21
retrieving revision 2.22
diff -u -d -r2.21 -r2.22
--- wiz_he.h 7 May 2005 07:57:59 -0000 2.21
+++ wiz_he.h 14 May 2005 23:28:21 -0000 2.22
@@ -20,7 +20,7 @@
*
*/
-#ifndef WIZ_HE_H
+#if !defined(WIZ_HE_H) && !defined(DISABLE_HE)
#define WIZ_HE_H
#include "common/rect.h"
More information about the Scummvm-git-logs
mailing list