Merge branch 'NateEag-master-patch-12920' into 'master'

[xonotic/netradiant.git] / libs / stringio.h

diff --git a/libs/stringio.h b/libs/stringio.h
index 7d192a2ad13eb26d60cd962f53a2d9dff41a7d38..544b433674a73ca292a37168150e08c886fde2af 100644 (file)
--- a/libs/stringio.h
+++ b/libs/stringio.h
@@ -220,7 +220,7 @@ inline bool string_parse_size( const char* string, std::size_t& i ){
 }
 
 
-#define RETURN_FALSE_IF_FAIL(expression) do { if (!(expression)) return false; } while (0)
+#define RETURN_FALSE_IF_FAIL( expression ) do{ if ( !expression ) {return false; } }while( 0 )
 
 inline void Tokeniser_unexpectedError( Tokeniser& tokeniser, const char* token, const char* expected ){
        globalErrorStream() << Unsigned( tokeniser.getLine() ) << ":" << Unsigned( tokeniser.getColumn() ) << ": parse error at '" << ( token != 0 ? token : "#EOF" ) << "': expected '" << expected << "'\n";
@@ -232,15 +232,15 @@ inline bool Tokeniser_getFloat( Tokeniser& tokeniser, float& f ){
        if ( token != 0 && string_parse_float( token, f ) ) {
                return true;
        }
-       #define DISABLE_QNAN_FALLBACK
-       #ifndef DISABLE_QNAN_FALLBACK
        //fallback for 1.#IND 1.#INF 1.#QNAN cases, happening sometimes after rotating & often scaling with tex lock in BP mode
        else if ( token != 0 && strstr( token, ".#" ) ) {
                globalErrorStream() << "Warning: " << Unsigned( tokeniser.getLine() ) << ":" << Unsigned( tokeniser.getColumn() ) << ": expected parse problem at '" << token << "': wanted '#number'\nProcessing anyway\n";
-               *strstr( token, ".#" ) = '\0';
+       #define GARUX_DISABLE_QNAN_FALLBACK
+       #ifndef GARUX_DISABLE_QNAN_FALLBACK
+//             *strstr( token, ".#" ) = '\0';
+       #endif
                return true;
        }
-       #endif
        Tokeniser_unexpectedError( tokeniser, token, "#number" );
        return false;
 }