cade lab fixes

[chaz/yoink] / src / Tilemap.cc

diff --git a/src/Tilemap.cc b/src/Tilemap.cc
index 02184bc99dec6049aa72a7c991d19653d5eb9b3e..dc3785aa0068d5ba9c3e17f8765d120c8704707e 100644 (file)
--- a/src/Tilemap.cc
+++ b/src/Tilemap.cc
@@ -66,21 +66,21 @@ struct Tilemap::Impl : public Mf::Library<Impl>
                std::string filePath = Tilemap::getPath(getName());
 
                script.importStandardLibraries();
-               importLogPrintFunction(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);