SCI: cleanup

svn-id: r40959

5 files changed, 62 insertions, 64 deletions

diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index 31d5dc722c..ca759b6315 100644
--- a/engines/sci/engine/kernel.cpp
+++ b/engines/sci/engine/kernel.cpp
@@ -34,6 +34,9 @@
 namespace Sci {
 
 
+/** The string used to identify the "unknown" SCI0 function for each game */
+#define SCRIPT_UNKNOWN_FUNCTION_STRING "[Unknown]"
+
 enum KernelFunctionType {
 	KF_NEW = 1,
 	KF_NONE = -1, /**< No mapping, but name is known */
diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp
index e1772926d7..f575afa573 100644
--- a/engines/sci/engine/kmisc.cpp
+++ b/engines/sci/engine/kmisc.cpp
@@ -248,12 +248,7 @@ reg_t kstub(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 }
 
 reg_t kNOP(EngineState *s, int funct_nr, int argc, reg_t *argv) {
-	warning("Kernel function 0x%02x invoked: unmapped", funct_nr);
-
-	if (s->_kfuncTable[funct_nr].orig_name != SCRIPT_UNKNOWN_FUNCTION_STRING) {
-		warning(" (but its name is known to be %s)", s->_kfuncTable[funct_nr].orig_name.c_str());
-	}
-
+	warning("Kernel function 0x%02x (%s) invoked: unmapped", funct_nr, s->_kfuncTable[funct_nr].orig_name.c_str());
 	return NULL_REG;
 }
 
diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp
index 684b007042..78b27794a6 100644
--- a/engines/sci/engine/ksound.cpp
+++ b/engines/sci/engine/ksound.cpp
@@ -34,57 +34,63 @@
 
 namespace Sci {
 
-#define _K_SCI0_SOUND_INIT_HANDLE 0
-#define _K_SCI0_SOUND_PLAY_HANDLE 1
-#define _K_SCI0_SOUND_NOP 2
-#define _K_SCI0_SOUND_DISPOSE_HANDLE 3
-#define _K_SCI0_SOUND_MUTE_SOUND 4
-#define _K_SCI0_SOUND_STOP_HANDLE 5
-#define _K_SCI0_SOUND_SUSPEND_HANDLE 6
-#define _K_SCI0_SOUND_RESUME_HANDLE 7
-#define _K_SCI0_SOUND_VOLUME 8
-#define _K_SCI0_SOUND_UPDATE_VOL_PRI 9
-#define _K_SCI0_SOUND_FADE_HANDLE 10
-#define _K_SCI0_SOUND_GET_POLYPHONY 11
-#define _K_SCI0_SOUND_PLAY_NEXT 12
-
-#define _K_SCI01_SOUND_MASTER_VOLME 0 /* Set/Get */
-#define _K_SCI01_SOUND_MUTE_SOUND 1
-#define _K_SCI01_SOUND_UNUSED 2
-#define _K_SCI01_SOUND_GET_POLYPHONY 3
-#define _K_SCI01_SOUND_UPDATE_HANDLE 4
-#define _K_SCI01_SOUND_INIT_HANDLE 5
-#define _K_SCI01_SOUND_DISPOSE_HANDLE 6
-#define _K_SCI01_SOUND_PLAY_HANDLE 7
-#define _K_SCI01_SOUND_STOP_HANDLE 8
-#define _K_SCI01_SOUND_SUSPEND_HANDLE 9 /* or resume */
-#define _K_SCI01_SOUND_FADE_HANDLE 10
-#define _K_SCI01_SOUND_UPDATE_CUES 11
-#define _K_SCI01_SOUND_MIDI_SEND 12
-#define _K_SCI01_SOUND_REVERB 13 /* Get/Set */
-#define _K_SCI01_SOUND_HOLD 14
-
-#define _K_SCI1_SOUND_MASTER_VOLME 0 /* Set/Get */
-#define _K_SCI1_SOUND_MUTE_SOUND 1
-#define _K_SCI1_SOUND_UNUSED1 2
-#define _K_SCI1_SOUND_GET_POLYPHONY 3
-#define _K_SCI1_SOUND_GET_AUDIO_CAPABILITY 4
-#define _K_SCI1_SOUND_SUSPEND_SOUND 5
-#define _K_SCI1_SOUND_INIT_HANDLE 6
-#define _K_SCI1_SOUND_DISPOSE_HANDLE 7
-#define _K_SCI1_SOUND_PLAY_HANDLE 8
-#define _K_SCI1_SOUND_STOP_HANDLE 9
-#define _K_SCI1_SOUND_SUSPEND_HANDLE 10 /* or resume */
-#define _K_SCI1_SOUND_FADE_HANDLE 11
-#define _K_SCI1_SOUND_HOLD_HANDLE 12
-#define _K_SCI1_SOUND_UNUSED2 13
-#define _K_SCI1_SOUND_SET_HANDLE_VOLUME 14
-#define _K_SCI1_SOUND_SET_HANDLE_PRIORITY 15
-#define _K_SCI1_SOUND_SET_HANDLE_LOOP 16
-#define _K_SCI1_SOUND_UPDATE_CUES 17
-#define _K_SCI1_SOUND_MIDI_SEND 18
-#define _K_SCI1_SOUND_REVERB 19 /* Get/Set */
-#define _K_SCI1_SOUND_UPDATE_VOL_PRI 20
+enum {
+	_K_SCI0_SOUND_INIT_HANDLE = 0,
+	_K_SCI0_SOUND_PLAY_HANDLE = 1,
+	_K_SCI0_SOUND_NOP = 2,
+	_K_SCI0_SOUND_DISPOSE_HANDLE = 3,
+	_K_SCI0_SOUND_MUTE_SOUND = 4,
+	_K_SCI0_SOUND_STOP_HANDLE = 5,
+	_K_SCI0_SOUND_SUSPEND_HANDLE = 6,
+	_K_SCI0_SOUND_RESUME_HANDLE = 7,
+	_K_SCI0_SOUND_VOLUME = 8,
+	_K_SCI0_SOUND_UPDATE_VOL_PRI = 9,
+	_K_SCI0_SOUND_FADE_HANDLE = 10,
+	_K_SCI0_SOUND_GET_POLYPHONY = 11,
+	_K_SCI0_SOUND_PLAY_NEXT = 12
+};
+
+enum {
+	_K_SCI01_SOUND_MASTER_VOLME = 0, /* Set/Get */
+	_K_SCI01_SOUND_MUTE_SOUND = 1,
+	_K_SCI01_SOUND_UNUSED = 2,
+	_K_SCI01_SOUND_GET_POLYPHONY = 3,
+	_K_SCI01_SOUND_UPDATE_HANDLE = 4,
+	_K_SCI01_SOUND_INIT_HANDLE = 5,
+	_K_SCI01_SOUND_DISPOSE_HANDLE = 6,
+	_K_SCI01_SOUND_PLAY_HANDLE = 7,
+	_K_SCI01_SOUND_STOP_HANDLE = 8,
+	_K_SCI01_SOUND_SUSPEND_HANDLE = 9, /* or resume */
+	_K_SCI01_SOUND_FADE_HANDLE = 10,
+	_K_SCI01_SOUND_UPDATE_CUES = 11,
+	_K_SCI01_SOUND_MIDI_SEND = 12,
+	_K_SCI01_SOUND_REVERB = 13, /* Get/Set */
+	_K_SCI01_SOUND_HOLD = 14
+};
+
+enum {
+	_K_SCI1_SOUND_MASTER_VOLME = 0, /* Set/Get */
+	_K_SCI1_SOUND_MUTE_SOUND = 1,
+	_K_SCI1_SOUND_UNUSED1 = 2,
+	_K_SCI1_SOUND_GET_POLYPHONY = 3,
+	_K_SCI1_SOUND_GET_AUDIO_CAPABILITY = 4,
+	_K_SCI1_SOUND_SUSPEND_SOUND = 5,
+	_K_SCI1_SOUND_INIT_HANDLE = 6,
+	_K_SCI1_SOUND_DISPOSE_HANDLE = 7,
+	_K_SCI1_SOUND_PLAY_HANDLE = 8,
+	_K_SCI1_SOUND_STOP_HANDLE = 9,
+	_K_SCI1_SOUND_SUSPEND_HANDLE = 10, /* or resume */
+	_K_SCI1_SOUND_FADE_HANDLE = 11,
+	_K_SCI1_SOUND_HOLD_HANDLE = 12,
+	_K_SCI1_SOUND_UNUSED2 = 13,
+	_K_SCI1_SOUND_SET_HANDLE_VOLUME = 14,
+	_K_SCI1_SOUND_SET_HANDLE_PRIORITY = 15,
+	_K_SCI1_SOUND_SET_HANDLE_LOOP = 16,
+	_K_SCI1_SOUND_UPDATE_CUES = 17,
+	_K_SCI1_SOUND_MIDI_SEND = 18,
+	_K_SCI1_SOUND_REVERB = 19, /* Get/Set */
+	_K_SCI1_SOUND_UPDATE_VOL_PRI = 20
+};
 
 enum AudioCommands {
 	// TODO: find the difference between kSci1AudioWPlay and kSci1AudioPlay
@@ -110,7 +116,7 @@ enum AudioSyncCommands {
 
 #define FROBNICATE_HANDLE(reg) ((reg).segment << 16 | (reg).offset)
 #define DEFROBNICATE_HANDLE(handle) (make_reg((handle >> 16) & 0xffff, handle & 0xffff))
-#define SCRIPT_ASSERT_ZERO(fun) if (fun) script_debug_flag = script_error_flag = 1;
+#define SCRIPT_ASSERT_ZERO(fun) do { if (fun) script_debug_flag = script_error_flag = 1; } while(0)
 
 
 static void script_set_priority(EngineState *s, reg_t obj, int priority) {
diff --git a/engines/sci/engine/sciconsole.cpp b/engines/sci/engine/sciconsole.cpp
index 38027ce184..7332a22193 100644
--- a/engines/sci/engine/sciconsole.cpp
+++ b/engines/sci/engine/sciconsole.cpp
@@ -34,8 +34,6 @@
 
 namespace Sci {
 
-#ifdef SCI_CONSOLE
-
 // console commands
 
 static int c_list(EngineState *s, const Common::Array<cmd_param_t> &cmdParams); // lists various types of things
@@ -919,6 +917,4 @@ static int c_hexgrep(EngineState *s, const Common::Array<cmd_param_t> &cmdParams
 	return 0;
 }
 
-#endif // SCI_CONSOLE
-
 } // End of namespace Sci
diff --git a/engines/sci/engine/sciconsole.h b/engines/sci/engine/sciconsole.h
index b2060143aa..96a3d71608 100644
--- a/engines/sci/engine/sciconsole.h
+++ b/engines/sci/engine/sciconsole.h
@@ -38,8 +38,6 @@
 #include "sci/engine/state.h"
 #include "sci/engine/vm_types.h"
 
-#define SCI_CONSOLE
-
 namespace Sci {
 
 struct gfx_pixmap_t;