This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository caveexpress.
commit 94cb821cdfd5a71dadfafd89a7cd81d0560735da Author: Markus Koschany <[email protected]> Date: Thu Dec 8 21:58:11 2016 +0100 Add map-second-ice-04.patch. Closes: #847147 Thanks: Guillaume Allais for the report. --- debian/patches/map-second-ice-04.patch | 49 ++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 50 insertions(+) diff --git a/debian/patches/map-second-ice-04.patch b/debian/patches/map-second-ice-04.patch new file mode 100644 index 0000000..4c8a1d2 --- /dev/null +++ b/debian/patches/map-second-ice-04.patch @@ -0,0 +1,49 @@ +From: Markus Koschany <[email protected]> +Date: Thu, 8 Dec 2016 21:57:10 +0100 +Subject: map second ice 04 + +Fix map second ice 04 never spawns any package + +Debian-Bug: https://bugs.debian.org/847147 +Origin: https://github.com/mgerhardy/caveexpress/commit/dd7adb41e26bab8dcfa8ee9ef65cd7175d9a0367 +--- + src/caveexpress/server/entities/Water.h | 5 +++++ + src/caveexpress/server/map/Map.cpp | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/caveexpress/server/entities/Water.h b/src/caveexpress/server/entities/Water.h +index b9c3c0a..fb05f68 100644 +--- a/src/caveexpress/server/entities/Water.h ++++ b/src/caveexpress/server/entities/Water.h +@@ -44,6 +44,7 @@ public: + + // will return true if this map will at some point rise the water + bool isWaterRisingEnabled () const; ++ bool isWaterFallingEnabled () const; + bool isWaterChangeOver () const; + + void createBody (float waterHeight); +@@ -73,6 +74,10 @@ inline bool Water::isWaterRisingEnabled () const + return _waterChangeSpeed > 0.00001f; + } + ++inline bool Water::isWaterFallingEnabled () const { ++ return _waterFallingTime > 0; ++} ++ + inline bool Water::isWaterChangeOver () const + { + return _time > _waterRisingTime && _time > _waterFallingTime; +diff --git a/src/caveexpress/server/map/Map.cpp b/src/caveexpress/server/map/Map.cpp +index 6996557..4c946d6 100644 +--- a/src/caveexpress/server/map/Map.cpp ++++ b/src/caveexpress/server/map/Map.cpp +@@ -610,7 +610,7 @@ bool Map::load (const std::string& name) + } + + const CaveMapTile* highestCave = nullptr; +- if (isWaterRising()) ++ if (isWaterRising() && !_water->isWaterFallingEnabled()) + highestCave = getHighestCave(); + + // do another loop when we have all caves - we have to know each of the caves in order to initialize them properly diff --git a/debian/patches/series b/debian/patches/series index b401e6c..654d6bc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ use-system-Box2D.patch desktop-file.patch dataDir.patch man-page-spelling.patch +map-second-ice-04.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/caveexpress.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
