Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16835/src
Modified Files:
defaults.c input.c newwin.c
Log Message:
Compile fixes with SOUND undefined.
Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- newwin.c 29 Nov 2006 12:40:22 -0000 1.44
+++ newwin.c 30 Nov 2006 11:28:57 -0000 1.45
@@ -1002,6 +1002,7 @@
getResources (progname);
}
+#if defined(SOUND)
/******************************************************************************/
/*** newsoundwin() - Need to map it after reset_defaults, so pulled out of newwin
/******************************************************************************/
@@ -1026,6 +1027,7 @@
W_DefineArrowCursor(soundWin);
}
}
+#endif
/******************************************************************************/
/*** mapAll()
Index: input.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/input.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- input.c 29 Nov 2006 15:09:35 -0000 1.17
+++ input.c 30 Nov 2006 11:28:57 -0000 1.18
@@ -2849,7 +2849,7 @@
#ifdef SOUND
ChangeVolume (1);
#else
- emptykey ();
+ emptyKey ();
#endif
}
Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- defaults.c 29 Nov 2006 15:01:33 -0000 1.33
+++ defaults.c 30 Nov 2006 11:28:56 -0000 1.34
@@ -665,12 +665,14 @@
NULL
}
},
+#ifdef SOUND
{"sound", &sound_init, RC_BOOL,
{
"Enable sound",
NULL
}
},
+#endif
{"theirPhaserShrink", &theirPhaserShrink, RC_INT,
{
"Shrink enemy phaser by x/16 of its length",
@@ -2062,7 +2064,8 @@
fputs (str, fp);
if (saveBig)
fputs ("\n", fp);
-
+
+#ifdef SOUND
// sound directory
if (sounddir != NULL)
{
@@ -2073,7 +2076,8 @@
if (saveBig)
fputs ("\n", fp);
}
-
+#endif
+
// metacache
if (metaCache != NULL)
{