Fixed conflicts to merge kickbox in.

2015-01-27 18:03:41 -07:00
parent 80a02b40bb cf66c5e78d
commit 40b25e6220
269 changed files with 2639 additions and 514 deletions
@@ -1334,9 +1334,9 @@ void Actor::QueueMessage( const RString& sMessageName )
 	TI.m_sCommandName = "!" + sMessageName;
 }

-void Actor::AddCommand( const RString &sCmdName, apActorCommands apac )
+void Actor::AddCommand( const RString &sCmdName, apActorCommands apac, bool warn )
 {
-	if( HasCommand(sCmdName) )
+	if( HasCommand(sCmdName) && warn)
 	{
 		RString sWarning = GetLineage()+"'s command '"+sCmdName+"' defined twice";
 		LuaHelpers::ReportScriptError(sWarning, "COMMAND_DEFINED_TWICE");