summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-03-10 23:38:36 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-03-11 16:56:56 +0100
commitb822dcee52d15d41c4186a250e73b85b16c9dc39 (patch)
tree45515c75175b67fe458701f3a70bf0ee8b14bee5 /src/common
parent2dd3c5c06978584e3e076609554f225ffbabd3e2 (diff)
downloadmanaserv-b822dcee52d15d41c4186a250e73b85b16c9dc39.tar.gz
manaserv-b822dcee52d15d41c4186a250e73b85b16c9dc39.tar.xz
manaserv-b822dcee52d15d41c4186a250e73b85b16c9dc39.zip
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
Diffstat (limited to 'src/common')
-rw-r--r--src/common/manaserv_protocol.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/manaserv_protocol.h b/src/common/manaserv_protocol.h
index 6c34276..a78c473 100644
--- a/src/common/manaserv_protocol.h
+++ b/src/common/manaserv_protocol.h
@@ -461,7 +461,7 @@ inline ManaServ::BeingGender getGender(int gender)
default:
return ManaServ::GENDER_UNSPECIFIED;
}
-};
+}
/**
* Helper function for getting gender by string
@@ -474,7 +474,7 @@ inline ManaServ::BeingGender getGender(std::string gender)
return ManaServ::GENDER_FEMALE;
else
return ManaServ::GENDER_UNSPECIFIED;
-};
+}
} // namespace ManaServ