[mupen64plus-ui-console] 76/172: Fix loading of cheats with leading zeros in CRC1/2

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-ui-console.

commit 3d588ad5a3d5d18d542bed5ddc3ca71b53c2f753
Author: Sven Eckelmann <sven at narfation.org>
Date:   Thu Sep 22 13:32:56 2011 +0200

    Fix loading of cheats with leading zeros in CRC1/2
---
 debian/changelog                         |  3 +++
 debian/patches/cheat_leading_zeros.patch | 18 ++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 74edc38..f4e8b4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 mupen64plus-ui-console (1.99.4-5) UNRELEASED; urgency=low
 
   * Don't mix implicit and explicit rules to prevent FTBFS with make 3.82
+  * debian/patches:
+    - Add cheat_leading_zeros.patch, Fix loading of cheats with leading zeros in
+      CRC1/2
 
  -- Sven Eckelmann <sven at narfation.org>  Sun, 21 Aug 2011 17:55:08 +0200
 
diff --git a/debian/patches/cheat_leading_zeros.patch b/debian/patches/cheat_leading_zeros.patch
new file mode 100644
index 0000000..285eb69
--- /dev/null
+++ b/debian/patches/cheat_leading_zeros.patch
@@ -0,0 +1,18 @@
+Description: Fix loading of cheats with leading zeros in CRC1/2
+Origin: upstream, https://bitbucket.org/richard42/mupen64plus-ui-console/changeset/5090b105c585
+Author: Sven Eckelmann <sven at narfation.org>
+
+---
+diff --git a/src/cheat.c b/src/cheat.c
+index afc971cf1728aa2235b791523909794ff83771b6..81d6d8742f5c6f85e9d48da5589dff98484095f4 100644
+--- a/src/cheat.c
++++ b/src/cheat.c
+@@ -361,7 +361,7 @@ void CheatStart(eCheatMode CheatMode, char *CheatNumList)
+ 
+     /* generate section name from ROM's CRC and country code */
+     char RomSection[24];
+-    sprintf(RomSection, "%X-%X-C:%X", sl(l_RomHeader.CRC1), sl(l_RomHeader.CRC2), l_RomHeader.Country_code & 0xff);
++    sprintf(RomSection, "%08X-%08X-C:%X", sl(l_RomHeader.CRC1), sl(l_RomHeader.CRC2), l_RomHeader.Country_code & 0xff);
+ 
+     /* parse through the cheat INI file and load up any cheat codes found for this ROM */
+     ReadCheats(RomSection);
diff --git a/debian/patches/series b/debian/patches/series
index 724b713..a12ad75 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 rewrite_makefile.patch
 big_endian_conflict.patch
+cheat_leading_zeros.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-ui-console.git