aboutsummaryrefslogtreecommitdiffstats
path: root/games
diff options
context:
space:
mode:
authortobik <tobik@FreeBSD.org>2018-07-30 18:07:28 +0800
committertobik <tobik@FreeBSD.org>2018-07-30 18:07:28 +0800
commitf509f8f3869dce7e923ea7584204e96b01617430 (patch)
tree698c7f6be8aab9dfdff453450ac8f009bf889e5a /games
parent2006f20d978883dfd9832ae8a2ae922a7c00c801 (diff)
downloadfreebsd-ports-gnome-f509f8f3869dce7e923ea7584204e96b01617430.tar.gz
freebsd-ports-gnome-f509f8f3869dce7e923ea7584204e96b01617430.tar.zst
freebsd-ports-gnome-f509f8f3869dce7e923ea7584204e96b01617430.zip
games/scorched3d: Fix build on 12.0-CURRENT
../../common/weapons/AccessoryStore.cpp:158:64: error: cannot initialize return object of type 'AccessoryPart *' with an rvalue of type 'bool' if (!currentNode->getNamedParameter("type", typeNode)) return false; ^~~~~ http://beefy12.nyi.freebsd.org/data/head-amd64-default/p475478_s336801/logs/errors/scorched3d-0.43.3d_11.log
Diffstat (limited to 'games')
-rw-r--r--games/scorched3d/files/patch-src_common_weapons_AccessoryStore.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/games/scorched3d/files/patch-src_common_weapons_AccessoryStore.cpp b/games/scorched3d/files/patch-src_common_weapons_AccessoryStore.cpp
new file mode 100644
index 000000000000..ed855ce1525b
--- /dev/null
+++ b/games/scorched3d/files/patch-src_common_weapons_AccessoryStore.cpp
@@ -0,0 +1,15 @@
+../../common/weapons/AccessoryStore.cpp:158:64: error: cannot initialize return object of type 'AccessoryPart *' with an rvalue of type 'bool'
+ if (!currentNode->getNamedParameter("type", typeNode)) return false;
+ ^~~~~
+
+--- src/common/weapons/AccessoryStore.cpp.orig 2018-07-30 09:52:29 UTC
++++ src/common/weapons/AccessoryStore.cpp
+@@ -155,7 +155,7 @@ AccessoryPart *AccessoryStore::createAccessoryPart(
+ Accessory *parent, XMLNode *currentNode)
+ {
+ XMLNode *typeNode = 0;
+- if (!currentNode->getNamedParameter("type", typeNode)) return false;
++ if (!currentNode->getNamedParameter("type", typeNode)) return 0;
+
+ AccessoryPart *accessoryPart =
+ AccessoryMetaRegistration::getNewAccessory(typeNode->getContent(), this);