X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FScene.cc;h=fe49ed276d8706edc8626b566db7db51dd108dd8;hp=2e1a79363302ebb527e8a0c9d7ce8a13480495f3;hb=ca0f7bdfba63140dca0bd20586d31980f3938eb2;hpb=542e50a284c7f5b144a5c97c17f6d89b2af0175c diff --git a/src/Moof/Scene.cc b/src/Moof/Scene.cc index 2e1a793..fe49ed2 100644 --- a/src/Moof/Scene.cc +++ b/src/Moof/Scene.cc @@ -368,40 +368,6 @@ struct Meh }; -static int luaPrint(Script& script) -{ - Script::Value param = script[1]; - - while (!param.isNone()) - { - if (param.isString()) - { - std::string str; - param.get(str); - logInfo("lua: %s", str.c_str()); - } - else if (param.isBoolean()) - { - if (param) logInfo("lua: true"); - else logInfo("lua: false"); - - } - else if (param.isNil()) - { - logInfo("lua: nil"); - } - else - { - logInfo("lua: %s (%X)", param.getTypeName().c_str(), - param.getIdentifier()); - } - - param.index++; - } - - return 0; -} - static void importScriptBindings(Script& script, Meh& scene) { script.importFunction("SetPlayfieldBounds", @@ -422,7 +388,6 @@ static void importScriptBindings(Script& script, Meh& scene) boost::bind(&Meh::makeTilemap, &scene, _1)); script.importFunction("MakeBillboard", boost::bind(&Meh::makeBillboard, &scene, _1)); - script.importFunction("print", luaPrint); } @@ -430,14 +395,15 @@ OctreeP loadScene(const std::string& name) { std::string filePath = getPath(name); + Meh cool; + Script script; script.importStandardLibraries(); - - Meh cool; + importLogScript(script); importScriptBindings(script, cool); long detail = 3; - Settings::getInstance().getNumber("game.detail", detail); + Settings::getInstance().get("detail", detail); script.push(detail); script.set("detail");