Pointers and 0 are not ordered.

4 files changed, 49 insertions, 1 deletions

diff --git a/games/flightgear/distinfo b/games/flightgear/distinfo
index 38629f714d7..7ff5859f6f8 100644
--- a/games/flightgear/distinfo
+++ b/games/flightgear/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2016/05/07 09:56:57 joerg Exp $
+$NetBSD: distinfo,v 1.8 2017/02/08 00:03:30 joerg Exp $
 
 SHA1 (flightgear-2.8.0.tar.bz2) = fee4b2f1f6aca8e163ea018ae9897b99971c20bd
 RMD160 (flightgear-2.8.0.tar.bz2) = 97d8f572aeb186bfed27eb5b06803a0fa5213a61
@@ -7,6 +7,9 @@ Size (flightgear-2.8.0.tar.bz2) = 2311023 bytes
 SHA1 (patch-CMakeModules_FindPLIB_cmake) = c5761d425743761f5f0c711ef2ca384a06f6d524
 SHA1 (patch-src_Canvas_ShivaVG_src_shConfig_h) = bd70a1e41a59196e31789e38ec67e65cef546edf
 SHA1 (patch-src_Canvas_ShivaVG_src_shDefs.h) = a71c8f03ccf871cda5bcc4c80a34a2df55c38b37
+SHA1 (patch-src_FDM_JSBSim_FGFDMExec.cpp) = 251d84aa2cfdd854f5b3061bbb5cff4ad382f5a8
+SHA1 (patch-src_FDM_JSBSim_input__output_FGScript.cpp) = e683fecdc1d01df3029c1d23923c3d63145ce29b
+SHA1 (patch-src_FDM_JSBSim_models_FGInput.cpp) = fa044c54b02c39857b5df183f183c04fdc2e2b11
 SHA1 (patch-src_FDM_JSBSim_models_propulsion_FGEngine.cpp) = 9c066364096452868194f84d8c853131aec83f80
 SHA1 (patch-src_Main_locale_cxx) = 327f4103ff3aea60f2394a2ed192c5f6af36f60b
 SHA1 (patch-src_Network_ATC-Inputs_cxx) = 08644c682ddddcefea48aa84fa538b8fd20289c0
diff --git a/games/flightgear/patches/patch-src_FDM_JSBSim_FGFDMExec.cpp b/games/flightgear/patches/patch-src_FDM_JSBSim_FGFDMExec.cpp
new file mode 100644
index 00000000000..cd73e4a45fa
--- /dev/null
+++ b/games/flightgear/patches/patch-src_FDM_JSBSim_FGFDMExec.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_FDM_JSBSim_FGFDMExec.cpp,v 1.1 2017/02/08 00:03:30 joerg Exp $
+
+--- src/FDM/JSBSim/FGFDMExec.cpp.orig	2017-01-09 15:19:01.104940701 +0000
++++ src/FDM/JSBSim/FGFDMExec.cpp
+@@ -188,7 +188,7 @@ FGFDMExec::~FGFDMExec()
+ 
+   PropertyCatalog.clear();
+ 
+-  if (FDMctr > 0) (*FDMctr)--;
++  if (FDMctr) (*FDMctr)--;
+ 
+   Debug(1);
+ }
diff --git a/games/flightgear/patches/patch-src_FDM_JSBSim_input__output_FGScript.cpp b/games/flightgear/patches/patch-src_FDM_JSBSim_input__output_FGScript.cpp
new file mode 100644
index 00000000000..d699ee9ff82
--- /dev/null
+++ b/games/flightgear/patches/patch-src_FDM_JSBSim_input__output_FGScript.cpp
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_FDM_JSBSim_input__output_FGScript.cpp,v 1.1 2017/02/08 00:03:30 joerg Exp $
+
+--- src/FDM/JSBSim/input_output/FGScript.cpp.orig	2017-01-09 15:19:43.879132741 +0000
++++ src/FDM/JSBSim/input_output/FGScript.cpp
+@@ -185,12 +185,12 @@ bool FGScript::LoadScript(string script,
+   }
+ 
+   // Now, read input spec if given.
+-  if (input_element > 0) {
++  if (input_element) {
+     FDMExec->GetInput()->Load(input_element);
+   }
+ 
+   // Now, read output spec if given.
+-  if (output_element > 0) {
++  if (output_element) {
+     string output_file = output_element->GetAttributeValue("file");
+     if (output_file.empty()) {
+       cerr << "No logging directives file was specified." << endl;
diff --git a/games/flightgear/patches/patch-src_FDM_JSBSim_models_FGInput.cpp b/games/flightgear/patches/patch-src_FDM_JSBSim_models_FGInput.cpp
new file mode 100644
index 00000000000..f4d972d5615
--- /dev/null
+++ b/games/flightgear/patches/patch-src_FDM_JSBSim_models_FGInput.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_FDM_JSBSim_models_FGInput.cpp,v 1.1 2017/02/08 00:03:30 joerg Exp $
+
+--- src/FDM/JSBSim/models/FGInput.cpp.orig	2017-01-09 15:20:24.952109589 +0000
++++ src/FDM/JSBSim/models/FGInput.cpp
+@@ -161,7 +161,7 @@ bool FGInput::Run(bool Holding)
+           } else {
+             socket->Reply("Must be in HOLD to search properties\n");
+           }
+-        } else if (node > 0) {
++        } else if (node) {
+           ostringstream buf;
+           buf << argument << " = " << setw(12) << setprecision(6) << node->getDoubleValue() << endl;
+           socket->Reply(buf.str());