cataclysm-dda: work around compile error on newer GCC

[Yorick Hardy <yorickhardy%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Sat Sep 29 09:00:58 2018 +0200
Changeset:	3791fa5e65f105161f3bc2d7cdcc77382c0f938f

Modified Files:
	cataclysm-dda/distinfo
Added Files:
	cataclysm-dda/patches/patch-src_mission__start.cpp

Log Message:
cataclysm-dda: work around compile error on newer GCC

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3791fa5e65f105161f3bc2d7cdcc77382c0f938f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cataclysm-dda/distinfo                             |  1 +
 cataclysm-dda/patches/patch-src_mission__start.cpp | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)

diffs:
diff --git a/cataclysm-dda/distinfo b/cataclysm-dda/distinfo
index 5f594b0882..e5b68ca345 100644
--- a/cataclysm-dda/distinfo
+++ b/cataclysm-dda/distinfo
@@ -8,6 +8,7 @@ SHA1 (patch-src_bionics.cpp) = b715ced76ae573b4f1c4053cb8a607ca21c81fa9
 SHA1 (patch-src_crafting.cpp) = eb9ccc4d57b3620127b4c6d5a124a6906e8b12e9
 SHA1 (patch-src_editmap.cpp) = a97da923caf9be218b3f4ae60d60200d8a2f8f1e
 SHA1 (patch-src_line.h) = b551e0ec68e975badd80f23d8db9d4fab151769e
+SHA1 (patch-src_mission__start.cpp) = 20190cd9e49f2f4b45e16192e6409d4aa031f6d8
 SHA1 (patch-src_mod__manager.cpp) = 31b5788af55d43dffa855fa12a22e7a8257e32eb
 SHA1 (patch-src_monattack.cpp) = ac61c07cce58d5a94b934c2574f5e4f0220dfc5d
 SHA1 (patch-src_mondeath.cpp) = 293ab32df372cd024ea78375f4704688a7954332
diff --git a/cataclysm-dda/patches/patch-src_mission__start.cpp b/cataclysm-dda/patches/patch-src_mission__start.cpp
new file mode 100644
index 0000000000..83549dc2ff
--- /dev/null
+++ b/cataclysm-dda/patches/patch-src_mission__start.cpp
@@ -0,0 +1,20 @@
+$NetBSD$
+
+Work around a GCC warning/error, the same change was made upstream
+with additional code style changes.
+
+--- src/mission_start.cpp.orig	2015-03-09 05:25:34.000000000 +0000
++++ src/mission_start.cpp
+@@ -273,9 +273,10 @@ void mission_start::kill_horde_master(mi
+  tile.add_spawn("mon_zombie_dog",3,SEEX,SEEY);
+  if (SEEX > 1 && SEEX < OMAPX && SEEY > 1 && SEEY < OMAPY){
+  for (int x = SEEX - 1; x <= SEEX + 1; x++) {
+-  for (int y = SEEY - 1; y <= SEEY + 1; y++)
++  for (int y = SEEY - 1; y <= SEEY + 1; y++) {
+    tile.add_spawn("mon_zombie",rng(3,10),x,y);
+-   tile.add_spawn("mon_zombie_dog",rng(0,2),SEEX,SEEY);
++  }
++  tile.add_spawn("mon_zombie_dog",rng(0,2),SEEX,SEEY);
+  }
+ }
+  tile.add_spawn("mon_zombie_necro",2,SEEX,SEEY);