mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-12-27 07:06:00 +00:00
Code Issues Releases Wiki Activity

Fix linux build, once more, now for real

Browse source
This commit is contained in:
fgenesis 2013-12-11 03:36:44 +01:00
parent 82ab3fa60c
commit 5336c8d350
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Aquaria/ModSelector.cpp
View file

@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "AquariaProgressBar.h"
#include "tinyxml.h"
#include "ModSelector.h"
#include <algorithm>
#ifdef BBGE_BUILD_VFS
#include "ModDownloader.h"
@ -684,7 +685,7 @@ bool ModIconOnline::fixIcon()
statusIcon = new Quad("modselect/ico_update", pos);
statusIcon->alpha.interpolateTo(0.5f, 0.5f, -1, true, true);
}
else
else
statusIcon = new Quad("modselect/ico_check", pos);
}
@ -819,7 +820,7 @@ void MenuIconBar::init()
MenuIcon *ico;
int y = (-height / 2) - 35;
ico = new MenuIcon(0);
ico->label = dsq->continuity.stringBank.get(2027);
ico->useQuad("modselect/installed");

7
Aquaria/ScriptInterface.cpp
View file

@ -36,6 +36,7 @@ extern "C"
#include "Web.h"
#include "GridRender.h"
#include "AfterEffect.h"
#include <algorithm>
#include "../BBGE/MathFunctions.h"
@ -2502,7 +2503,7 @@ luaFunc(entity_setBoneLock)
Bone *b = 0;
if (lua_isuserdata(L, 3))
b = bone(L, 3);
bl.entity = e2;
bl.bone = b;
bl.on = true;
@ -2926,7 +2927,7 @@ luaFunc(entity_playSfx)
if(sfx.vol <= 0)
sfx.vol = 1;
sfx.loops = lua_tonumber(L, 5);
float fadeOut = lua_tonumber(L, 6);
sfx.maxdist = lua_tonumber(L, 7);
sfx.relative = false;
@ -8690,7 +8691,7 @@ luaFunc(shader_setAsAfterEffect)
if(core->afterEffectManager)
done = core->afterEffectManager->setShaderPipelinePos(handle, pos);
luaReturnBool(done);
}