mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-15 22:19:07 +00:00
Code Issues Releases Wiki Activity

Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental

Browse source
This commit is contained in:
fgenesis 2013-10-28 03:32:55 +00:00
commit c9bcbd3c1e
5 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Aquaria/Avatar.cpp
View file

@ -5222,7 +5222,7 @@ void Avatar::updateWallJump(float dt)
void Avatar::updateRoll(float dt) void Avatar::updateRoll(float dt)
{ {
if (!inputEnabled || dsq->game->isWorldPaused()) if (!inputEnabled || dsq->game->isWorldPaused() || riding)
{ {
if (rolling) if (rolling)
stopRoll(); stopRoll();

2
Aquaria/BitBlotLogo.cpp
View file

@ -78,7 +78,7 @@ void BitBlotLogo::skipLogo()
void BitBlotLogo::getOut() void BitBlotLogo::getOut()
{ {
dsq->continuity.reset(); //dsq->continuity.reset();
#ifdef AQUARIA_DEMO #ifdef AQUARIA_DEMO
dsq->title(); dsq->title();

2
Aquaria/DSQ.cpp
View file

@ -1537,7 +1537,7 @@ This build is not yet final, and as such there are a couple things lacking. They
setMousePosition(core->center); setMousePosition(core->center);
dsq->continuity.reset(); //dsq->continuity.reset();
loadBit(LOAD_FINISHED); loadBit(LOAD_FINISHED);

4
Aquaria/Mod.cpp
View file

@ -247,17 +247,13 @@ void Mod::applyStart()
if (!dsq->runScript(scriptPath, "init")) if (!dsq->runScript(scriptPath, "init"))
{ {
debugLog("MOD: runscript failed"); debugLog("MOD: runscript failed");
dsq->continuity.reset();
setActive(false); setActive(false);
dsq->continuity.reset();
dsq->title(); dsq->title();
} }
if (isActive() && dsq->game->sceneToLoad.empty()) if (isActive() && dsq->game->sceneToLoad.empty())
{ {
debugLog("MOD: no scene loaded in mod-init"); debugLog("MOD: no scene loaded in mod-init");
dsq->continuity.reset();
setActive(false); setActive(false);
dsq->continuity.reset();
dsq->title(); dsq->title();
} }
else if (isActive()) else if (isActive())

6
Aquaria/ScriptInterface.cpp
View file

@ -8357,6 +8357,11 @@ luaFunc(isMiniMapCursorOkay)
luaReturnBool(dsq->isMiniMapCursorOkay()); luaReturnBool(dsq->isMiniMapCursorOkay());
} }
luaFunc(isShuttingDownGameState)
{
luaReturnBool(dsq->game->isShuttingDownGameState());
}
luaFunc(inv_isFull) luaFunc(inv_isFull)
{ {
IngredientData *data = dsq->continuity.getIngredientDataByName(getString(L, 1)); IngredientData *data = dsq->continuity.getIngredientDataByName(getString(L, 1));
@ -9526,6 +9531,7 @@ static const struct {
luaRegister(getScreenSize), luaRegister(getScreenSize),
luaRegister(getScreenVirtualSize), luaRegister(getScreenVirtualSize),
luaRegister(isMiniMapCursorOkay), luaRegister(isMiniMapCursorOkay),
luaRegister(isShuttingDownGameState),
luaRegister(inv_isFull), luaRegister(inv_isFull),
luaRegister(inv_getMaxAmount), luaRegister(inv_getMaxAmount),