summaryrefslogtreecommitdiff
path: root/src/resources/emotedb.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-03-18 17:48:29 +0200
committerAndrei Karas <akaras@inbox.ru>2011-03-18 17:49:00 +0200
commitf98d003e354a1792117b7cbc771d1dd91475a156 (patch)
treedc2a297f7c4026394c9954ae4bfd4abd22ef9612 /src/resources/emotedb.cpp
parentbb0a6cb25b2985fd1f74c9d27d5a46f6863e2dee (diff)
downloadmv-f98d003e354a1792117b7cbc771d1dd91475a156.tar.gz
mv-f98d003e354a1792117b7cbc771d1dd91475a156.tar.bz2
mv-f98d003e354a1792117b7cbc771d1dd91475a156.tar.xz
mv-f98d003e354a1792117b7cbc771d1dd91475a156.zip
Fix most old style cast except manaserv and libxml2 defines.
Diffstat (limited to 'src/resources/emotedb.cpp')
-rw-r--r--src/resources/emotedb.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp
index 6084f6092..d0cb84b90 100644
--- a/src/resources/emotedb.cpp
+++ b/src/resources/emotedb.cpp
@@ -83,17 +83,17 @@ void EmoteDB::load()
{
EmoteSprite *currentSprite = new EmoteSprite;
std::string file = paths.getStringValue("sprites")
- + (std::string) (const char*)
- spriteNode->xmlChildrenNode->content;
+ + (std::string) reinterpret_cast<const char*>(
+ spriteNode->xmlChildrenNode->content);
currentSprite->sprite = AnimatedSprite::load(file,
- XML::getProperty(spriteNode, "variant", 0));
+ XML::getProperty(spriteNode, "variant", 0));
currentSprite->name = XML::getProperty(spriteNode, "name", "");
currentInfo->sprites.push_back(currentSprite);
}
else if (xmlStrEqual(spriteNode->name, BAD_CAST "particlefx"))
{
- std::string particlefx = (const char*)(
- spriteNode->xmlChildrenNode->content);
+ std::string particlefx = reinterpret_cast<const char*>(
+ spriteNode->xmlChildrenNode->content);
currentInfo->particles.push_back(particlefx);
}
}
@@ -138,8 +138,8 @@ void EmoteDB::load()
{
EmoteSprite *currentSprite = new EmoteSprite;
std::string file = paths.getStringValue("sprites")
- + (std::string) (const char*)
- spriteNode->xmlChildrenNode->content;
+ + (std::string) reinterpret_cast<const char*>(
+ spriteNode->xmlChildrenNode->content);
currentSprite->sprite = AnimatedSprite::load(file,
XML::getProperty(spriteNode, "variant", 0));
currentSprite->name = XML::getProperty(spriteNode, "name", "");
@@ -147,8 +147,8 @@ void EmoteDB::load()
}
else if (xmlStrEqual(spriteNode->name, BAD_CAST "particlefx"))
{
- std::string particlefx = (const char*)(
- spriteNode->xmlChildrenNode->content);
+ std::string particlefx = reinterpret_cast<const char*>(
+ spriteNode->xmlChildrenNode->content);
currentInfo->particles.push_back(particlefx);
}
}