oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-11 17:51:04 +00:00
Code Wiki Activity

[CSM] sound_play & sound_stop support + client_lua_api doc (#5096)

Browse source 
* squashed: CSM: Implement register_globalstep
  * Re-use fatal error mechanism from server to disconnect client on CSM error
  * Little client functions cleanups

* squashed: CSM: add core.after function
  * core.after is shared code between client & server
  * ModApiUtil get_us_time feature enabled for client
This commit is contained in:
Loïc Blot 2017-01-22 11:17:41 +01:00
parent d7bc346981
commit 2c19d51409
23 changed files with 996 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/script/lua_api/l_mainmenu.cpp
View file

@ -32,9 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "convert_json.h"
#include "serverlist.h"
#include "mapgen.h"
#include "sound.h"
#include "settings.h"
#include "log.h"
#include "EDriverTypes.h"
#include <IFileArchive.h>
@ -962,33 +960,6 @@ int ModApiMainMenu::l_show_file_open_dialog(lua_State *L)
return 0;
}
/******************************************************************************/
int ModApiMainMenu::l_sound_play(lua_State *L)
{
GUIEngine* engine = getGuiEngine(L);
SimpleSoundSpec spec;
read_soundspec(L, 1, spec);
bool looped = lua_toboolean(L, 2);
u32 handle = engine->playSound(spec, looped);
lua_pushinteger(L, handle);
return 1;
}
/******************************************************************************/
int ModApiMainMenu::l_sound_stop(lua_State *L)
{
GUIEngine* engine = getGuiEngine(L);
u32 handle = luaL_checkinteger(L, 1);
engine->stopSound(handle);
return 1;
}
/******************************************************************************/
int ModApiMainMenu::l_download_file(lua_State *L)
{
@ -1160,8 +1131,6 @@ void ModApiMainMenu::Initialize(lua_State *L, int top)
API_FCT(download_file);
API_FCT(get_modstore_details);
API_FCT(get_modstore_list);
API_FCT(sound_play);
API_FCT(sound_stop);
API_FCT(gettext);
API_FCT(get_video_drivers);
API_FCT(get_video_modes);