cade lab fixes

[chaz/yoink] / src / Tilemap.cc

diff --git a/src/Tilemap.cc b/src/Tilemap.cc
index 232d0034c72186ad4963d3cbdfae03fa6be979ee..dc3785aa0068d5ba9c3e17f8765d120c8704707e 100644 (file)
--- a/src/Tilemap.cc
+++ b/src/Tilemap.cc
@@ -26,17 +26,17 @@
 
 *******************************************************************************/
 
-#include <Moof/Mippleton.hh>
+#include <Moof/Library.hh>
 #include <Moof/OpenGL.hh>
 #include <Moof/Script.hh>
 
 #include "Tilemap.hh"
 
 
-struct Tilemap::Impl : public Mf::Mippleton<Impl>
+struct Tilemap::Impl : public Mf::Library<Impl>
 {
        Impl(const std::string& name) :
-               Mf::Mippleton<Impl>(name),
+               Mf::Library<Impl>(name),
                mMagFilter(GL_NEAREST),
                mMinFilter(GL_NEAREST),
                mTilesS(1),
@@ -66,21 +66,21 @@ struct Tilemap::Impl : public Mf::Mippleton<Impl>
                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);