summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-02 20:41:01 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-02 20:41:01 +0300
commit1dab21b236d76900f3ddd2be32f9590aef394c2d (patch)
tree9ff63d2bf544a440c5d8de41faa401e900898012 /src/resources
parentf4f16b2fd6c455cd38e089a97db374c5ee3ea9fd (diff)
downloadplus-1dab21b236d76900f3ddd2be32f9590aef394c2d.tar.gz
plus-1dab21b236d76900f3ddd2be32f9590aef394c2d.tar.bz2
plus-1dab21b236d76900f3ddd2be32f9590aef394c2d.tar.xz
plus-1dab21b236d76900f3ddd2be32f9590aef394c2d.zip
Remove most C casts.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/emotedb.cpp8
-rw-r--r--src/resources/mapreader.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp
index 14e3a96b5..1098243ac 100644
--- a/src/resources/emotedb.cpp
+++ b/src/resources/emotedb.cpp
@@ -91,8 +91,8 @@ void EmoteDB::load()
{
EmoteSprite *const currentSprite = new EmoteSprite;
std::string file = paths.getStringValue("sprites")
- + (std::string) reinterpret_cast<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::langProperty(
@@ -147,8 +147,8 @@ void EmoteDB::load()
{
EmoteSprite *const currentSprite = new EmoteSprite;
std::string file = paths.getStringValue("sprites")
- + (std::string) reinterpret_cast<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::langProperty(
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index ede630d0c..51d762569 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -705,7 +705,7 @@ Tileset *MapReader::readTileset(XmlNodePtr node, const std::string &path,
std::string pathDir(path);
std::map<std::string, std::string> props;
- if (xmlHasProp(node, BAD_CAST "source"))
+ if (XmlHasProp(node, "source"))
{
std::string filename = XML::getProperty(node, "source", "");
filename = resolveRelativePath(path, filename);