X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FTilemap.cc;h=4fe5e974597d19e2baacb1eb97c788be6f66df9f;hp=17642c723c9fccda03ee36325b14ff917f8b9218;hb=fdfba4553433b9b2804c2772c7645211b828c2ea;hpb=bfa6212d09d8735d8fd5e2638188e4a99f21ada4 diff --git a/src/Moof/Tilemap.cc b/src/Moof/Tilemap.cc index 17642c7..4fe5e97 100644 --- a/src/Moof/Tilemap.cc +++ b/src/Moof/Tilemap.cc @@ -91,15 +91,15 @@ public: { Deserializer deserializer(Tilemap::getPath(getName())); - SerializablePtr root = deserializer.deserialize(); + SerializableP root = deserializer.deserialize(); if (root) { - std::map rootObj; + Serializable::Map rootObj; if (root->get(rootObj)) { - std::map::iterator it; + Serializable::Map::iterator it; if ((it = rootObj.find("tiles_s")) != rootObj.end()) { @@ -164,7 +164,7 @@ public: Tilemap::Tilemap(const std::string& name) : Texture(name), - impl_(Tilemap::Impl::retain(name), &Tilemap::Impl::release) + impl_(Tilemap::Impl::getInstance(name)) { setMinFilter(impl_->minFilter_); setMagFilter(impl_->magFilter_);