diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-02-26 22:06:10 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-03-02 18:12:07 +0100 |
| commit | 34ac0d64e23f2b2d3981dbb0ea72157f334805dd (patch) | |
| tree | 114b1f7a65956c097f7a59078292c9fa29c6451f /src/game-server/mapcomposite.h | |
| parent | e896d0b0125b48e12d43d99ace4498e56d968d50 (diff) | |
| download | manaserv-34ac0d64e23f2b2d3981dbb0ea72157f334805dd.tar.gz manaserv-34ac0d64e23f2b2d3981dbb0ea72157f334805dd.tar.bz2 manaserv-34ac0d64e23f2b2d3981dbb0ea72157f334805dd.tar.xz manaserv-34ac0d64e23f2b2d3981dbb0ea72157f334805dd.zip | |
Merged all the different Lua states into one
No more Lua state for each status effect, monster, item effect or map. All
scripts are loaded into the same state. This should be more efficient overall
and make it easier to implement dynamic reloading of the scripts in the
future.
Now, this introduces the problem of name collisions between different Lua
scripts. For now this is solved by using more specific function names, like
'tick_plague' and 'tick_jump' rather than just 'tick'. The plan is however
to get rid of these globals, and register these callbacks from the script,
so that they can be local functions without the danger of colliding with
other scripts.
Reviewed-by: Erik Schilling
Reviewed-by: Yohann Ferreira
Diffstat (limited to 'src/game-server/mapcomposite.h')
| -rw-r--r-- | src/game-server/mapcomposite.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/game-server/mapcomposite.h b/src/game-server/mapcomposite.h index 988b0ed8..49296911 100644 --- a/src/game-server/mapcomposite.h +++ b/src/game-server/mapcomposite.h @@ -33,7 +33,6 @@ class Map; class MapComposite; class Point; class Rectangle; -class Script; class Thing; struct MapContent; @@ -249,13 +248,6 @@ class MapComposite { return mMap; } /** - * Gets the associated script. Returns 0 when no scripts or inline - * NPCs are used on this map! - */ - Script *getScript() const - { return mScript; } - - /** * Returns whether the map is active on this server or not. */ bool isActive() const @@ -351,7 +343,6 @@ class MapComposite Map *mMap; /**< Actual map. */ MapContent *mContent; /**< Entities on the map. */ - Script *mScript; /**< Script associated to this map. */ std::string mName; /**< Name of the map. */ unsigned short mID; /**< ID of the map. */ /** Cached persistent variables */ |