svn commit: r475878 - head/games/scorched3d/files

[Tobias Kortkamp]

Author: tobik
Date: Mon Jul 30 10:07:28 2018
New Revision: 475878
URL: https://svnweb.freebsd.org/changeset/ports/475878

Log:
  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

Added:
  head/games/scorched3d/files/patch-src_common_weapons_AccessoryStore.cpp   (contents, props changed)

Added: head/games/scorched3d/files/patch-src_common_weapons_AccessoryStore.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/scorched3d/files/patch-src_common_weapons_AccessoryStore.cpp	Mon Jul 30 10:07:28 2018	(r475878)
@@ -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);