actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed CheckEnum to use lua_isnoneornil so that enum args can be made properly optional. Changed PlayMusicPart to allow nil for optional args so optional args would be independent.

Browse Source
This commit is contained in:
Kyzentun
2014-07-19 15:20:02 -06:00
parent 305e80a08b
commit 4c97ff64a0
2 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/EnumHelper.cpp
+1 -3
View File
@@ -6,9 +6,7 @@
int CheckEnum( lua_State *L, LuaReference &table, int iPos, int iInvalid, const char *szType, bool bAllowInvalid, bool bAllowAnything )
{
luaL_checkany( L, iPos );
if( lua_isnil(L, iPos) )
if( lua_isnoneornil(L, iPos) )
{
if( bAllowInvalid )
return iInvalid;
src/GameSoundManager.cpp
+18 -18
View File
@@ -728,7 +728,7 @@ void GameSoundManager::PlayMusic( PlayMusicParams params, PlayMusicParams Fallba
ToPlay.fFadeInLengthSeconds = params.fFadeInLengthSeconds;
ToPlay.fFadeOutLengthSeconds = params.fFadeOutLengthSeconds;
ToPlay.bAlignBeat = params.bAlignBeat;
ToPlay.bApplyMusicRate = params.bApplyMusicRate;
x ToPlay.bApplyMusicRate = params.bApplyMusicRate;
/* Add the MusicToPlay to the g_MusicsToPlay queue. */
g_Mutex->Lock();
@@ -835,25 +835,25 @@ public:
bool loop= false;
bool applyRate= false;
bool alignBeat= true;
if (lua_gettop(L) >= 4 && !lua_isnil(L,4))
if(!lua_isnoneornil(L, 4))
{
fadeIn = FArg(4);
if (lua_gettop(L) >= 5 && !lua_isnil(L,5))
{
fadeOut = FArg(5);
if (lua_gettop(L) >= 6 && !lua_isnil(L,6))
{
loop = BArg(6);
if (lua_gettop(L) >= 7 && !lua_isnil(L,7))
{
applyRate = BArg(7);
if (lua_gettop(L) >= 8 && !lua_isnil(L,8))
{
alignBeat = BArg(8);
}
}
}
}
}
if(!lua_isnoneornil(L, 5))
{
fadeOut = FArg(5);
}
if(!lua_isnoneornil(L, 6))
{
loop = BArg(6);
}
if(!lua_isnoneornil(L, 7))
{
applyRate = BArg(7);
}
if(!lua_isnoneornil(L, 8))
{
alignBeat = BArg(8);
}
p->PlayMusic(musicPath, NULL, loop, musicStart, musicLength,
fadeIn, fadeOut, alignBeat, applyRate);