Commit patch queue (exported by git-debrebase)

[git-debrebase make-patches: export and commit patches]

3 files changed, 107 insertions, 0 deletions

diff --git a/debian/patches/0001-Fix-bad-translation.patch b/debian/patches/0001-Fix-bad-translation.patch
new file mode 100644
index 0000000..1b4c491
--- /dev/null
+++ b/debian/patches/0001-Fix-bad-translation.patch
@@ -0,0 +1,21 @@
+From: Mathieu Schroeter <mathieu@schroetersa.ch>
+Date: Mon, 22 Apr 2019 14:06:40 +0200
+Subject: Fix bad translation
+
+---
+ resources/data/en/stories.blp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/resources/data/en/stories.blp b/resources/data/en/stories.blp
+index 4f96ebc..728ec41 100644
+--- a/resources/data/en/stories.blp
++++ b/resources/data/en/stories.blp
+@@ -443,7 +443,7 @@ clicking on each Blupi.
+ 1|Goal:
+ 1|
+ 1|Reach the island in the
+-1|north-east and blow the
++1|north-west and blow the
+ 1|palisade up.
+ 
+ 2|All you have to do now is
diff --git a/debian/patches/0002-Do-not-play-the-win-sound-while-the-win-video-is-pla.patch b/debian/patches/0002-Do-not-play-the-win-sound-while-the-win-video-is-pla.patch
new file mode 100644
index 0000000..71b8dd4
--- /dev/null
+++ b/debian/patches/0002-Do-not-play-the-win-sound-while-the-win-video-is-pla.patch
@@ -0,0 +1,84 @@
+From: Mathieu Schroeter <mathieu@schroetersa.ch>
+Date: Fri, 6 Sep 2019 23:34:55 +0200
+Subject: Do not play the win sound while the win video is playing
+
+The win sound must be played only with the win screens.
+---
+ src/blupi.cxx    | 30 ++++++++++++++++++++++++++----
+ src/decblupi.cxx | 14 +-------------
+ 2 files changed, 27 insertions(+), 17 deletions(-)
+
+diff --git a/src/blupi.cxx b/src/blupi.cxx
+index 5dd9532..e9fe1ec 100644
+--- a/src/blupi.cxx
++++ b/src/blupi.cxx
+@@ -77,10 +77,11 @@ bool        g_restoreMidi = false; // restore music playback based on midi files
+ bool        g_renderQuality = true; // use the best render quality with scaling
+ int         g_settingsOverload = 0;
+ 
+-bool        g_bTermInit = false; // initialisation en cours
+-Uint32      g_lastPhase = 999;
+-RestartMode g_restart   = RestartMode::NO;
+-static bool g_pause;
++bool          g_bTermInit = false; // initialisation en cours
++Uint32        g_lastPhase = 999;
++RestartMode   g_restart   = RestartMode::NO;
++static bool   g_pause;
++static Uint32 g_prevPhase = 0;
+ 
+ #ifdef USE_CURL
+ struct url_data {
+@@ -292,6 +293,27 @@ Update (void)
+       g_pEvent->ChangePhase (EV_PHASE_WINMOVIE); // win
+   }
+ 
++  if (g_prevPhase != phase)
++  {
++    Point pos;
++
++    pos.x = LXIMAGE () / 2;
++    pos.y = LYIMAGE () / 2;
++
++    if (phase == EV_PHASE_LOST)
++    {
++      if (!g_pSound->PlayImage (SOUND_LOST, pos))
++        g_pSound->PlayImage (SOUND_GOAL, pos);
++    }
++    else if (phase == EV_PHASE_WIN || phase == EV_PHASE_LASTWIN)
++    {
++      if (!g_pSound->PlayImage (SOUND_WIN, pos))
++        g_pSound->PlayImage (SOUND_GOAL, pos);
++    }
++  }
++
++  g_prevPhase = phase;
++
+   return display;
+ }
+ 
+diff --git a/src/decblupi.cxx b/src/decblupi.cxx
+index 1475e4a..94fb19f 100644
+--- a/src/decblupi.cxx
++++ b/src/decblupi.cxx
+@@ -4713,20 +4713,8 @@ CDecor::IsTerminated ()
+ delay:
+   m_winCount = count;
+   if (m_winCount == 0)
+-  {
+-    if (out == 1) // perdu ?
+-    {
+-      if (!m_pSound->PlayImage (SOUND_LOST, pos))
+-        m_pSound->PlayImage (SOUND_GOAL, pos);
+-    }
+-    else
+-    {
+-      if (!m_pSound->PlayImage (SOUND_WIN, pos))
+-        m_pSound->PlayImage (SOUND_GOAL, pos);
+-    }
+-
+     return out; // perdu/gagné
+-  }
++
+   m_winCount--;
+   return 0; // continue
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..24461c6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-Fix-bad-translation.patch
+0002-Do-not-play-the-win-sound-while-the-win-video-is-pla.patch