r9888 - in packages/trunk/micropolis-activity/debian: . patches
Christoph Egger
christoph-guest at alioth.debian.org
Wed Jun 24 20:56:11 UTC 2009
Author: christoph-guest
Date: 2009-06-24 20:56:11 +0000 (Wed, 24 Jun 2009)
New Revision: 9888
Added:
packages/trunk/micropolis-activity/debian/patches/fix-crash.patch
Modified:
packages/trunk/micropolis-activity/debian/changelog
packages/trunk/micropolis-activity/debian/control
packages/trunk/micropolis-activity/debian/patches/series
Log:
Importing fix for #522529 as provided on the bugtracker
Modified: packages/trunk/micropolis-activity/debian/changelog
===================================================================
--- packages/trunk/micropolis-activity/debian/changelog 2009-06-24 12:59:23 UTC (rev 9887)
+++ packages/trunk/micropolis-activity/debian/changelog 2009-06-24 20:56:11 UTC (rev 9888)
@@ -1,3 +1,12 @@
+micropolis-activity (0.0.20071228-2) unstable; urgency=low
+
+ * Fix crash when loading the game (Closes: #522529)
+ Thanks to "Ying-Chun Liu (PaulLiu)" <grandpaul at gmail.com> for the patch
+ * Bump Standards Version (No changes needed)
+ * Add myself to uploaders
+
+ -- Christoph Egger <debian at christoph-egger.org> Wed, 24 Jun 2009 22:47:01 +0200
+
micropolis-activity (0.0.20071228-1) unstable; urgency=low
[ Miriam Ruiz ]
Modified: packages/trunk/micropolis-activity/debian/control
===================================================================
--- packages/trunk/micropolis-activity/debian/control 2009-06-24 12:59:23 UTC (rev 9887)
+++ packages/trunk/micropolis-activity/debian/control 2009-06-24 20:56:11 UTC (rev 9888)
@@ -2,9 +2,12 @@
Section: games
Priority: extra
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Kenshi Muto <kmuto at debian.org>, Clint Adams <schizo at debian.org>
+Uploaders: Miriam Ruiz <little_miry at yahoo.es>,
+ Kenshi Muto <kmuto at debian.org>,
+ Clint Adams <schizo at debian.org>,
+ Christoph Egger <debian at christoph-egger.org>
Build-Depends: debhelper (>= 5), quilt, libx11-dev, libxpm-dev, bison, x11proto-xext-dev, libxext-dev
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
Homepage: http://www.donhopkins.com/home/micropolis/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/micropolis-activity/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/micropolis-activity/?op=log
Added: packages/trunk/micropolis-activity/debian/patches/fix-crash.patch
===================================================================
--- packages/trunk/micropolis-activity/debian/patches/fix-crash.patch (rev 0)
+++ packages/trunk/micropolis-activity/debian/patches/fix-crash.patch 2009-06-24 20:56:11 UTC (rev 9888)
@@ -0,0 +1,201 @@
+Index: micropolis-activity-0.0.20071228/src/sim/s_sim.c
+===================================================================
+--- micropolis-activity-0.0.20071228.orig/src/sim/s_sim.c 2009-06-25 01:41:18.396541888 +0800
++++ micropolis-activity-0.0.20071228/src/sim/s_sim.c 2009-06-25 01:43:23.328537760 +0800
+@@ -1024,18 +1024,18 @@
+ RepairZone(POWERPLANT, 4); /* post */
+ PushPowerStack();
+ CoalSmoke(SMapX, SMapY);
+- return;
++ return 0;
+
+ case NUCLEAR:
+ if (!NoDisasters && !Rand(MltdwnTab[GameLevel])) {
+ DoMeltdown(SMapX, SMapY);
+- return;
++ return 0;
+ }
+ NuclearPop++;
+ if (!(CityTime & 7))
+ RepairZone(NUCLEAR, 4); /* post */
+ PushPowerStack();
+- return;
++ return 0;
+
+ case FIRESTATION:
+ FireStPop++;
+@@ -1051,7 +1051,7 @@
+ z = z >>1; /* post FD's need roads */
+
+ FireStMap[SMapX >>3][SMapY >>3] += z;
+- return;
++ return 0;
+
+ case POLICESTATION:
+ PolicePop++;
+@@ -1067,7 +1067,7 @@
+ z = z >>1; /* post PD's need roads */
+
+ PoliceMap[SMapX >>3][SMapY >>3] += z;
+- return;
++ return 0;
+
+ case STADIUM:
+ StadiumPop++;
+@@ -1079,13 +1079,13 @@
+ Map[SMapX + 1][SMapY] = FOOTBALLGAME1 + ANIMBIT;
+ Map[SMapX + 1][SMapY + 1] = FOOTBALLGAME2 + ANIMBIT;
+ }
+- return;
++ return 0;
+
+ case FULLSTADIUM:
+ StadiumPop++;
+ if (!((CityTime + SMapX + SMapY) & 7)) /* post release */
+ DrawStadium(STADIUM);
+- return;
++ return 0;
+
+ case AIRPORT:
+ APortPop++;
+@@ -1100,7 +1100,7 @@
+
+ if (PwrOn)
+ DoAirport();
+- return;
++ return 0;
+
+ case PORT:
+ PortPop++;
+@@ -1111,8 +1111,9 @@
+ (GetSprite(SHI) == NULL)) {
+ GenerateShip();
+ }
+- return;
++ return 0;
+ }
++ return 0;
+ }
+
+
+Index: micropolis-activity-0.0.20071228/src/sim/s_zone.c
+===================================================================
+--- micropolis-activity-0.0.20071228.orig/src/sim/s_zone.c 2009-06-25 01:41:15.496540968 +0800
++++ micropolis-activity-0.0.20071228/src/sim/s_zone.c 2009-06-25 01:42:55.080538167 +0800
+@@ -75,22 +75,22 @@
+
+ if (CChr9 > PORTBASE) { /* do Special Zones */
+ DoSPZone(ZonePwrFlg);
+- return;
++ return 0;
+ }
+ if (CChr9 < HOSPITAL) {
+ DoResidential(ZonePwrFlg);
+- return;
++ return 0;
+ }
+ if (CChr9 < COMBASE) {
+ DoHospChur();
+- return;
++ return 0;
+ }
+ if (CChr9 < INDBASE) {
+ DoCommercial(ZonePwrFlg);
+- return;
++ return 0;
+ }
+ DoIndustrial(ZonePwrFlg);
+- return;
++ return 0;
+ }
+
+
+@@ -110,6 +110,7 @@
+ if (!Rand(20))
+ ZonePlop(RESBASE);
+ }
++ return 0;
+ }
+
+
+@@ -171,7 +172,7 @@
+
+ if (TrfGood == -1) {
+ DoIndOut(tpop, Rand16() & 1);
+- return;
++ return 0;
+ }
+
+ if (!(Rand16() & 7)) {
+@@ -180,12 +181,13 @@
+ if ((zscore > -350) &&
+ (((short)(zscore - 26380)) > ((short)Rand16Signed()))) {
+ DoIndIn(tpop, Rand16() & 1);
+- return;
++ return 0;
+ }
+ if ((zscore < 350) &&
+ (((short)(zscore + 26380)) < ((short)Rand16Signed())))
+ DoIndOut(tpop, Rand16() & 1);
+ }
++ return 0;
+ }
+
+
+@@ -203,7 +205,7 @@
+ if (TrfGood == -1) {
+ value = GetCRVal();
+ DoComOut(tpop, value);
+- return;
++ return 0;
+ }
+
+ if (!(Rand16() & 7)) {
+@@ -216,7 +218,7 @@
+ (((short)(zscore - 26380)) > ((short)Rand16Signed()))) {
+ value = GetCRVal();
+ DoComIn(tpop, value);
+- return;
++ return 0;
+ }
+ if ((zscore < 350) &&
+ (((short)(zscore + 26380)) < ((short)Rand16Signed()))) {
+@@ -224,6 +226,7 @@
+ DoComOut(tpop, value);
+ }
+ }
++ return 0;
+ }
+
+
+@@ -242,7 +245,7 @@
+ if (TrfGood == -1) {
+ value = GetCRVal();
+ DoResOut(tpop, value);
+- return;
++ return 0;
+ }
+
+ if ((CChr9 == FREEZ) || (!(Rand16() & 7))) {
+@@ -254,11 +257,11 @@
+ (((short)(zscore - 26380)) > ((short)Rand16Signed()))) {
+ if ((!tpop) && (!(Rand16() & 3))) {
+ MakeHosp();
+- return;
++ return 0;
+ }
+ value = GetCRVal();
+ DoResIn(tpop, value);
+- return;
++ return 0;
+ }
+ if ((zscore < 350) &&
+ (((short)(zscore + 26380)) < ((short)Rand16Signed()))) {
+@@ -266,6 +269,7 @@
+ DoResOut(tpop, value);
+ }
+ }
++ return 0;
+ }
+
+
Modified: packages/trunk/micropolis-activity/debian/patches/series
===================================================================
--- packages/trunk/micropolis-activity/debian/patches/series 2009-06-24 12:59:23 UTC (rev 9887)
+++ packages/trunk/micropolis-activity/debian/patches/series 2009-06-24 20:56:11 UTC (rev 9888)
@@ -2,3 +2,4 @@
makefile.patch
mac-osx.patch
micropolis-path.patch
+fix-crash.patch
More information about the Pkg-games-commits
mailing list