Update to my latest local tree. Various stuff - and a fixme hack by khalek to stop loom intro crashing.

svn-id: r3765

1 files changed, 11 insertions, 1 deletions

diff --git a/scumm.h b/scumm.h
index 36fa6005ab..200836ea59 100644
--- a/scumm.h
+++ b/scumm.h
@@ -53,12 +53,20 @@ enum {
     KEY_SET_OPTIONS = 3456 // WinCE
 };
 
+/* Sound output type - MIDI */
 enum {
 	MIDI_NULL = 0,
 	MIDI_WINDOWS = 1,
 	MIDI_TIMIDITY = 2,
 	MIDI_SEQ = 3,
-	MIDI_QTMUSIC = 4
+	MIDI_QTMUSIC = 4,	
+};
+
+/* Script status type (slot.status) */
+enum {
+	ssDead = 0,
+	ssPaused = 1,
+	ssRunning = 2
 };
 
 const uint16 many_direction_tab[18] = {
@@ -2283,6 +2291,8 @@ struct Serializer {
 
 	bool isSaving() { return _saveOrLoad; }
 
+
+
 	bool Serializer::checkEOFLoadStream();
 
 };