diff options
author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-10-22 13:09:25 +0200 |
---|---|---|
committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-10-22 13:16:30 +0200 |
commit | bf6e38872829f87ff408f294184da14c8c24bfd4 (patch) | |
tree | f569a61013932b0988e90e83dbc553e93457639a /src/game-server/itemmanager.cpp | |
parent | 05130de24bf68d6ca427cbc126a03159ca777e5d (diff) | |
download | manaserv-bf6e38872829f87ff408f294184da14c8c24bfd4.tar.gz manaserv-bf6e38872829f87ff408f294184da14c8c24bfd4.tar.bz2 manaserv-bf6e38872829f87ff408f294184da14c8c24bfd4.tar.xz manaserv-bf6e38872829f87ff408f294184da14c8c24bfd4.zip |
Made the servers check for positive id in xml db loading.
Also fixed a memleak when loading an invalid monster attack.
Resolves: Mana-Mantis #215.
Reviewed-by: Thorbjorn.
Diffstat (limited to 'src/game-server/itemmanager.cpp')
-rw-r--r-- | src/game-server/itemmanager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game-server/itemmanager.cpp b/src/game-server/itemmanager.cpp index 802197d6..34a6170a 100644 --- a/src/game-server/itemmanager.cpp +++ b/src/game-server/itemmanager.cpp @@ -126,10 +126,10 @@ void ItemManager::reload() continue; int id = XML::getProperty(node, "id", 0); - if (!id) + if (id < 1) { - LOG_WARN("Item Manager: An item has no ID in " - << mItemReferenceFile << ", and so has been ignored!"); + LOG_WARN("Item Manager: Item ID: " << id << " is invalid in " + << mItemReferenceFile << ", and will be ignored."); continue; } |