This commit is contained in:
Glenn Maynard
2005-09-06 03:39:58 +00:00
parent d48dffeaf2
commit 2fac031f15
2 changed files with 17 additions and 14 deletions
+13 -10
View File
@@ -31,29 +31,32 @@ Command::Arg Command::GetArg( unsigned index ) const
return a; return a;
} }
Command::Arg::operator CString () Command::Arg::operator CString () const
{ {
CString sValue = s; CString sValue = s;
LuaHelpers::RunAtExpressionS( sValue ); LuaHelpers::RunAtExpressionS( sValue );
return sValue; return sValue;
} }
Command::Arg::operator float () Command::Arg::operator float () const
{ {
LuaHelpers::PrepareExpression( s ); // strip invalid chars CString sValue = s;
return LuaHelpers::RunExpressionF( 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 CString sValue = s;
return (int) LuaHelpers::RunExpressionF( 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 CString sValue = s;
return LuaHelpers::RunExpressionF( s ) != 0.0f; LuaHelpers::PrepareExpression( sValue ); // strip invalid chars
return LuaHelpers::RunExpressionF( sValue ) != 0.0f;
} }
void Command::Load( const CString &sCommand ) void Command::Load( const CString &sCommand )
+4 -4
View File
@@ -19,10 +19,10 @@ public:
struct Arg struct Arg
{ {
CString s; CString s;
operator CString (); operator CString () const;
operator float (); operator float () const;
operator int (); operator int () const;
operator bool (); operator bool () const;
}; };
Arg GetArg( unsigned index ) const; Arg GetArg( unsigned index ) const;