rename: ActorCommand -> Command

Make Command smaller and more generic. Parse arguments on use, not in Command::Load.
2004-12-03 05:19:46 +00:00
parent abb6a73e4b
commit ed19821e09
67 changed files with 592 additions and 581 deletions
@@ -0,0 +1,112 @@
+#include "global.h"	// testing updates
+#include "Command.h"
+#include "RageUtil.h"
+#include "RageLog.h"
+#include "arch/Dialog/Dialog.h"
+#include "LuaHelpers.h"
+
+
+void IncorrectNumberArgsWarning( const Command &command, int iMaxIndexAccessed )
+{
+	const CString sError = ssprintf( "Actor::HandleCommand: Wrong number of arguments in command '%s'.  Expected %d but there are %u.",
+		command.GetOriginalCommandString().c_str(), iMaxIndexAccessed+1, unsigned(command.m_vsArgs.size()) );
+	LOG->Warn( sError );
+	Dialog::OK( sError );
+}
+
+CString Command::GetName() const 
+{
+	if( m_vsArgs.empty() )
+		return "";
+	CString s = m_vsArgs[0];
+	s.MakeLower();
+	return s;
+}
+
+Command::Arg Command::GetArg( unsigned index ) const
+{
+	Arg a;
+	if( index < m_vsArgs.size() )
+		a.s = m_vsArgs[index];
+	return a;
+}
+
+Command::Arg::operator CString ()
+{
+	return s;
+}
+
+Command::Arg::operator float ()
+{
+	Lua::PrepareExpression( s );	// strip invalid chars
+	return Lua::RunExpressionF( s );
+}
+
+Command::Arg::operator int ()
+{
+	Lua::PrepareExpression( s );	// strip invalid chars
+	return (int)Lua::RunExpressionF( s );
+}
+
+Command::Arg::operator bool ()
+{
+	Lua::PrepareExpression( s );	// strip invalid chars
+	return Lua::RunExpressionF( s ) != 0.0f;
+}
+
+void Command::Load( const CString &sCommand )
+{
+	m_vsArgs.clear();
+	split( sCommand, ",", m_vsArgs, false );	// don't ignore empty
+}
+
+CString Command::GetOriginalCommandString() const
+{
+	return join( ",", m_vsArgs );
+}
+
+void ParseCommands( const CString &sCommands, Commands &vCommandsOut )
+{
+	CStringArray vsCommands;
+	split( sCommands, ";", vsCommands, true );	// do ignore empty
+	
+	vCommandsOut.v.resize( vsCommands.size() );
+
+	for( unsigned i=0; i<vsCommands.size(); i++ )
+	{
+		Command &cmd = vCommandsOut.v[i];
+		cmd.Load( vsCommands[i] );
+	}
+}
+
+Commands ParseCommands( const CString &sCommands )
+{
+	Commands vCommands;
+	ParseCommands( sCommands, vCommands );
+	return vCommands;
+}
+
+/*
+ * (c) 2004 Chris Danford
+ * All rights reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, and/or sell copies of the Software, and to permit persons to
+ * whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+ * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
+ * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
+ * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */