diff options
| author | Reid <reidyaro@gmail.com> | 2011-08-24 22:42:17 +0200 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2011-08-24 22:42:17 +0200 |
| commit | 43c19a8321bd0c4bcf36655d74e895397aff7eea (patch) | |
| tree | c8f7933367ae1e757a3166a04772274896d58c9c /src/resources/itemdb.cpp | |
| parent | c1ec2b921389cb5c44d9ae572ea4851891cf8bc9 (diff) | |
| parent | 9505e3789cc9db6a10a68b9794a586604271b76f (diff) | |
| download | mv-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.gz mv-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.bz2 mv-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.xz mv-43c19a8321bd0c4bcf36655d74e895397aff7eea.zip | |
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/resources/itemdb.cpp')
| -rw-r--r-- | src/resources/itemdb.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 2d14ba687..e60127997 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -23,7 +23,7 @@ #include "resources/itemdb.h" #include "client.h" -#include "log.h" +#include "logger.h" #include "resources/iteminfo.h" #include "resources/resourcemanager.h" @@ -213,7 +213,7 @@ void ItemDB::load() std::string attackAction = XML::getProperty(node, "attack-action", ""); std::string drawBefore = XML::getProperty(node, "drawBefore", ""); std::string drawAfter = XML::getProperty(node, "drawAfter", ""); - std::string removeSprite = XML::getProperty(node, "removeSprite", ""); +// std::string removeSprite = XML::getProperty(node, "removeSprite", ""); std::string colors; if (serverVersion >= 1) colors = XML::getProperty(node, "colors", ""); |