mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-07-18 05:45:06 +00:00
Code Issues Releases Wiki Activity

Fix ScriptInterface developer mode settings not applying.

Browse source 
Minor changes:
- clean out some Lua functions registered twice
- Correct bool cast in quad_setSegs()
- Show nested mains in debug console
- One less //HACK comment
This commit is contained in:
fgenesis 2013-08-03 22:37:10 +02:00
parent 212a680541
commit 41929955d3
4 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Aquaria/DSQ.cpp
View file

@ -4557,6 +4557,7 @@ void DSQ::onUpdate(float dt)
dsq->sound->getStats(&ca, &ma); dsq->sound->getStats(&ca, &ma);
os << " ca: " << ca << " ma: " << ma << std::endl; os << " ca: " << ca << " ma: " << ma << std::endl;
os << dsq->sound->getVolumeString() << std::endl; os << dsq->sound->getVolumeString() << std::endl;
os << "runInBG: " << core->settings.runInBackground << " nested: " << core->getNestedMains() << std::endl;
os << core->globalResolutionScale.x << ", " << core->globalResolutionScale.y << std::endl; os << core->globalResolutionScale.x << ", " << core->globalResolutionScale.y << std::endl;
os << "Lua mem: " << scriptInterface.gcGetStats() << " KB" << std::endl; os << "Lua mem: " << scriptInterface.gcGetStats() << " KB" << std::endl;

11
Aquaria/ScriptInterface.cpp
View file

@ -1580,7 +1580,7 @@ luaFunc(quad_setSegs)
{ {
Quad *b = getQuad(L); Quad *b = getQuad(L);
if (b) if (b)
b->setSegs(lua_tointeger(L, 2), lua_tointeger(L, 3), lua_tonumber(L, 4), lua_tonumber(L, 5), lua_tonumber(L, 6), lua_tonumber(L, 7), lua_tonumber(L, 8), lua_tointeger(L, 9)); b->setSegs(lua_tointeger(L, 2), lua_tointeger(L, 3), lua_tonumber(L, 4), lua_tonumber(L, 5), lua_tonumber(L, 6), lua_tonumber(L, 7), lua_tonumber(L, 8), getBool(L, 9));
luaReturnNil(); luaReturnNil();
} }
@ -9079,7 +9079,6 @@ static const struct {
luaRegister(entity_setCull), luaRegister(entity_setCull),
luaRegister(entity_setTexture),
luaRegister(entity_setFillGrid), luaRegister(entity_setFillGrid),
luaRegister(entity_isFillGrid), luaRegister(entity_isFillGrid),
@ -9111,8 +9110,6 @@ static const struct {
luaRegister(entity_warpLastPosition), luaRegister(entity_warpLastPosition),
luaRegister(entity_x),
luaRegister(entity_y),
luaRegister(entity_setVel), luaRegister(entity_setVel),
luaRegister(entity_setVelLen), luaRegister(entity_setVelLen),
luaRegister(entity_getVelLen), luaRegister(entity_getVelLen),
@ -9938,9 +9935,9 @@ void ScriptInterface::init()
bool devmode = dsq->isDeveloperKeys(); bool devmode = dsq->isDeveloperKeys();
// Everything on in dev mode, everything off otherwise. // Everything on in dev mode, everything off otherwise.
bool loudScriptErrors = devmode; loudScriptErrors = devmode;
bool complainOnGlobalVar = devmode; complainOnGlobalVar = devmode;
bool complainOnUndefLocal = devmode; complainOnUndefLocal = devmode;
if (!baseState) if (!baseState)
baseState = createLuaVM(); baseState = createLuaVM();

2
BBGE/Core.cpp
View file

@ -2746,8 +2746,6 @@ void Core::setMousePosition(const Vector &p)
// used to update all render objects either uniformly or as part of a time sliced update process // used to update all render objects either uniformly or as part of a time sliced update process
void Core::updateRenderObjects(float dt) void Core::updateRenderObjects(float dt)
{ {
//HACK: we may not always be assuming virtual 800x600
Vector cameraC = core->cameraPos + Vector(400,300);
for (int c = 0; c < renderObjectLayers.size(); c++) for (int c = 0; c < renderObjectLayers.size(); c++)
{ {

1
BBGE/SoundManager.cpp
View file

@ -483,7 +483,6 @@ std::string SoundManager::getVolumeString()
musicChannel2->getVolume(&musicChannel2Vol); musicChannel2->getVolume(&musicChannel2Vol);
os << "curMusVol (c1/c2/g): " << musicChannelVol << " " << musicChannel2Vol << " " << musicGroupVol << std::endl; os << "curMusVol (c1/c2/g): " << musicChannelVol << " " << musicChannel2Vol << " " << musicGroupVol << std::endl;
os << "runInBG: " << core->settings.runInBackground << std::endl;
return os.str(); return os.str();
} }