[Scummvm-cvs-logs] SF.net SVN: scummvm: [28616] scummvm/trunk/engines/agi

[buddha_ at users.sourceforge.net]

Revision: 28616
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28616&view=rev
Author:   buddha_
Date:     2007-08-14 06:36:03 -0700 (Tue, 14 Aug 2007)

Log Message:
-----------
Shuffled around AgiGameID's declaration and an include to get stuff hopefully working now with GCC too.

Modified Paths:
--------------
    scummvm/trunk/engines/agi/agi.h
    scummvm/trunk/engines/agi/sound.h

Modified: scummvm/trunk/engines/agi/agi.h
===================================================================
--- scummvm/trunk/engines/agi/agi.h	2007-08-14 13:12:06 UTC (rev 28615)
+++ scummvm/trunk/engines/agi/agi.h	2007-08-14 13:36:03 UTC (rev 28616)
@@ -88,6 +88,26 @@
 #define ADD_PIC 1
 #define ADD_VIEW 2
 
+enum AgiGameID {
+	GID_AGIDEMO,
+	GID_BC,
+	GID_DDP,
+	GID_GOLDRUSH,
+	GID_KQ1,
+	GID_KQ2,
+	GID_KQ3,
+	GID_KQ4,
+	GID_LSL1,
+	GID_MH1,
+	GID_MH2,
+	GID_MIXEDUP,
+	GID_PQ1,
+	GID_SQ1,
+	GID_SQ2,
+	GID_XMASCARD,
+	GID_FANMADE		// TODO: Should this be extended to include all fanmade games?
+};
+
 } // End of namespace Agi
 
 /* AGI resources */
@@ -116,26 +136,6 @@
 	GF_ESCPAUSE =	 (1 << 8)
 };
 
-enum AgiGameID {
-	GID_AGIDEMO,
-	GID_BC,
-	GID_DDP,
-	GID_GOLDRUSH,
-	GID_KQ1,
-	GID_KQ2,
-	GID_KQ3,
-	GID_KQ4,
-	GID_LSL1,
-	GID_MH1,
-	GID_MH2,
-	GID_MIXEDUP,
-	GID_PQ1,
-	GID_SQ1,
-	GID_SQ2,
-	GID_XMASCARD,
-	GID_FANMADE		// TODO: Should this be extended to include all fanmade games?
-};
-
 struct AGIGameDescription;
 
 enum {

Modified: scummvm/trunk/engines/agi/sound.h
===================================================================
--- scummvm/trunk/engines/agi/sound.h	2007-08-14 13:12:06 UTC (rev 28615)
+++ scummvm/trunk/engines/agi/sound.h	2007-08-14 13:36:03 UTC (rev 28616)
@@ -26,13 +26,12 @@
 #ifndef AGI_SOUND_H
 #define AGI_SOUND_H
 
+#include "agi/agi.h"
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
 
 namespace Agi {
 
-enum AgiGameID; // Forward declaration because agi.h has this but includes sound.h first
-
 #define BUFFER_SIZE	410
 
 #define SOUND_EMU_NONE	0


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.