diff --git a/singe/singe.c b/singe/singe.c index 1d1738617..c9f84d3e6 100644 --- a/singe/singe.c +++ b/singe/singe.c @@ -696,7 +696,7 @@ int32_t apiDiscSkipForward(lua_State *L) { } } } else { - luaDie(L, "discSkipForward", "Failed! Disc is stopped."); + luaTrace(L, "discSkipForward", "Failed! Disc is stopped."); return 0; } @@ -1480,13 +1480,13 @@ int32_t apiSoundPlay(lua_State *L) { // Play it (can gracefully fail if we run out of channels) r = Mix_PlayChannel(-1, sound->chunk, 0); if (r >= 0) { - Mix_Volume(result, _global.effectsVolume * 2); + Mix_Volume(r, _global.effectsVolume * 2); } result = true; } } - if (sound) { + if (result) { luaTrace(L, "soundPlay", "%d", r); } else { luaDie(L, "soundPlay", "Failed!"); @@ -1596,6 +1596,7 @@ int32_t apiSoundIsPlaying(lua_State *L) { if (lua_isnumber(L, 1)) { d = lua_tonumber(L, 1); channel = (int32_t)d; r = (bool)Mix_Playing(channel); + result = true; } } diff --git a/singe/singe.h b/singe/singe.h index 7383a5796..2eb456aab 100644 --- a/singe/singe.h +++ b/singe/singe.h @@ -31,7 +31,7 @@ // Don't forget to update singe.rc! #define SINGE_VERSION 2.00 -#define VERSION_STRING "v2.00b14" +#define VERSION_STRING "v2.00b15" #define COPYRIGHT_END_YEAR "2020" diff --git a/singe/singe.rc b/singe/singe.rc index dd1317996..0849bfb5a 100644 --- a/singe/singe.rc +++ b/singe/singe.rc @@ -1,7 +1,7 @@ 101 ICON "/tmp/icon.ico" 1 VERSIONINFO -FILEVERSION 2,0,0,14 -PRODUCTVERSION 2,0,0,14 +FILEVERSION 2,0,0,15 +PRODUCTVERSION 2,0,0,15 BEGIN BLOCK "StringFileInfo" BEGIN @@ -9,12 +9,12 @@ BEGIN BEGIN VALUE "CompanyName", "Kangaroo Punch Studios" VALUE "FileDescription", "Somewhat Interactive Nostalgic Game Engine" - VALUE "FileVersion", "2.00b14" + VALUE "FileVersion", "2.00b15" VALUE "InternalName", "Singe" VALUE "LegalCopyright", "Copyright 2006-2020 Scott C. Duensing" VALUE "OriginalFilename", "singe.exe" VALUE "ProductName", "Singe" - VALUE "ProductVersion", "2.00b14" + VALUE "ProductVersion", "2.00b15" END END BLOCK "VarFileInfo"