From f98d003e354a1792117b7cbc771d1dd91475a156 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 18 Mar 2011 17:48:29 +0200 Subject: Fix most old style cast except manaserv and libxml2 defines. --- src/resources/emotedb.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/resources/emotedb.cpp') 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( + 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( + 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( + 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( + spriteNode->xmlChildrenNode->content); currentInfo->particles.push_back(particlefx); } } -- cgit v1.2.3-60-g2f50