summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-04-16 14:59:28 +0300
committerAndrei Karas <akaras@inbox.ru>2013-04-16 14:59:28 +0300
commit45401b7a8c6ab6d33c45b0b8e336d6053c93433d (patch)
tree15a95887465bcabb6c35ab13b7d535753f37d6e7 /src/resources
parentcc8f48938d98f71ac738b4f08db81242eab75407 (diff)
downloadmv-45401b7a8c6ab6d33c45b0b8e336d6053c93433d.tar.gz
mv-45401b7a8c6ab6d33c45b0b8e336d6053c93433d.tar.bz2
mv-45401b7a8c6ab6d33c45b0b8e336d6053c93433d.tar.xz
mv-45401b7a8c6ab6d33c45b0b8e336d6053c93433d.zip
improve npcdb file.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/npcdb.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp
index 7056f1131..3f110d9d2 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.cpp
@@ -51,7 +51,7 @@ void NPCDB::load()
if (!rootNode || !xmlNameEqual(rootNode, "npcs"))
{
- logger->log("NPC Database: Error while loading npcs.xml!");
+ logger->log1("NPC Database: Error while loading npcs.xml!");
mLoaded = true;
return;
}
@@ -112,14 +112,12 @@ void NPCDB::load()
}
else if (xmlNameEqual(spriteNode, "particlefx"))
{
- std::string particlefx = reinterpret_cast<const char*>(
- spriteNode->xmlChildrenNode->content);
- display.particles.push_back(particlefx);
+ display.particles.push_back(reinterpret_cast<const char*>(
+ spriteNode->xmlChildrenNode->content));
}
}
currentInfo->setDisplay(display);
-
mNPCInfos[id] = currentInfo;
}