mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-12-01 15:35:47 +00:00
Code Issues Releases Wiki Activity

work around dev warning message; fix compiler warning

Browse source
This commit is contained in:
fgenesis 2018-01-02 15:31:47 +01:00
parent 1acad1069e
commit 3a96c775db
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Aquaria/AquariaComboBox.cpp
View file

@ -272,7 +272,7 @@ void AquariaComboBox::close(float t)
} }
if (t>0) if (t>0)
dsq->run(t); dsq->run(t, true);
for(size_t i = 0; i < shownItems.size(); i++) for(size_t i = 0; i < shownItems.size(); i++)
{ {

4
Aquaria/DSQ.cpp
View file

@ -3617,9 +3617,9 @@ bool DSQ::isQuitFlag()
return watchQuitFlag; return watchQuitFlag;
} }
void DSQ::run(float runTime /* = -1 */) void DSQ::run(float runTime /* = -1 */, bool skipRecurseCheck)
{ {
if(isDeveloperKeys() && isNested()) if(isDeveloperKeys() && isNested() && !skipRecurseCheck)
errorLog("Warning: Nesting recursive main()"); errorLog("Warning: Nesting recursive main()");
Core::run(runTime); Core::run(runTime);

2
Aquaria/DSQ.h
View file

@ -353,7 +353,7 @@ public:
void rumble(float leftMotor, float rightMotor, float time, int source, InputDevice device); void rumble(float leftMotor, float rightMotor, float time, int source, InputDevice device);
void vision(std::string folder, int num, bool ignoreMusic = false); void vision(std::string folder, int num, bool ignoreMusic = false);
void run(float runTime = -1); // same as Core::run() but with recursion check void run(float runTime = -1, bool skipRecurseCheck = false); // same as Core::run() but with recursion check
void watch(float t, int canQuit = 0); void watch(float t, int canQuit = 0);
std::string lastVoiceFile; std::string lastVoiceFile;

4
Aquaria/ScriptInterface.cpp
View file

@ -7878,8 +7878,8 @@ static size_t _entityFilterT(lua_State *L, F& func)
const Entity *ignore = lua_isuserdata(L, 4) ? entity(L, 4) : NULL; const Entity *ignore = lua_isuserdata(L, 4) ? entity(L, 4) : NULL;
const EntityType et = lua_isnumber(L, 5) ? (EntityType)lua_tointeger(L, 5) : ET_NOTYPE; const EntityType et = lua_isnumber(L, 5) ? (EntityType)lua_tointeger(L, 5) : ET_NOTYPE;
const DamageType dt = lua_isnumber(L, 6) ? (DamageType)lua_tointeger(L, 6) : DT_NONE; const DamageType dt = lua_isnumber(L, 6) ? (DamageType)lua_tointeger(L, 6) : DT_NONE;
const unsigned lrStart = lua_isnumber(L, 7) ? lua_tointeger(L, 7) : -1; const int lrStart = lua_isnumber(L, 7) ? lua_tointeger(L, 7) : -1;
const unsigned lrEnd = lua_isnumber(L, 8) ? lua_tointeger(L, 8) : -1; const int lrEnd = lua_isnumber(L, 8) ? lua_tointeger(L, 8) : -1;
const float sqrRadius = radius * radius; const float sqrRadius = radius * radius;
float distsq; float distsq;

2
BBGE/Core.h
View file

@ -529,7 +529,7 @@ protected:
void setupFileAccess(); void setupFileAccess();
std::string _extraDataDir; std::string _extraDataDir;
std::vector<ActionButtonStatus*> actionStatus; std::vector<ActionButtonStatus*> actionStatus; // contains at least 1 element (the sentinel)
virtual void updateActionButtons(); virtual void updateActionButtons();
void clearActionButtons(); void clearActionButtons();