mState.script.importStandardLibraries();
importLogFunctions(mState.script);
- std::string loaderPath = Scene::getPath("loader");
- if (loaderPath == "")
+ std::string path("loader");
+ if (!Scene::getPath(path))
{
throw Mf::Error(Mf::Error::RESOURCE_NOT_FOUND, "loader");
}
- Mf::Script::Result status = mState.script.doFile(loaderPath);
+ Mf::Script::Result status = mState.script.doFile(path);
if (status != Mf::Script::SUCCESS)
{
std::string str;
throw Mf::Error(Mf::Error::SCRIPT_ERROR, str);
}
- mState.script.getGlobalTable().pushField("scenes");
- mState.script.getTop().get(mState.sceneList);
+ mState.script.globals().pushField("scenes");
+ mState.script.top().get(mState.sceneList);
if (mState.sceneList.size() == 0)
{
throw Mf::Error(Mf::Error::SCRIPT_ERROR,
throw Mf::Error(Mf::Error::SCRIPT_ERROR, str);
}
- mState.script.getGlobalTable().pushField("Event");
- if (mState.script[-1].isTable())
+ Mf::Script::Slot table = mState.script.globals().pushField("Event");
+ if (table.isTable())
{
- mState.script[-1].pushField("Think");
- mState.script.set("Think", Mf::Script::REGISTRY);
- mState.script.pop(2);
- }
- else
- {
- mState.script.pop();
+ mState.script.push("Think");
+ table.pushField("Think");
+ mState.script.registry().setField();
}
+ mState.script.pop();
}
}
void GameLayer::thinkTimer()
{
- mState.script.getRegistryTable().pushField("Think");
+ mState.script.registry().pushField("Think");
if (mState.script[-1].isFunction()) mState.script.call();
else mState.script.pop();
}
void GameLayer::setProjection(Mf::Scalar width, Mf::Scalar height)
{
- mState.camera.setProjection(cml::rad(45.0), width / height, 1.0, 200.0);
+ mState.camera.setProjection(cml::rad(45.0),
+ width / height,
+ SCALAR(1.0), SCALAR(200.0));
}