[opentyrian] 03/07: Pick uninitialized-vars.patch from upstream

[Etienne Millon]

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

emillon-guest pushed a commit to branch master
in repository opentyrian.

commit 12e539b48b853b7a11cbe4847cc859bb728075c5
Author: Etienne Millon <me at emillon.org>
Date:   Wed Apr 1 08:23:46 2015 +0200

    Pick uninitialized-vars.patch from upstream
---
 debian/patches/uninitialized-vars.patch | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/debian/patches/uninitialized-vars.patch b/debian/patches/uninitialized-vars.patch
index 28c528e..d51f6b9 100644
--- a/debian/patches/uninitialized-vars.patch
+++ b/debian/patches/uninitialized-vars.patch
@@ -1,10 +1,7 @@
-From: Etienne Millon <me at emillon.org>
-Date: Thu, 13 Feb 2014 19:42:50 +0100
-Subject: Uninitialized variables
+From: Yuri Kunde Schlesner <yuriks at yuriks.net>
+Origin: commit:0a06d5af473ca34d65eae92f4fec45aaa33be6dd
 
-A few variables are undefined accross the sound code, or at least gcc seems to
-find that they are.
-This patch sets them to a reasonable default value.
+Fix several uninitialized variable warnings.
 
 --- a/src/mainint.c
 +++ b/src/mainint.c
@@ -17,20 +14,6 @@ This patch sets them to a reasonable default value.
  				switch (ship_sprite)
  				{
  				case 5:
---- a/src/opl.c
-+++ b/src/opl.c
-@@ -599,7 +599,11 @@
- 
- 
- void adlib_write(Bitu idx, Bit8u val) {
-+#if defined(OPLTYPE_IS_OPL3)
- 	Bit32u second_set = idx&0x100;
-+#else
-+	Bit32u second_set = 0;
-+#endif
- 	adlibreg[idx] = val;
- 
- 	switch (idx&0xf0) {
 --- a/src/shots.c
 +++ b/src/shots.c
 @@ -319,7 +319,7 @@
@@ -38,20 +21,19 @@ This patch sets them to a reasonable default value.
  		soundQueue[soundChannel[bay_i]] = weapon->sound;
  
 -	int shot_id;
-+	int shot_id = 0;
++	int shot_id = MAX_PWEAPON;
  	/*Rot*/
  	for (int multi_i = 1; multi_i <= weapon->multi; multi_i++)
  	{
 --- a/src/tyrian2.c
 +++ b/src/tyrian2.c
-@@ -4325,8 +4325,9 @@
+@@ -4325,8 +4325,8 @@
  
  	case 19: /* Enemy Global Move */
  	{
 -		int initial_i, max_i;
 -		bool all_enemies;
-+		int initial_i = 0;
-+		int max_i = 0;
++		int initial_i = 0, max_i = 0;
 +		bool all_enemies = false;
  
  		if (eventRec[eventLoc-1].eventdat3 > 79 && eventRec[eventLoc-1].eventdat3 < 90)

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