r10757 - packages/trunk/zaz/debian/patches

[Miriam Ruiz]

Author: miriam
Date: 2010-01-30 14:36:51 +0000 (Sat, 30 Jan 2010)
New Revision: 10757

Modified:
   packages/trunk/zaz/debian/patches/no_music.patch
Log:
Fix patch



Modified: packages/trunk/zaz/debian/patches/no_music.patch
===================================================================
--- packages/trunk/zaz/debian/patches/no_music.patch	2010-01-30 13:57:57 UTC (rev 10756)
+++ packages/trunk/zaz/debian/patches/no_music.patch	2010-01-30 14:36:51 UTC (rev 10757)
@@ -39,3 +39,28 @@
  
          CenterMsg(_("quality assurance:"), 28, font, 0.08);
          CenterMsg(_("Kinga Dybka"), 25.5, font, 0.1);
+--- a/src/game.cpp
++++ b/src/game.cpp
+@@ -235,7 +235,7 @@ const string Game::getRandomMusic()
+     }
+     else
+     {
+-        ERR("No music files installed");
++        //ERR("No music files installed");
+     }
+     return string(phname);
+ }
+--- a/src/streamingoggsample.cpp
++++ b/src/streamingoggsample.cpp
+@@ -30,7 +30,10 @@ StreamingOggSample::StreamingOggSample(c
+     inphile = fopen(settings.getCFilename (filename), "rb");
+     if (inphile == NULL)
+     {
+-        ERR("Could not open " + filename);
++        //ERR("Could not open " + filename);
++        channels = 0;
++        length = 0;
++        return;
+     }
+ 
+     if (ov_open_callbacks(inphile, &vf, NULL, 0, OV_CALLBACKS_NOCLOSE) < 0)