diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-09-28 17:28:09 +0200 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-09-28 17:28:09 +0200 |
| commit | dee1a6bf407649ccd60307e1896f2b27130c344c (patch) | |
| tree | d3747c44c09acbdba74cff252ba998a11cf4d4ef /src/game-server/skillmanager.cpp | |
| parent | 1bd16dc9def00ede31a9c7a568e3b8f55bb5ff6f (diff) | |
| parent | 3e218fec3000ab36ce03a0e3a04756bff9484127 (diff) | |
| download | manaserv-dee1a6bf407649ccd60307e1896f2b27130c344c.tar.gz manaserv-dee1a6bf407649ccd60307e1896f2b27130c344c.tar.bz2 manaserv-dee1a6bf407649ccd60307e1896f2b27130c344c.tar.xz manaserv-dee1a6bf407649ccd60307e1896f2b27130c344c.zip | |
Merge github.com:mana/manaserv
Conflicts:
src/game-server/inventory.cpp
src/game-server/inventory.h
src/game-server/item.h
src/game-server/main-game.cpp
src/game-server/skillmanager.cpp
src/utils/point.h
Diffstat (limited to 'src/game-server/skillmanager.cpp')
| -rw-r--r-- | src/game-server/skillmanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game-server/skillmanager.cpp b/src/game-server/skillmanager.cpp index 66d9b939..be6eef4b 100644 --- a/src/game-server/skillmanager.cpp +++ b/src/game-server/skillmanager.cpp @@ -91,8 +91,8 @@ void SkillManager::readSkillNode(xmlNodePtr skillNode, SkillInfo *skillInfo = new SkillInfo; skillInfo->setName = setName; - skillInfo->skillName = XML::getProperty(skillNode, "name", std::string()); - skillInfo->skillName = utils::toLower(skillInfo->skillName); + skillInfo->skillName = utils::toLower( + XML::getProperty(skillNode, "name", std::string())); int id = XML::getProperty(skillNode, "id", 0); if (id <= 0 || skillInfo->skillName.empty()) |