From f04a03c321b39bc550c526c5a4a1936c23ccee8f Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 21 Sep 2006 20:14:14 +0000 Subject: [PATCH] don't use 0 and 1 for bools; use valid Lua expressions --- stepmania/src/ThemeManager.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index f1d62df465..03e0d38202 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -932,15 +932,9 @@ bool ThemeManager::GetMetricB( const RString &sClassName, const RString &sValueN LuaHelpers::RunAtExpressionS( sValue ); - /* Watch out: "0" and "1" are not false and true in Lua (all string values are - * true). Make sure that we catch all values that are supposed to be simple - * booleans. */ - TrimLeft( sValue ); - TrimRight( sValue ); - if( sValue.Left(1) == "0" ) - return false; /* optimization */ - if( sValue.Left(1) == "1" ) - return true; /* optimization */ + if( sValue.Left(1) == "0" || sValue.Left(1) == "1" ) + RageException::Throw( "Theme metric %s::%s: boolean value \"%s\" should be true or false", + sClassName.c_str(), sValueName.c_str(), sValue.c_str() ); LuaHelpers::PrepareExpression( sValue );