- Fix c++11 compatibility

PR: 222403 Submitted by: rleigh@codelibre.net
svn path=/head/; revision=456025
2017-12-11 12:19:43 +00:00 · 2017-12-11 12:19:43 +00:00 · 69536155cc · 2021-03-31 03:12:20 +00:00
commit 69536155cc
parent b105a3e428
2 changed files with 26 additions and 0 deletions
--- a/games/enigma/files/patch-src_Value.cc
+++ b/games/enigma/files/patch-src_Value.cc
@ -0,0 +1,15 @@
+--- src/Value.cc.orig	2017-09-03 15:39:37 UTC
+++ src/Value.cc
+@@ -146,10 +146,10 @@ namespace enigma {
+                 val.str[0] = 0;
+                 break;
+             case BOOL :
+-                val.dval[0] = false;
+                val.dval[0] = 0;
+                 break;
+             case OBJECT :
+-                val.dval[0] = (double) NULL;
+                val.dval[0] = 0;
+                 break;
+             case NAMEDOBJECT:
+                 ASSERT(false, XLevelRuntime, "Value: illegal type usage");
--- a/games/enigma/files/patch-src_lev_Proxy.cc
+++ b/games/enigma/files/patch-src_lev_Proxy.cc
@ -0,0 +1,11 @@
+--- src/lev/Proxy.cc.orig	2017-09-03 15:54:50 UTC
+++ src/lev/Proxy.cc
+@@ -933,7 +933,7 @@ namespace enigma { namespace lev {
+                     } else if (haveLocalCopy) {
+                         // plain file
+                         basic_ifstream<char> ifs(absExtPath.c_str(), ios::binary | ios::in);
+-                        if (ifs != NULL)
+                        if (ifs)
+                             Readfile(ifs, extCode);
+                         else
+                             haveLocalCopy = false;