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/script.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/script.h')
| -rw-r--r-- | src/scripting/script.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/scripting/script.h b/src/scripting/script.h index 574d1b9b..7cf457cc 100644 --- a/src/scripting/script.h +++ b/src/scripting/script.h @@ -31,7 +31,6 @@ #include <sigc++/trackable.h> -class Being; class MapComposite; class Entity; @@ -44,9 +43,13 @@ class Script : public sigc::trackable struct Context { MapComposite *map; + Entity *npc; + Entity *character; Context() : map(0) + , npc(0) + , character(0) {} }; @@ -238,7 +241,7 @@ class Script : public sigc::trackable const Context *getContext() const { return mContext; } - virtual void processDeathEvent(Being *entity) = 0; + virtual void processDeathEvent(Entity *entity) = 0; virtual void processRemoveEvent(Entity *entity) = 0; |