X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FAnimation.cc;h=a9710ce66b525e0536789394ca014b5323a89b2f;hp=503f77a47c2eecf21a24a2986d082061358af829;hb=1d4aa0d34b0410c7bc60a24bad7abb55eacc850a;hpb=6b0a0d0efafe34d48ab344fca3b479553bd4e62c diff --git a/src/Animation.cc b/src/Animation.cc index 503f77a..a9710ce 100644 --- a/src/Animation.cc +++ b/src/Animation.cc @@ -15,6 +15,7 @@ #include #include +#include #include #include "Animation.hh" @@ -137,13 +138,8 @@ public: void init(const std::string& name) { moof::script script; - std::string path(name); + std::string path = moof::resource::find_file("animations/"+name, "lua"); - if (!resource::find(path)) - { - throw std::runtime_error("cannot find resource " + name); - } - script.import_base_library(); moof::log::import(script); importAnimationBindings(script); @@ -214,7 +210,6 @@ public: std::map::iterator it; it = mData->mSequences.find(name); - if (it != mData->mSequences.end()) { mCurrentSequence = &(*it).second;