The following commit has been merged in the master branch:
commit 46ea2ad19547f9a96f7f26733da520ce56281c4d
Author: Ansgar Burchardt <[email protected]>
Date: Mon Dec 15 00:06:52 2008 +0100
Apply upstream fix for power-bridges on vertical slopes (Closes: #507307)
diff --git a/debian/changelog b/debian/changelog
index 6ed251c..34cd446 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ simutrans (100.0+ds1-4) UNRELEASED; urgency=low
* debian/rules: Remove `configure' target
* debian/control: Add `Depends: ${misc:Depends}' for simutrans-data
and simutrans-makeobj.
+ * Apply upstream fix for power-bridges on vertical slopes
+ (Closes: #507307)
-- Ansgar Burchardt <[email protected]> Sat, 23 Aug 2008 02:05:35 +0200
diff --git a/debian/patches/fix-power-bridges-on-vertical-slopes.patch
b/debian/patches/fix-power-bridges-on-vertical-slopes.patch
new file mode 100644
index 0000000..f229f39
--- /dev/null
+++ b/debian/patches/fix-power-bridges-on-vertical-slopes.patch
@@ -0,0 +1,28 @@
+From 4a2dbb8f6be0b9b6a73b4118618a3eeaafa05798 Mon Sep 17 00:00:00 2001
+From: prissi <pri...@8aca7d54-2c30-db11-9de9-000461428c89>
+Date: Mon, 21 Jul 2008 20:41:38 +0000
+Subject: [PATCH] FIX: power bridges on vertical slopes
+
+Changes to makeobj/Makefile and simtruans/history.txt omitted, other changes
as in SVN rev. 1929.
+
+git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/tr...@1929
8aca7d54-2c30-db11-9de9-000461428c89
+---
+ bauer/brueckenbauer.cc | 5 +++++
+ makeobj/Makefile | 23 ++++++++++++++---------
+ simutrans/history.txt | 1 +
+ 3 files changed, 20 insertions(+), 9 deletions(-)
+
+--- simutrans.orig/bauer/brueckenbauer.cc
++++ simutrans/bauer/brueckenbauer.cc
+@@ -455,6 +455,11 @@
+ gr->calc_bild();
+ } else {
+ leitung_t *lt = gr->gib_leitung();
++ if( lt==NULL ) {
++ lt = new leitung_t( welt, end, sp );
++ spieler_t::accounting(sp,
-wegbauer_t::leitung_besch->gib_preis(), gr->gib_pos().gib_2d(),
COST_CONSTRUCTION);
++ gr->obj_add(lt);
++ }
+ lt->calc_neighbourhood();
+ }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index af77259..06016ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ fix_casts.diff
01_png.patch
02_makeobj_fixes.patch
03_makeobj_cleanup.patch
+fix-power-bridges-on-vertical-slopes.patch
--
transportation simulator
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
