diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-15 22:15:31 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-15 22:15:31 +0200 |
| commit | c53bc90dbaa876a86f762a3d864b1f920e2b8071 (patch) | |
| tree | 1a8174f4d1745a4799210db970aa2230df622d34 /src/scripting/scriptmanager.h | |
| parent | b89e404f85358f2e3ff87d7731376dbeacdf9778 (diff) | |
| parent | 81be8dc99ba7558c8915310eed095df43e3bdbf7 (diff) | |
| download | manaserv-c53bc90dbaa876a86f762a3d864b1f920e2b8071.tar.gz manaserv-c53bc90dbaa876a86f762a3d864b1f920e2b8071.tar.bz2 manaserv-c53bc90dbaa876a86f762a3d864b1f920e2b8071.tar.xz manaserv-c53bc90dbaa876a86f762a3d864b1f920e2b8071.zip | |
Merge branch 'master' into lpc2012
Conflicts:
src/account-server/accounthandler.cpp
src/game-server/character.cpp
Diffstat (limited to 'src/scripting/scriptmanager.h')
| -rw-r--r-- | src/scripting/scriptmanager.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scripting/scriptmanager.h b/src/scripting/scriptmanager.h index 03b6e64b..14b01b62 100644 --- a/src/scripting/scriptmanager.h +++ b/src/scripting/scriptmanager.h @@ -55,7 +55,7 @@ bool loadMainScript(const std::string &file); */ Script *currentState(); -bool performCraft(Being *crafter, const std::list<InventoryItem> &recipe); +bool performCraft(Entity *crafter, const std::list<InventoryItem> &recipe); void setCraftCallback(Script *script); void setSpecialCallback(Script *script); |