tAdded sounds to the RPM distribution, and added them to the default (hard-coded) configuration. - vaccinewars - be a doctor and try to vaccinate the world
 (HTM) git clone git://src.adamsgaard.dk/vaccinewars
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit adf0340af1e8b9c23bb4d5663e17583cddeac706
 (DIR) parent 97e4605be82012ed3216485964edba2f90df1bea
 (HTM) Author: Ben Webb <ben@salilab.org>
       Date:   Thu, 17 Oct 2002 10:14:44 +0000
       
       Added sounds to the RPM distribution, and added them to the default
       (hard-coded) configuration.
       
       
       Diffstat:
         M dopewars.spec                       |      12 ++++++++++++
         M src/dopewars.c                      |       6 ++++--
       
       2 files changed, 16 insertions(+), 2 deletions(-)
       ---
 (DIR) diff --git a/dopewars.spec b/dopewars.spec
       t@@ -70,6 +70,18 @@ test "$RPM_BUILD_ROOT" != "/" && rm -rf ${RPM_BUILD_ROOT}
        %{_datadir}/pixmaps/dopewars-pill.png
        %{_datadir}/pixmaps/dopewars-weed.png
        %{_datadir}/pixmaps/dopewars-shot.png
       +%{_datadir}/dopewars/bye.wav
       +%{_datadir}/dopewars/colt.wav
       +%{_datadir}/dopewars/die.wav
       +%{_datadir}/dopewars/gun.wav
       +%{_datadir}/dopewars/jet.wav
       +%{_datadir}/dopewars/losebitch.wav
       +%{_datadir}/dopewars/message.wav
       +%{_datadir}/dopewars/murmur.wav
       +%{_datadir}/dopewars/punch.wav
       +%{_datadir}/dopewars/run.wav
       +%{_datadir}/dopewars/shotdown.wav
       +%{_datadir}/dopewars/train.wav
        
        %files esd
        %defattr(-,root,root)
 (DIR) diff --git a/src/dopewars.c b/src/dopewars.c
       t@@ -93,7 +93,11 @@ gboolean MinToSysTray = TRUE;
        gboolean Daemonize = TRUE;
        #endif
        
       +#ifdef CYGWIN
        #define SNDPATH "sounds\\19.5degs\\"
       +#else
       +#define SNDPATH DPDATADIR"/dopewars/"
       +#endif
        
        gchar *WebBrowser = NULL;
        gint ConfigErrors = 0;
       t@@ -2429,7 +2433,6 @@ static void SetupParameters(GSList *extraconfigs, gboolean antique)
          AssignName(&BindAddress, "");
          AssignName(&WebBrowser, "/usr/bin/mozilla");
        
       -#ifdef CYGWIN
          AssignName(&Sounds.FightHit, SNDPATH"colt.wav");
          AssignName(&Sounds.EnemyBitchKilled, SNDPATH"shotdown.wav");
          AssignName(&Sounds.BitchKilled, SNDPATH"losebitch.wav");
       t@@ -2441,7 +2444,6 @@ static void SetupParameters(GSList *extraconfigs, gboolean antique)
          AssignName(&Sounds.TalkPrivate, SNDPATH"murmur.wav");
          AssignName(&Sounds.TalkToAll, SNDPATH"message.wav");
          AssignName(&Sounds.EndGame, SNDPATH"bye.wav");
       -#endif
        
          LoanSharkLoc = DEFLOANSHARK;
          BankLoc = DEFBANK;