[cyphesis-cpp] 04/08: Backport patch for wfmath API change

[Olek Wojnar]

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

olek-guest pushed a commit to branch updates
in repository cyphesis-cpp.

commit 7352dd7db7f34da07914d3d29148e37319dc248c
Author: Olek Wojnar <olek-dev at wojnar.org>
Date:   Tue Aug 30 00:23:27 2016 -0400

    Backport patch for wfmath API change
---
 debian/changelog                                  |  1 +
 debian/patches/series                             |  1 +
 debian/patches/update-for-wfmath-api-change.patch | 28 +++++++++++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 818ff88..7949611 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ cyphesis-cpp (0.6.2-1) unstable; urgency=medium
   * Refresh patches
     -- Remove two superseded patches
     -- Add remove-generated-file.patch
+    -- Add update-for-wfmath-api-change.patch
 
  -- Olek Wojnar <olek-dev at wojnar.org>  Mon, 29 Aug 2016 23:08:14 -0400
 
diff --git a/debian/patches/series b/debian/patches/series
index 1ec5ea5..d1471c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ fix-broken-PythonArithmeticScripttest.patch
 add-missing-man-pages.patch
 do-not-register-with-metaserver.patch
 explicit-integer-instantiation.patch
+update-for-wfmath-api-change.patch
diff --git a/debian/patches/update-for-wfmath-api-change.patch b/debian/patches/update-for-wfmath-api-change.patch
new file mode 100644
index 0000000..99f4aa3
--- /dev/null
+++ b/debian/patches/update-for-wfmath-api-change.patch
@@ -0,0 +1,28 @@
+Description: Backport fix for wfmath API change
+ Will not be needed after Cyphesis 0.6.2
+Origin: https://github.com/worldforge/cyphesis/commit/49c9d83629bbdf60c07101d06155226821d4e989
+Last-Update: 2016-08-29
+
+--- a/rulesets/SpawnerProperty.cpp
++++ b/rulesets/SpawnerProperty.cpp
+@@ -229,9 +229,9 @@
+     WFMath::MTRand& rand = WFMath::MTRand::instance;
+     if (m_mode_external) {
+         //randomize position and rotation
+-        float angle = rand.randf(WFMath::numeric_constants<float>::pi() * 2);
++        float angle = rand.rand<float>() * WFMath::numeric_constants<float>::pi() * 2;
+         //place it between 0 and 2 meters away
+-        float distance = rand.randf(2.0f);
++        float distance = rand.rand<float>() * 2.0f;
+         //if we're solid we should make sure it's not within our own radius
+         if (e->m_location.isSolid()) {
+             distance += e->m_location.radius();
+@@ -259,7 +259,7 @@
+             ::addToEntity(WFMath::Point<3>(x, y, 0), create_arg->modifyPos());
+         }
+     }
+-    float rotation = rand.randf(WFMath::numeric_constants<float>::pi() * 2);
++    float rotation = rand.rand<float>() * WFMath::numeric_constants<float>::pi() * 2;
+     WFMath::Quaternion orientation(WFMath::Vector<3>(0, 0, 1), rotation);
+     create_arg->setAttr("orientation", orientation.toAtlas());
+ 

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