[Stratagus-CVS] stratagus/src action/action_repair.c action/act...

[Jimmy Salmon]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Jimmy Salmon <address@hidden>   03/11/07 16:21:13

Modified files:
        src/action     : action_repair.c action_resource.c 
        src/clone      : clone.c 
        src/include    : sound.h 

Log message:
        Cleanup for without sound

Patches:
Index: stratagus/src/action/action_repair.c
diff -u stratagus/src/action/action_repair.c:1.56 
stratagus/src/action/action_repair.c:1.57
--- stratagus/src/action/action_repair.c:1.56   Fri Oct 31 01:18:55 2003
+++ stratagus/src/action/action_repair.c        Fri Nov  7 16:21:11 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: action_repair.c,v 1.56 2003/10/31 06:18:55 jsalmon3 Exp $
+//     $Id: action_repair.c,v 1.57 2003/11/07 21:21:11 jsalmon3 Exp $
 
 //@{
 
@@ -65,11 +65,9 @@
 
     flags = UnitShowAnimation(unit, repair);
 
-#ifdef WITH_SOUND
     if ((flags & AnimationSound)) {
        PlayUnitSound(unit, VoiceRepairing);
     }
-#endif
 }
 
 /**
Index: stratagus/src/action/action_resource.c
diff -u stratagus/src/action/action_resource.c:1.65 
stratagus/src/action/action_resource.c:1.66
--- stratagus/src/action/action_resource.c:1.65 Fri Nov  7 15:51:26 2003
+++ stratagus/src/action/action_resource.c      Fri Nov  7 16:21:12 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: action_resource.c,v 1.65 2003/11/07 20:51:26 nehalmistry Exp $
+//     $Id: action_resource.c,v 1.66 2003/11/07 21:21:12 jsalmon3 Exp $
 
 //@{
 
@@ -269,11 +269,9 @@
        DebugCheck(!unit->Type->Animations->Harvest[unit->CurrentResource]);
        flags = UnitShowAnimation(unit,
            unit->Type->Animations->Harvest[unit->CurrentResource]);
-#ifdef WITH_SOUND
-       if ((flags & AnimationSound) && UnitVisibleOnMap(unit)) {
+       if ((flags & AnimationSound) && (UnitVisibleOnMap(unit) || 
ReplayRevealMap)) {
            PlayUnitSound(unit, VoiceHarvesting);
        }
-#endif
     }
 }
 
Index: stratagus/src/clone/clone.c
diff -u stratagus/src/clone/clone.c:1.220 stratagus/src/clone/clone.c:1.221
--- stratagus/src/clone/clone.c:1.220   Sat Nov  1 06:33:31 2003
+++ stratagus/src/clone/clone.c Fri Nov  7 16:21:13 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: clone.c,v 1.220 2003/11/01 11:33:31 pludov Exp $
+//     $Id: clone.c,v 1.221 2003/11/07 21:21:13 jsalmon3 Exp $
 
 //@{
 
@@ -1085,7 +1085,6 @@
            NetPlayers = 0;
 
            // Start new music for menus
-#ifdef WITH_SOUND
            if (PlayingMusic && strcmp(CurrentMusicFile, MenuMusic)) {
                StopMusic();
            }
@@ -1093,7 +1092,7 @@
            if (!PlayingMusic && MenuMusic) {
                PlayMusic(MenuMusic);
            }
-#endif
+
            EnableRedraw = RedrawMenu;
 
            GuiGameStarted = 0;
Index: stratagus/src/include/sound.h
diff -u stratagus/src/include/sound.h:1.48 stratagus/src/include/sound.h:1.49
--- stratagus/src/include/sound.h:1.48  Sat Nov  1 23:20:38 2003
+++ stratagus/src/include/sound.h       Fri Nov  7 16:21:13 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: sound.h,v 1.48 2003/11/02 04:20:38 jsalmon3 Exp $
+//     $Id: sound.h,v 1.49 2003/11/07 21:21:13 jsalmon3 Exp $
 
 #ifndef __SOUND_H__
 #define __SOUND_H__
@@ -169,6 +169,7 @@
 
 #define SoundOff       1               /// Dummy macro for without sound
 #define PlayingMusic   1               /// Dummy macro for without sound
+#define CurrentMusicFile ""            /// Dummy macro for without sound
 
 #define PlayUnitSound(u,g)             /// Dummy macro for without sound
 #define PlayMissileSound(s,v)          /// Dummy macro for without sound