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
@@ -582,7 +582,7 @@ public:
 	virtual void PushContext( lua_State *L );

 	// Named commands
-	void AddCommand( const RString &sCmdName, apActorCommands apac );
+	void AddCommand( const RString &sCmdName, apActorCommands apac, bool warn= true );
 	bool HasCommand( const RString &sCmdName ) const;
 	const apActorCommands *GetCommand( const RString &sCommandName ) const;
 	void PlayCommand( const RString &sCommandName ) { HandleMessage( Message(sCommandName) ); } // convenience