X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FTilemap.cc;h=dc3785aa0068d5ba9c3e17f8765d120c8704707e;hp=b15d07f29a3900cb3e41e266491cf97482fdbb97;hb=4f9eb9259092994de9690cf12f11437c35a6791e;hpb=bffc879fc8ee8167bb123310d39fad4e2f426ffd diff --git a/src/Tilemap.cc b/src/Tilemap.cc index b15d07f..dc3785a 100644 --- a/src/Tilemap.cc +++ b/src/Tilemap.cc @@ -66,21 +66,21 @@ struct Tilemap::Impl : public Mf::Library std::string filePath = Tilemap::getPath(getName()); script.importStandardLibraries(); - importLogScript(script); + importLogFunctions(script); bindScriptConstants(script); if (script.doFile(filePath) != Mf::Script::SUCCESS) { std::string str; script[-1].get(str); - Mf::logScript("%s", str.c_str()); + Mf::logWarning(str); return; // TODO needs a better exit strategy } - Mf::logInfo("loading tiles from tilemap %s", filePath.c_str()); + Mf::logInfo << "loading tiles from tilemap " << filePath << std::endl; - Mf::Script::Value globals = script.getGlobalTable(); - Mf::Script::Value top = script[-1]; + Mf::Script::Slot globals = script.getGlobalTable(); + Mf::Script::Slot top = script[-1]; globals.pushField("tiles_s"); top.get(mTilesS);