From f509f8f3869dce7e923ea7584204e96b01617430 Mon Sep 17 00:00:00 2001 From: tobik Date: Mon, 30 Jul 2018 10:07:28 +0000 Subject: 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 --- .../files/patch-src_common_weapons_AccessoryStore.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 games/scorched3d/files/patch-src_common_weapons_AccessoryStore.cpp (limited to 'games') 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); -- cgit