From 53f7ad34144123661cda1443eebf3e2d7a718a56 Mon Sep 17 00:00:00 2001
From: Rafał Psota <rafalzaq@fedoraproject.org>
Date: Aug 29 2008 23:42:15 +0000
Subject: FONT_ERROR patch (thanks to Michał Bentkowski)


---

diff --git a/blobwars-1.09b2-font_error.patch b/blobwars-1.09b2-font_error.patch
new file mode 100644
index 0000000..4bbd076
--- /dev/null
+++ b/blobwars-1.09b2-font_error.patch
@@ -0,0 +1,49 @@
+diff -u blobwars-1.09b2/src/game.cpp blobwars-1.09b2-new/src/game.cpp
+--- blobwars-1.09b2/src/game.cpp	2008-02-29 19:07:01.000000000 +0100
++++ blobwars-1.09b2-new/src/game.cpp	2008-08-30 00:57:19.000000000 +0200
+@@ -407,8 +407,7 @@
+ 	if (map.totalMIAs > 0)
+ 	{
+ 		graphics.setFontColor(0xff, 0xff, 0xff, 0x00, 0x00, 0x00);
+-		sprintf(message, "%s", _("Rescue %d MIAs"));
+-		sprintf(message, message, map.requiredMIAs);
++		sprintf(message, _("Rescue %d MIAs"), map.requiredMIAs);
+ 		graphics.drawString(message, col1, y, TXT_LEFT, panel);
+ 
+ 		if (map.foundMIAs < map.requiredMIAs)
+diff -u blobwars-1.09b2/src/info.cpp blobwars-1.09b2-new/src/info.cpp
+--- blobwars-1.09b2/src/info.cpp	2008-02-29 19:07:01.000000000 +0100
++++ blobwars-1.09b2-new/src/info.cpp	2008-08-30 01:00:48.000000000 +0200
+@@ -233,8 +233,7 @@
+ 	graphics.drawString(string, col2, y, TXT_LEFT, graphics.screen);
+ 
+ 	graphics.drawString(_("Best Combo"), col1, y += 20, TXT_RIGHT, graphics.screen);
+-	sprintf(string, "%s", _("%d Hits"));
+-	sprintf(string, string, game.maxComboHits);
++	sprintf(string, _("%d Hits"), game.maxComboHits);
+ 	graphics.drawString(string, col2, y, TXT_LEFT, graphics.screen);
+ 
+ 	graphics.drawString(_("++ Inventory ++"), 320, y += 40, TXT_CENTERED, graphics.screen);
+@@ -249,8 +248,7 @@
+ 	if (map.totalMIAs > 0)
+ 	{
+ 		graphics.setFontColor(0xff, 0xff, 0xff, 0x00, 0x00, 0x00);
+-		sprintf(message, "%s", _("Rescue %d MIAs"));
+-		sprintf(message, message, map.requiredMIAs);
++		sprintf(message, _("Rescue %d MIAs"), map.requiredMIAs);
+ 		graphics.drawString(message, col1, y, TXT_RIGHT, graphics.screen);
+ 
+ 		if (map.foundMIAs < map.requiredMIAs)
+diff -u blobwars-1.09b2/src/mission.cpp blobwars-1.09b2-new/src/mission.cpp
+--- blobwars-1.09b2/src/mission.cpp	2008-02-29 19:07:01.000000000 +0100
++++ blobwars-1.09b2-new/src/mission.cpp	2008-08-30 01:00:39.000000000 +0200
+@@ -220,8 +220,7 @@
+ 	if (map.totalMIAs > 0)
+ 	{
+ 		graphics.setFontColor(0xff, 0xff, 0xff, 0x00, 0x00, 0x00);
+-		sprintf(message, "%s", _("Rescue %d MIAs"));
+-		sprintf(message, message, map.requiredMIAs);
++		sprintf(message, _("Rescue %d MIAs"), map.requiredMIAs);
+ 		graphics.drawString(message, col1, y, TXT_RIGHT, graphics.background);
+ 
+ 		if (map.foundMIAs < map.requiredMIAs)
diff --git a/blobwars.spec b/blobwars.spec
index 7330864..6513429 100644
--- a/blobwars.spec
+++ b/blobwars.spec
@@ -1,6 +1,6 @@
 Name:           blobwars
 Version:        1.09b2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Mission and Objective based 2D Platform Game
 Group:          Amusements/Games
 License:        GPLv2+ and Redistributable, no modification permitted
@@ -12,6 +12,7 @@ Source1:        %{name}-%{version}-music.tar.bz2
 Patch0:         blobwars-1.09b2-makefile.patch
 Patch1:         blobwars-1.05-desktop.patch
 #Patch2:         blobwars-1.07-es.patch
+Patch3:         blobwars-1.09b2-font_error.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_mixer-devel SDL_image-devel SDL_ttf-devel zlib-devel
 BuildRequires:  gettext desktop-file-utils
@@ -29,6 +30,7 @@ MIAs as possible.
 %patch0 -p0 -z .makefile
 %patch1 -p1 -z .dsktop
 #%patch2 -p0
+%patch3 -p1 -z .font_error
 
 cp -p *{.xm,.s3m,.mod} music/
 
@@ -75,6 +77,9 @@ fi
 
 
 %changelog
+* Sat Aug 30 2008 Rafał Psota <rafalzaq@gmail.com> 1.09b2-2
+- FONT_ERROR patch (thanks to Michał Bentkowski)
+
 * Fri Aug 29 2008 Rafał Psota <rafalzaq@gmail.com> 1.09b2-1
 - remove nonfree sounds and music