X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2FguiEngine.cpp;h=d8d8d3b1193cb99ac015294b23c112d13e5f0fe3;hb=b5f7249a7edc25077d84b27b38552228b92ff763;hp=b62c1a5471456e474c608aa8615f578b2a385578;hpb=4fb4efd8ed54a81ea545e51265f2acdd01654f21;p=oweals%2Fminetest.git diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp index b62c1a547..d8d8d3b11 100644 --- a/src/guiEngine.cpp +++ b/src/guiEngine.cpp @@ -17,113 +17,123 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -extern "C" { -#include "lua.h" -#include "lauxlib.h" -#include "lualib.h" -} - -#include "irrlicht.h" +#include "guiEngine.h" +#include +#include +#include "client/renderingengine.h" +#include "scripting_mainmenu.h" +#include "util/numeric.h" +#include "config.h" +#include "version.h" #include "porting.h" #include "filesys.h" -#include "main.h" #include "settings.h" #include "guiMainMenu.h" #include "sound.h" #include "sound_openal.h" +#include "clouds.h" +#include "httpfetch.h" +#include "log.h" +#include "fontengine.h" +#include "guiscalingfilter.h" +#include "irrlicht_changes/static_text.h" + +#ifdef __ANDROID__ +#include "client/tile.h" +#include +#endif -#include "guiEngine.h" -#if USE_CURL -#include -#endif +/******************************************************************************/ +void TextDestGuiEngine::gotText(const StringMap &fields) +{ + m_engine->getScriptIface()->handleMainMenuButtons(fields); +} /******************************************************************************/ -int menuscript_ErrorHandler(lua_State *L) { - lua_getfield(L, LUA_GLOBALSINDEX, "debug"); - if (!lua_istable(L, -1)) { - lua_pop(L, 1); - return 1; - } - lua_getfield(L, -1, "traceback"); - if (!lua_isfunction(L, -1)) { - lua_pop(L, 2); - return 1; - } - lua_pushvalue(L, 1); - lua_pushinteger(L, 2); - lua_call(L, 2, 1); - return 1; +void TextDestGuiEngine::gotText(const std::wstring &text) +{ + m_engine->getScriptIface()->handleMainMenuEvent(wide_to_utf8(text)); } /******************************************************************************/ -TextDestGuiEngine::TextDestGuiEngine(GUIEngine* engine) +MenuTextureSource::~MenuTextureSource() { - m_engine = engine; + for (std::set::iterator it = m_to_delete.begin(); + it != m_to_delete.end(); ++it) { + const char *tname = (*it).c_str(); + video::ITexture *texture = m_driver->getTexture(tname); + m_driver->removeTexture(texture); + } } /******************************************************************************/ -void TextDestGuiEngine::gotText(std::map fields) +video::ITexture *MenuTextureSource::getTexture(const std::string &name, u32 *id) { - m_engine->handleButtons(fields); + if(id) + *id = 0; + if(name.empty()) + return NULL; + m_to_delete.insert(name); + +#ifdef __ANDROID__ + video::IImage *image = m_driver->createImageFromFile(name.c_str()); + if (image) { + image = Align2Npot2(image, m_driver); + video::ITexture* retval = m_driver->addTexture(name.c_str(), image); + image->drop(); + return retval; + } +#endif + return m_driver->getTexture(name.c_str()); } /******************************************************************************/ -void TextDestGuiEngine::gotText(std::wstring text) +/** MenuMusicFetcher */ +/******************************************************************************/ +void MenuMusicFetcher::fetchSounds(const std::string &name, + std::set &dst_paths, + std::set &dst_datas) { - m_engine->handleEvent(wide_to_narrow(text)); + if(m_fetched.count(name)) + return; + m_fetched.insert(name); + std::string base; + base = porting::path_share + DIR_DELIM + "sounds"; + dst_paths.insert(base + DIR_DELIM + name + ".ogg"); + int i; + for(i=0; i<10; i++) + dst_paths.insert(base + DIR_DELIM + name + "."+itos(i)+".ogg"); + base = porting::path_user + DIR_DELIM + "sounds"; + dst_paths.insert(base + DIR_DELIM + name + ".ogg"); + for(i=0; i<10; i++) + dst_paths.insert(base + DIR_DELIM + name + "."+itos(i)+".ogg"); } /******************************************************************************/ -GUIEngine::GUIEngine( irr::IrrlichtDevice* dev, - gui::IGUIElement* parent, - IMenuManager *menumgr, - scene::ISceneManager* smgr, - MainMenuData* data) : - m_device(dev), +/** GUIEngine */ +/******************************************************************************/ +GUIEngine::GUIEngine(JoystickController *joystick, + gui::IGUIElement *parent, + IMenuManager *menumgr, + MainMenuData *data, + bool &kill) : m_parent(parent), m_menumanager(menumgr), - m_smgr(smgr), + m_smgr(RenderingEngine::get_scene_manager()), m_data(data), - m_sound_manager(NULL), - m_formspecgui(0), - m_buttonhandler(0), - m_menu(0), - m_startgame(false), - m_engineluastack(0), - m_luaerrorhandler(-1), - m_scriptdir(""), - m_irr_toplefttext(0), - m_clouds_enabled(true), - m_cloud() + m_kill(kill) { //initialize texture pointers for (unsigned int i = 0; i < TEX_LAYER_MAX; i++) { - m_textures[i] = 0; + m_textures[i].texture = NULL; } // is deleted by guiformspec! m_buttonhandler = new TextDestGuiEngine(this); - //create luastack - m_engineluastack = luaL_newstate(); - - //load basic lua modules - luaL_openlibs(m_engineluastack); - - //init - guiLuaApi::initialize(m_engineluastack,this); - - //push errorstring - if (m_data->errormessage != "") - { - lua_getglobal(m_engineluastack, "gamedata"); - int gamedata_idx = lua_gettop(m_engineluastack); - lua_pushstring(m_engineluastack, "errormessage"); - lua_pushstring(m_engineluastack,m_data->errormessage.c_str()); - lua_settable(m_engineluastack, gamedata_idx); - m_data->errormessage = ""; - } + //create texture source + m_texture_source = new MenuTextureSource(RenderingEngine::get_video_driver()); //create soundmanager MenuMusicFetcher soundfetcher; @@ -134,107 +144,117 @@ GUIEngine::GUIEngine( irr::IrrlichtDevice* dev, m_sound_manager = &dummySoundManager; //create topleft header - core::rect rect(0, 0, 500, 40); + m_toplefttext = L""; + + core::rect rect(0, 0, g_fontengine->getTextWidth(m_toplefttext.c_str()), + g_fontengine->getTextHeight()); rect += v2s32(4, 0); - std::string t = "Minetest " VERSION_STRING; m_irr_toplefttext = - m_device->getGUIEnvironment()->addStaticText(narrow_to_wide(t).c_str(), - rect,false,true,0,-1); + addStaticText(RenderingEngine::get_gui_env(), m_toplefttext, + rect, false, true, 0, -1); //create formspecsource - m_formspecgui = new FormspecFormSource("",&m_formspecgui); + m_formspecgui = new FormspecFormSource(""); /* Create menu */ - m_menu = - new GUIFormSpecMenu( m_device, - m_parent, - -1, - m_menumanager, - 0 /* &client */, - 0 /* gamedef */); + m_menu = new GUIFormSpecMenu(joystick, + m_parent, + -1, + m_menumanager, + NULL /* &client */, + m_texture_source, + m_formspecgui, + m_buttonhandler, + false); m_menu->allowClose(false); m_menu->lockSize(true,v2u32(800,600)); - m_menu->setFormSource(m_formspecgui); - m_menu->setTextDest(m_buttonhandler); - m_menu->useGettext(true); - - std::string builtin_helpers - = porting::path_share + DIR_DELIM + "builtin" - + DIR_DELIM + "misc_helpers.lua"; - - if (!runScript(builtin_helpers)) { - errorstream - << "GUIEngine::GUIEngine unable to load builtin helper script" - << std::endl; - return; - } - std::string menuscript = ""; - if (g_settings->exists("main_menu_script")) - menuscript = g_settings->get("main_menu_script"); - std::string builtin_menuscript = - porting::path_share + DIR_DELIM + "builtin" - + DIR_DELIM + "mainmenu.lua"; - - lua_pushcfunction(m_engineluastack, menuscript_ErrorHandler); - m_luaerrorhandler = lua_gettop(m_engineluastack); - - m_scriptdir = menuscript.substr(0,menuscript.find_last_of(DIR_DELIM)-1); - if((menuscript == "") || (!runScript(menuscript))) { - infostream - << "GUIEngine::GUIEngine execution of custom menu failed!" - << std::endl - << "\tfalling back to builtin menu" - << std::endl; - m_scriptdir = fs::RemoveRelativePathComponents(porting::path_share + DIR_DELIM + "builtin"+ DIR_DELIM); - if(!runScript(builtin_menuscript)) { - errorstream - << "GUIEngine::GUIEngine unable to load builtin menu" - << std::endl; - assert("no future without mainmenu" == 0); + // Initialize scripting + + infostream << "GUIEngine: Initializing Lua" << std::endl; + + m_script = new MainMenuScripting(this); + + try { + m_script->setMainMenuData(&m_data->script_data); + m_data->script_data.errormessage = ""; + + if (!loadMainMenuScript()) { + errorstream << "No future without main menu!" << std::endl; + abort(); } - } - run(); + run(); + } catch (LuaError &e) { + errorstream << "Main menu error: " << e.what() << std::endl; + m_data->script_data.errormessage = e.what(); + } - m_menumanager->deletingMenu(m_menu); + m_menu->quitMenu(); m_menu->drop(); - m_menu = 0; + m_menu = NULL; } /******************************************************************************/ -bool GUIEngine::runScript(std::string script) { - - int ret = luaL_loadfile(m_engineluastack, script.c_str()) || - lua_pcall(m_engineluastack, 0, 0, m_luaerrorhandler); - if(ret){ - errorstream<<"========== ERROR FROM LUA WHILE CREATING MAIN MENU ==========="<get("main_menu_path"); + if (m_scriptdir.empty()) { + m_scriptdir = porting::path_share + DIR_DELIM + "builtin" + DIR_DELIM + "mainmenu"; } - return true; + + // Load builtin (which will load the main menu script) + std::string script = porting::path_share + DIR_DELIM "builtin" + DIR_DELIM "init.lua"; + try { + m_script->loadScript(script); + // Menu script loaded + return true; + } catch (const ModError &e) { + errorstream << "GUIEngine: execution of menu script failed: " + << e.what() << std::endl; + } + + return false; } /******************************************************************************/ void GUIEngine::run() { - // Always create clouds because they may or may not be // needed based on the game selected - video::IVideoDriver* driver = m_device->getVideoDriver(); + video::IVideoDriver *driver = RenderingEngine::get_video_driver(); cloudInit(); - while(m_device->run() && (!m_startgame)) { + unsigned int text_height = g_fontengine->getTextHeight(); + + irr::core::dimension2d previous_screen_size(g_settings->getU16("screen_w"), + g_settings->getU16("screen_h")); + + while (RenderingEngine::run() && (!m_startgame) && (!m_kill)) { + + const irr::core::dimension2d ¤t_screen_size = + RenderingEngine::get_video_driver()->getScreenSize(); + // Verify if window size has changed and save it if it's the case + // Ensure evaluating settings->getBool after verifying screensize + // First condition is cheaper + if (previous_screen_size != current_screen_size && + current_screen_size != irr::core::dimension2d(0,0) && + g_settings->getBool("autosave_screensize")) { + g_settings->setU16("screen_w", current_screen_size.Width); + g_settings->setU16("screen_h", current_screen_size.Height); + previous_screen_size = current_screen_size; + } + + //check if we need to update the "upper left corner"-text + if (text_height != g_fontengine->getTextHeight()) { + updateTopLeftTextSize(); + text_height = g_fontengine->getTextHeight(); + } + driver->beginScene(true, true, video::SColor(255,140,186,250)); if (m_clouds_enabled) @@ -248,7 +268,7 @@ void GUIEngine::run() drawHeader(driver); drawFooter(driver); - m_device->getGUIEnvironment()->drawAll(); + RenderingEngine::get_gui_env()->drawAll(); driver->endScene(); @@ -256,78 +276,36 @@ void GUIEngine::run() cloudPostProcess(); else sleep_ms(25); - } - - m_menu->quitMenu(); -} - -/******************************************************************************/ -void GUIEngine::handleEvent(std::string text) -{ - lua_getglobal(m_engineluastack, "engine"); - - lua_getfield(m_engineluastack, -1, "event_handler"); - - if(lua_isnil(m_engineluastack, -1)) - return; - luaL_checktype(m_engineluastack, -1, LUA_TFUNCTION); + m_script->step(); - lua_pushstring(m_engineluastack, text.c_str()); - - if(lua_pcall(m_engineluastack, 1, 0, m_luaerrorhandler)) - scriptError("error: %s", lua_tostring(m_engineluastack, -1)); -} - -/******************************************************************************/ -void GUIEngine::handleButtons(std::map fields) -{ - lua_getglobal(m_engineluastack, "engine"); - - lua_getfield(m_engineluastack, -1, "button_handler"); - - if(lua_isnil(m_engineluastack, -1)) - return; - - luaL_checktype(m_engineluastack, -1, LUA_TFUNCTION); - - lua_newtable(m_engineluastack); - for(std::map::const_iterator - i = fields.begin(); i != fields.end(); i++){ - const std::string &name = i->first; - const std::string &value = i->second; - lua_pushstring(m_engineluastack, name.c_str()); - lua_pushlstring(m_engineluastack, value.c_str(), value.size()); - lua_settable(m_engineluastack, -3); +#ifdef __ANDROID__ + m_menu->getAndroidUIInput(); +#endif } - - if(lua_pcall(m_engineluastack, 1, 0, m_luaerrorhandler)) - scriptError("error: %s", lua_tostring(m_engineluastack, -1)); } /******************************************************************************/ GUIEngine::~GUIEngine() { - video::IVideoDriver* driver = m_device->getVideoDriver(); - assert(driver != 0); - - if(m_sound_manager != &dummySoundManager){ + if (m_sound_manager != &dummySoundManager){ delete m_sound_manager; m_sound_manager = NULL; } - //TODO: clean up m_menu here - - lua_close(m_engineluastack); + infostream<<"GUIEngine: Deinitializing scripting"<setText(L""); - //initialize texture pointers + //clean up texture pointers for (unsigned int i = 0; i < TEX_LAYER_MAX; i++) { - if (m_textures[i] != 0) - driver->removeTexture(m_textures[i]); + if (m_textures[i].texture) + RenderingEngine::get_video_driver()->removeTexture(m_textures[i].texture); } - + + delete m_texture_source; + if (m_cloud.clouds) m_cloud.clouds->drop(); } @@ -335,21 +313,21 @@ GUIEngine::~GUIEngine() /******************************************************************************/ void GUIEngine::cloudInit() { - m_cloud.clouds = new Clouds(m_smgr->getRootSceneNode(), - m_smgr, -1, rand(), 100); - m_cloud.clouds->update(v2f(0, 0), video::SColor(255,200,200,255)); + m_cloud.clouds = new Clouds(m_smgr, -1, rand()); + m_cloud.clouds->setHeight(100.0f); + m_cloud.clouds->update(v3f(0, 0, 0), video::SColor(255,200,200,255)); m_cloud.camera = m_smgr->addCameraSceneNode(0, v3f(0,0,0), v3f(0, 60, 100)); m_cloud.camera->setFarValue(10000); - m_cloud.lasttime = m_device->getTimer()->getTime(); + m_cloud.lasttime = RenderingEngine::get_timer_time(); } /******************************************************************************/ void GUIEngine::cloudPreProcess() { - u32 time = m_device->getTimer()->getTime(); + u32 time = RenderingEngine::get_timer_time(); if(time > m_cloud.lasttime) m_cloud.dtime = (time - m_cloud.lasttime) / 1000.0; @@ -366,33 +344,32 @@ void GUIEngine::cloudPreProcess() /******************************************************************************/ void GUIEngine::cloudPostProcess() { - float fps_max = g_settings->getFloat("fps_max"); + float fps_max = g_settings->getFloat("pause_fps_max"); // Time of frame without fps limit - float busytime; u32 busytime_u32; + // not using getRealTime is necessary for wine - u32 time = m_device->getTimer()->getTime(); + u32 time = RenderingEngine::get_timer_time(); if(time > m_cloud.lasttime) busytime_u32 = time - m_cloud.lasttime; else busytime_u32 = 0; - busytime = busytime_u32 / 1000.0; // FPS limiter u32 frametime_min = 1000./fps_max; - if(busytime_u32 < frametime_min) { + if (busytime_u32 < frametime_min) { u32 sleeptime = frametime_min - busytime_u32; - m_device->sleep(sleeptime); + RenderingEngine::get_raw_device()->sleep(sleeptime); } } /******************************************************************************/ -void GUIEngine::drawBackground(video::IVideoDriver* driver) +void GUIEngine::drawBackground(video::IVideoDriver *driver) { v2u32 screensize = driver->getScreenSize(); - video::ITexture* texture = m_textures[TEX_LAYER_BACKGROUND]; + video::ITexture* texture = m_textures[TEX_LAYER_BACKGROUND].texture; /* If no texture, draw background of solid color */ if(!texture){ @@ -402,51 +379,70 @@ void GUIEngine::drawBackground(video::IVideoDriver* driver) return; } + v2u32 sourcesize = texture->getOriginalSize(); + + if (m_textures[TEX_LAYER_BACKGROUND].tile) + { + v2u32 tilesize( + MYMAX(sourcesize.X,m_textures[TEX_LAYER_BACKGROUND].minsize), + MYMAX(sourcesize.Y,m_textures[TEX_LAYER_BACKGROUND].minsize)); + for (unsigned int x = 0; x < screensize.X; x += tilesize.X ) + { + for (unsigned int y = 0; y < screensize.Y; y += tilesize.Y ) + { + draw2DImageFilterScaled(driver, texture, + core::rect(x, y, x+tilesize.X, y+tilesize.Y), + core::rect(0, 0, sourcesize.X, sourcesize.Y), + NULL, NULL, true); + } + } + return; + } + /* Draw background texture */ - v2u32 sourcesize = texture->getSize(); - driver->draw2DImage(texture, + draw2DImageFilterScaled(driver, texture, core::rect(0, 0, screensize.X, screensize.Y), core::rect(0, 0, sourcesize.X, sourcesize.Y), NULL, NULL, true); } /******************************************************************************/ -void GUIEngine::drawOverlay(video::IVideoDriver* driver) +void GUIEngine::drawOverlay(video::IVideoDriver *driver) { v2u32 screensize = driver->getScreenSize(); - video::ITexture* texture = m_textures[TEX_LAYER_OVERLAY]; + video::ITexture* texture = m_textures[TEX_LAYER_OVERLAY].texture; - /* If no texture, draw background of solid color */ + /* If no texture, draw nothing */ if(!texture) return; /* Draw background texture */ - v2u32 sourcesize = texture->getSize(); - driver->draw2DImage(texture, + v2u32 sourcesize = texture->getOriginalSize(); + draw2DImageFilterScaled(driver, texture, core::rect(0, 0, screensize.X, screensize.Y), core::rect(0, 0, sourcesize.X, sourcesize.Y), NULL, NULL, true); } /******************************************************************************/ -void GUIEngine::drawHeader(video::IVideoDriver* driver) +void GUIEngine::drawHeader(video::IVideoDriver *driver) { core::dimension2d screensize = driver->getScreenSize(); - video::ITexture* texture = m_textures[TEX_LAYER_HEADER]; + video::ITexture* texture = m_textures[TEX_LAYER_HEADER].texture; /* If no texture, draw nothing */ if(!texture) return; - f32 mult = (((f32)screensize.Width / 2)) / + f32 mult = (((f32)screensize.Width / 2.0)) / ((f32)texture->getOriginalSize().Width); v2s32 splashsize(((f32)texture->getOriginalSize().Width) * mult, ((f32)texture->getOriginalSize().Height) * mult); - // Don't draw the header is there isn't enough room + // Don't draw the header if there isn't enough room s32 free_space = (((s32)screensize.Height)-320)/2; if (free_space > splashsize.Y) { @@ -456,19 +452,19 @@ void GUIEngine::drawHeader(video::IVideoDriver* driver) video::SColor bgcolor(255,50,50,50); - driver->draw2DImage(texture, splashrect, + draw2DImageFilterScaled(driver, texture, splashrect, core::rect(core::position2d(0,0), - core::dimension2di(texture->getSize())), + core::dimension2di(texture->getOriginalSize())), NULL, NULL, true); } } /******************************************************************************/ -void GUIEngine::drawFooter(video::IVideoDriver* driver) +void GUIEngine::drawFooter(video::IVideoDriver *driver) { core::dimension2d screensize = driver->getScreenSize(); - video::ITexture* texture = m_textures[TEX_LAYER_FOOTER]; + video::ITexture* texture = m_textures[TEX_LAYER_FOOTER].texture; /* If no texture, draw nothing */ if(!texture) @@ -488,104 +484,86 @@ void GUIEngine::drawFooter(video::IVideoDriver* driver) rect += v2s32(screensize.Width/2,screensize.Height-footersize.Y); rect -= v2s32(footersize.X/2, 0); - driver->draw2DImage(texture, rect, + draw2DImageFilterScaled(driver, texture, rect, core::rect(core::position2d(0,0), - core::dimension2di(texture->getSize())), + core::dimension2di(texture->getOriginalSize())), NULL, NULL, true); } } /******************************************************************************/ -bool GUIEngine::setTexture(texture_layer layer,std::string texturepath) { - - video::IVideoDriver* driver = m_device->getVideoDriver(); - assert(driver != 0); +bool GUIEngine::setTexture(texture_layer layer, std::string texturepath, + bool tile_image, unsigned int minsize) +{ + video::IVideoDriver *driver = RenderingEngine::get_video_driver(); - if (m_textures[layer] != 0) - { - driver->removeTexture(m_textures[layer]); - m_textures[layer] = 0; + if (m_textures[layer].texture) { + driver->removeTexture(m_textures[layer].texture); + m_textures[layer].texture = NULL; } - if ((texturepath == "") || !fs::PathExists(texturepath)) + if ((texturepath == "") || !fs::PathExists(texturepath)) { return false; + } - m_textures[layer] = driver->getTexture(texturepath.c_str()); + m_textures[layer].texture = driver->getTexture(texturepath.c_str()); + m_textures[layer].tile = tile_image; + m_textures[layer].minsize = minsize; - if (m_textures[layer] == 0) return false; + if (m_textures[layer].texture == NULL) { + return false; + } return true; } /******************************************************************************/ -#if USE_CURL -static size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *userp) +bool GUIEngine::downloadFile(const std::string &url, const std::string &target) { - FILE* targetfile = (FILE*) userp; - fwrite(contents,size,nmemb,targetfile); - return size * nmemb; -} -#endif -bool GUIEngine::downloadFile(std::string url,std::string target) { #if USE_CURL - //download file via curl - CURL *curl; + std::ofstream target_file(target.c_str(), std::ios::out | std::ios::binary); - curl = curl_easy_init(); + if (!target_file.good()) { + return false; + } - if (curl) - { - CURLcode res; - bool retval = true; - - FILE* targetfile = fopen(target.c_str(),"wb"); - - if (targetfile) { - curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1); - curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); - curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback); - curl_easy_setopt(curl, CURLOPT_WRITEDATA, targetfile); - - res = curl_easy_perform(curl); - if (res != CURLE_OK) { - errorstream << "File at url \"" << url - <<"\" not found (" << curl_easy_strerror(res) << ")" <getS32("curl_file_download_timeout"); + httpfetch_sync(fetch_request, fetch_result); - curl_easy_cleanup(curl); - return retval; + if (!fetch_result.succeeded) { + return false; } -#endif + target_file << fetch_result.data; + + return true; +#else return false; +#endif } /******************************************************************************/ -void GUIEngine::scriptError(const char *fmt, ...) +void GUIEngine::setTopleftText(const std::string &text) { - va_list argp; - va_start(argp, fmt); - char buf[10000]; - vsnprintf(buf, 10000, fmt, argp); - va_end(argp); - errorstream<<"MAINMENU ERROR: "< rect(0, 0, g_fontengine->getTextWidth(m_toplefttext.c_str()), + g_fontengine->getTextHeight()); + rect += v2s32(4, 0); - m_irr_toplefttext->setText(narrow_to_wide(toset).c_str()); + m_irr_toplefttext->remove(); + m_irr_toplefttext = + addStaticText(RenderingEngine::get_gui_env(), m_toplefttext, + rect, false, true, 0, -1); } /******************************************************************************/ @@ -600,3 +578,11 @@ void GUIEngine::stopSound(s32 handle) { m_sound_manager->stopSound(handle); } + +/******************************************************************************/ +unsigned int GUIEngine::queueAsync(const std::string &serialized_func, + const std::string &serialized_params) +{ + return m_script->queueAsync(serialized_func, serialized_params); +} +