diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-09-08 23:59:59 +0200 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-09-08 23:59:59 +0200 |
| commit | 40a31c52aebc19221cc9da8a0f764d21e672937b (patch) | |
| tree | 9b9f9df81828f3674838c3f01154e1fa194abee6 /src/game-server | |
| parent | fbd91b3538eb486df428f48fb9c47b7c5596ec73 (diff) | |
| parent | 082a88a7ac74e52fd5d239e1e974731a9a7b3fdc (diff) | |
| download | manaserv-40a31c52aebc19221cc9da8a0f764d21e672937b.tar.gz manaserv-40a31c52aebc19221cc9da8a0f764d21e672937b.tar.bz2 manaserv-40a31c52aebc19221cc9da8a0f764d21e672937b.tar.xz manaserv-40a31c52aebc19221cc9da8a0f764d21e672937b.zip | |
Merge github.com:mana/manaserv
Conflicts:
src/account-server/storage.cpp
src/game-server/mapreader.cpp
src/sql/mysql/createTables.sql
Diffstat (limited to 'src/game-server')
| -rw-r--r-- | src/game-server/mapreader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game-server/mapreader.cpp b/src/game-server/mapreader.cpp index 0fe5a53b..8438c82c 100644 --- a/src/game-server/mapreader.cpp +++ b/src/game-server/mapreader.cpp @@ -198,7 +198,7 @@ Map* MapReader::readMap(xmlNodePtr node, const std::string &path, } else if (utils::compareStrI(objType, "SPAWN") == 0) { - MonsterClass *monster; + MonsterClass *monster = 0; int maxBeings = 10; // Default value int spawnRate = 10; // Default value |