[netrek-cvs] client/netrekxp/include data.h, 1.6, 1.7 proto.h, 1.7, 1.8

[Bill Balcerski]

Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21311/include

Modified Files:
	data.h proto.h 
Log Message:
Instead of a #define SDL, changed it to always load in as I couldn't imagine ever wanting to distribute the client without this option enabled.  Instead, I'm using a netrekrc option, newSound, to let user choose whether to use the new SDL sound system or the old way.

Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- data.h	21 Apr 2006 12:00:06 -0000	1.6
+++ data.h	24 Apr 2006 15:30:37 -0000	1.7
@@ -621,4 +621,6 @@
 
 extern int richText;    /* temporary variable to enable/disable rich text windows */
 
+extern int newSound;	/* Use new SDL sound interface */
+
 #endif /* _h_data */

Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- proto.h	24 Apr 2006 14:13:25 -0000	1.7
+++ proto.h	24 Apr 2006 15:30:37 -0000	1.8
@@ -1089,7 +1089,7 @@
      extern void Abort_Sound (int type);
      extern void soundwindow (void);
 //static void soundrefresh(int i);
-#if defined(SOUND) && !defined(HAVE_SDL)
+#if defined(SOUND)
      void soundaction (W_Event * data);
 #endif
      extern void sounddone (void);