From 2fac031f15c83deb32ce14783e1dfaa358c49e34 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 6 Sep 2005 03:39:58 +0000 Subject: [PATCH] const --- stepmania/src/Command.cpp | 23 +++++++++++++---------- stepmania/src/Command.h | 8 ++++---- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/stepmania/src/Command.cpp b/stepmania/src/Command.cpp index 047be21d79..18cf3da30f 100644 --- a/stepmania/src/Command.cpp +++ b/stepmania/src/Command.cpp @@ -31,29 +31,32 @@ Command::Arg Command::GetArg( unsigned index ) const return a; } -Command::Arg::operator CString () +Command::Arg::operator CString () const { CString sValue = s; LuaHelpers::RunAtExpressionS( sValue ); return sValue; } -Command::Arg::operator float () +Command::Arg::operator float () const { - LuaHelpers::PrepareExpression( s ); // strip invalid chars - return LuaHelpers::RunExpressionF( s ); + CString sValue = s; + LuaHelpers::PrepareExpression( sValue ); // strip invalid chars + return LuaHelpers::RunExpressionF( sValue ); } -Command::Arg::operator int () +Command::Arg::operator int () const { - LuaHelpers::PrepareExpression( s ); // strip invalid chars - return (int) LuaHelpers::RunExpressionF( s ); + CString sValue = s; + LuaHelpers::PrepareExpression( sValue ); // strip invalid chars + return (int) LuaHelpers::RunExpressionF( sValue ); } -Command::Arg::operator bool () +Command::Arg::operator bool () const { - LuaHelpers::PrepareExpression( s ); // strip invalid chars - return LuaHelpers::RunExpressionF( s ) != 0.0f; + CString sValue = s; + LuaHelpers::PrepareExpression( sValue ); // strip invalid chars + return LuaHelpers::RunExpressionF( sValue ) != 0.0f; } void Command::Load( const CString &sCommand ) diff --git a/stepmania/src/Command.h b/stepmania/src/Command.h index a30a1d7d8e..c8821b7cad 100644 --- a/stepmania/src/Command.h +++ b/stepmania/src/Command.h @@ -19,10 +19,10 @@ public: struct Arg { CString s; - operator CString (); - operator float (); - operator int (); - operator bool (); + operator CString () const; + operator float () const; + operator int () const; + operator bool () const; }; Arg GetArg( unsigned index ) const;