Removed the create_npc wrapper and the last two NPC callbacks

When creating an NPC, you now provide its optional talk and update functions
directly rather than them being stored in a table on the Lua side and then
called in response to a global callback.

Also fixed an issue with a missing gender parameter to the delayed NPC
creation callback used by NPCs defined on the map (found by Erik while
reviewing this patch).

Reviewed-by: Erik Schilling

1 files changed, 2 insertions, 0 deletions

diff --git a/src/game-server/mapcomposite.cpp b/src/game-server/mapcomposite.cpp
index a0d48f5..6b2b74f 100644
--- a/src/game-server/mapcomposite.cpp
+++ b/src/game-server/mapcomposite.cpp
@@ -769,12 +769,14 @@ void MapComposite::initializeContent()
         else if (utils::compareStrI(type, "NPC") == 0)
         {
             int npcId = utils::stringToInt(object->getProperty("NPC_ID"));
+            std::string gender = object->getProperty("GENDER");
             std::string scriptText = object->getProperty("SCRIPT");
 
             if (npcId && !scriptText.empty())
             {
                 Script *script = ScriptManager::currentState();
                 script->loadNPC(object->getName(), npcId,
+                                ManaServ::getGender(gender),
                                 object->getX(), object->getY(),
                                 scriptText.c_str());
             }