diff options
| author | Yohann Ferreira <yohann.ferreira@orange.fr> | 2013-02-01 17:09:03 -0800 |
|---|---|---|
| committer | Yohann Ferreira <yohann.ferreira@orange.fr> | 2013-02-01 17:09:03 -0800 |
| commit | eb6dfbbcd8091f645834d9076d07995b336dbfd1 (patch) | |
| tree | cfac4bd22d13a7f99a8983d18d65018d1a5bb333 /src/game-server/mapcomposite.cpp | |
| parent | 5c7bf62ca3204c6f8b91f1bd9178cb638e184f5a (diff) | |
| parent | 05187cd8af0de4d3d50b8ffb9a0801e47cb00d34 (diff) | |
| download | manaserv-eb6dfbbcd8091f645834d9076d07995b336dbfd1.tar.gz manaserv-eb6dfbbcd8091f645834d9076d07995b336dbfd1.tar.bz2 manaserv-eb6dfbbcd8091f645834d9076d07995b336dbfd1.tar.xz manaserv-eb6dfbbcd8091f645834d9076d07995b336dbfd1.zip | |
Merge pull request #11 from Bertram25/manaserv-emotes-support
Added emote support.
Reviewed-by: Ablu
Diffstat (limited to 'src/game-server/mapcomposite.cpp')
| -rw-r--r-- | src/game-server/mapcomposite.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game-server/mapcomposite.cpp b/src/game-server/mapcomposite.cpp index 485492db..4c7dc66a 100644 --- a/src/game-server/mapcomposite.cpp +++ b/src/game-server/mapcomposite.cpp @@ -464,10 +464,10 @@ Script::Ref MapComposite::mUpdateCallback; MapComposite::MapComposite(int id, const std::string &name): mActive(false), mMap(0), - mPvPRules(PVP_NONE), mContent(0), mName(name), - mID(id) + mID(id), + mPvPRules(PVP_NONE) { } |