actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename: ActorCommand -> Command

Browse Source 
Make Command smaller and more generic.
Parse arguments on use, not in Command::Load.
This commit is contained in:
Chris Danford
2004-12-03 05:19:46 +00:00
parent abb6a73e4b
commit ed19821e09
67 changed files with 592 additions and 581 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ActorCommands.cpp
-101
View File
@@ -1,101 +0,0 @@
#include "global.h" // testing updates
#include "ActorCommands.h"
#include "RageUtil.h"
#include "RageLog.h"
#include "arch/Dialog/Dialog.h"
#include "LuaHelpers.h"
void IncorrectActorParametersWarning( const ActorCommand &command, int iMaxIndexAccessed )
{
const CString sError = ssprintf( "Actor::HandleCommand: Wrong number of parameters in command '%s'. Expected %d but there are %u.",
command.GetOriginalCommandString().c_str(), iMaxIndexAccessed+1, unsigned(command.vTokens.size()) );
LOG->Warn( sError );
Dialog::OK( sError );
}
void ActorCommandToken::Set( const CString &sParam )
{
s = sParam;
CString s = sParam;
Lua::PrepareExpression( s ); // strip invalid chars
f = Lua::RunExpressionF( s );
bColorIsValid = c.FromString( sParam );
}
void ActorCommand::Set( const CString &sCommand )
{
CStringArray vsTokens;
split( sCommand, ",", vsTokens, false ); // don't ignore empty
vTokens.resize( vsTokens.size() );
for( unsigned i=0; i<vsTokens.size(); i++ )
{
CString &sToken = vsTokens[i];
// TRICKY: The first parameter is the command name. This is case
// insensitive. Convert it to lowercase now so that we can do
// case sensitive compares later.
if( i == 0 )
sToken.MakeLower();
vTokens[i].Set( sToken );
}
}
CString ActorCommand::GetOriginalCommandString() const
{
CStringArray asTokens;
for( unsigned i=0; i<vTokens.size(); i++ )
asTokens.push_back( vTokens[i].s );
return join( ",", asTokens );
}
void ParseActorCommands( const CString &sCommands, ActorCommands &vCommandsOut )
{
vCommandsOut.v.clear();
CStringArray vsCommands;
split( sCommands, ";", vsCommands, true ); // do ignore empty
vCommandsOut.v.resize( vsCommands.size() );
for( unsigned i=0; i<vsCommands.size(); i++ )
{
const CString &sCommand = vsCommands[i];
ActorCommand &pc = vCommandsOut.v[i];
pc.Set( sCommand );
}
}
ActorCommands ParseActorCommands( const CString &sCommands )
{
ActorCommands vCommands;
ParseActorCommands( 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.
*/