simplified win32 installer build script

[chaz/yoink] / src / Animation.cc

diff --git a/src/Animation.cc b/src/Animation.cc
index aa754cebd7decf94f7d27d628859a363c20457a5..598361bf97143c28cb1ca2d78d495692d50f6d31 100644 (file)
--- a/src/Animation.cc
+++ b/src/Animation.cc
@@ -29,8 +29,8 @@
 #include <map>
 #include <vector>
 
+#include <Moof/Library.hh>
 #include <Moof/Log.hh>
-#include <Moof/Mippleton.hh>
 #include <Moof/Script.hh>
 
 #include "Animation.hh"
@@ -55,10 +55,10 @@ class Animation::Impl
         * which wants to use these loaded sequences.
         */
 
-       class Data : public Mf::Mippleton<Data>
+       class Data : public Mf::Library<Data>
        {
                friend class Impl;
-               friend class Mf::Mippleton<Data>;
+               friend class Mf::Library<Data>;
 
                /**
                 * A frame of an animation sequence.  A frame is merely an index which
@@ -78,7 +78,7 @@ class Animation::Impl
                         * frame map which is probably loaded within an animation file.
                         */
                
-                       Frame(Mf::Script& script, Mf::Script::Value table) :
+                       Frame(Mf::Script& script, Mf::Script::Slot table) :
                                mIndex(0),
                                mDuration(1.0)
                        {
@@ -114,7 +114,7 @@ class Animation::Impl
                         * constructor which loads each individual frame.
                         */
 
-                       Sequence(Mf::Script& script, Mf::Script::Value table) :
+                       Sequence(Mf::Script& script, Mf::Script::Slot table) :
                                mDelay(0.0),
                                mLoop(true)
                        {
@@ -133,10 +133,10 @@ class Animation::Impl
                                // TODO - sequence class/type not yet implemented
 
                                table.pushField("frames");
-                               Mf::Script::Value frameTable = script.getTop();
+                               Mf::Script::Slot frameTable = script.getTop();
                                if (frameTable.isTable())
                                {
-                                       Mf::Script::Value top = script[-1];
+                                       Mf::Script::Slot top = script[-1];
                                        int index = 1;
 
                                        for (;;)
@@ -166,22 +166,22 @@ class Animation::Impl
                        Mf::Script script;
                        std::string filePath = Animation::getPath(getName());
 
-                       script.importStandardLibraries();
-                       importLogScript(script);
+                       script.importBaseLibrary();
+                       importLogFunctions(script);
                        importAnimationBindings(script);
 
                        if (script.doFile(filePath) != Mf::Script::SUCCESS)
                        {
                                std::string str;
                                script[-1].get(str);
-                               Mf::logScript("%s", str.c_str());
+                               Mf::logWarning(str);
                        }
                }
 
                int defineSequence(Mf::Script& script)
                {
-                       Mf::Script::Value name = script[1].requireString();
-                       Mf::Script::Value table = script[2].requireTable();
+                       Mf::Script::Slot name = script[1].requireString();
+                       Mf::Script::Slot table = script[2].requireTable();
 
                        std::string nameStr;
                        name.get(nameStr);
@@ -214,7 +214,7 @@ class Animation::Impl
                 */
 
                explicit Data(const std::string& name) :
-                       Mf::Mippleton<Data>(name)
+                       Mf::Library<Data>(name)
                {
                        loadFromFile();
                }