X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=libs%2Fstringio.h;h=47772ee47845d139e9bac1e625811a893249bbc1;hb=HEAD;hp=d7099f593d4e6209dffe67df049c440d3def19c5;hpb=9bced6aaa45f3fb8a7b7f5b39deb207d1ea50924;p=xonotic%2Fnetradiant.git diff --git a/libs/stringio.h b/libs/stringio.h index d7099f59..544b4336 100644 --- 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"; @@ -235,7 +235,10 @@ inline bool Tokeniser_getFloat( Tokeniser& tokeniser, float& f ){ //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; } Tokeniser_unexpectedError( tokeniser, token, "#number" );