Merge pull request #966 from ReyAleman/Creature_onOutfit

Creature.onOutfit event.

data/events/events.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <events>
+	<!-- Creature methods -->
+	<event class="Creature" method="onChangeOutfit" enabled="0" />
+
 	<!-- Party methods -->
 	<event class="Party" method="onJoin" enabled="0" />
 	<event class="Party" method="onLeave" enabled="0" />

data/events/scripts/creature.lua

@@ -0,0 +1,3 @@
+function Creature:onChangeOutfit(outfit)
+	return true
+end

src/events.cpp

@@ -35,6 +35,9 @@ Events::Events() :
 
 void Events::clear()
 {
+	// Creature
+	creatureOnChangeOutfit = -1;
+
 	// Party
 	partyOnJoin = -1;
 	partyOnLeave = -1;
@@ -81,7 +84,13 @@ bool Events::load()
 
 			const std::string& methodName = eventNode.attribute("method").as_string();
 			const int32_t event = scriptInterface.getMetaEvent(className, methodName);
-			if (className == "Party") {
+			if (className == "Creature") {
+				if (methodName == "onChangeOutfit") {
+					creatureOnChangeOutfit = event;
+				} else {
+					std::cout << "[Warning - Events::load] Unknown creature method: " << methodName << std::endl;
+				}
+			} else if (className == "Party") {
 				if (methodName == "onJoin") {
 					partyOnJoin = event;
 				} else if (methodName == "onLeave") {
@@ -128,6 +137,33 @@ bool Events::load()
 	return true;
 }
 
+// Creature
+bool Events::eventCreatureOnChangeOutfit(Creature* creature, const Outfit_t& outfit)
+{
+	// Creature:onChangeOutfit(outfit) or Creature.onChangeOutfit(self, outfit)
+	if (creatureOnChangeOutfit == -1) {
+		return true;
+	}
+
+	if (!scriptInterface.reserveScriptEnv()) {
+		std::cout << "[Error - Events::eventCreatureOnChangeOutfit] Call stack overflow" << std::endl;
+		return false;
+	}
+
+	ScriptEnvironment* env = scriptInterface.getScriptEnv();
+	env->setScriptId(creatureOnChangeOutfit, &scriptInterface);
+
+	lua_State* L = scriptInterface.getLuaState();
+	scriptInterface.pushFunction(creatureOnChangeOutfit);
+
+	LuaScriptInterface::pushUserdata<Creature>(L, creature);
+	LuaScriptInterface::setCreatureMetatable(L, -1, creature);
+
+	LuaScriptInterface::pushOutfit(L, outfit);
+
+	return scriptInterface.callFunction(2);
+}
+
 // Party
 bool Events::eventPartyOnJoin(Party* party, Player* player)
 {

src/events.h

@@ -34,6 +34,9 @@ class Events
 		void clear();
 		bool load();
 
+		// Creature
+		bool eventCreatureOnChangeOutfit(Creature* creature, const Outfit_t& outfit);
+
 		// Party
 		bool eventPartyOnJoin(Party* party, Player* player);
 		bool eventPartyOnLeave(Party* party, Player* player);
@@ -56,6 +59,9 @@ class Events
 	private:
 		LuaScriptInterface scriptInterface;
 
+		// Creature
+		int32_t creatureOnChangeOutfit;
+
 		// Party
 		int32_t partyOnJoin;
 		int32_t partyOnLeave;

src/game.cpp

@@ -3763,6 +3763,10 @@ void Game::changeSpeed(Creature* creature, int32_t varSpeedDelta)
 
 void Game::internalCreatureChangeOutfit(Creature* creature, const Outfit_t& outfit)
 {
+	if (!g_events->eventCreatureOnChangeOutfit(creature, outfit)) {
+		return;
+	}
+
 	creature->setCurrentOutfit(outfit);
 
 	if (creature->isInvisible()) {