#include "scripting_mainmenu.h"
#include "config.h"
+#include "version.h"
#include "porting.h"
#include "filesys.h"
#include "main.h"
#include "guiMainMenu.h"
#include "sound.h"
#include "sound_openal.h"
+#include "clouds.h"
+#include "httpfetch.h"
#include <IGUIStaticText.h>
#include <ICameraSceneNode.h>
#include <curl/curl.h>
#endif
+/******************************************************************************/
+/** TextDestGuiEngine */
/******************************************************************************/
TextDestGuiEngine::TextDestGuiEngine(GUIEngine* engine)
{
m_engine->getScriptIface()->handleMainMenuEvent(wide_to_narrow(text));
}
+/******************************************************************************/
+/** MenuTextureSource */
+/******************************************************************************/
+MenuTextureSource::MenuTextureSource(video::IVideoDriver *driver)
+{
+ m_driver = driver;
+}
+
+/******************************************************************************/
+MenuTextureSource::~MenuTextureSource()
+{
+ for (std::set<std::string>::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);
+ }
+}
+
+/******************************************************************************/
+video::ITexture* MenuTextureSource::getTexture(const std::string &name, u32 *id)
+{
+ if(id)
+ *id = 0;
+ if(name.empty())
+ return NULL;
+ m_to_delete.insert(name);
+ return m_driver->getTexture(name.c_str());
+}
+
+/******************************************************************************/
+/** MenuMusicFetcher */
/******************************************************************************/
void MenuMusicFetcher::fetchSounds(const std::string &name,
std::set<std::string> &dst_paths,
dst_paths.insert(base + DIR_DELIM + name + "."+itos(i)+".ogg");
}
+/******************************************************************************/
+/** GUIEngine */
/******************************************************************************/
GUIEngine::GUIEngine( irr::IrrlichtDevice* dev,
gui::IGUIElement* parent,
IMenuManager *menumgr,
scene::ISceneManager* smgr,
- MainMenuData* data) :
+ MainMenuData* data,
+ bool& kill) :
m_device(dev),
m_parent(parent),
m_menumanager(menumgr),
m_smgr(smgr),
m_data(data),
+ m_texture_source(NULL),
m_sound_manager(NULL),
m_formspecgui(0),
m_buttonhandler(0),
m_menu(0),
+ m_kill(kill),
m_startgame(false),
m_script(0),
m_scriptdir(""),
// is deleted by guiformspec!
m_buttonhandler = new TextDestGuiEngine(this);
+ //create texture source
+ m_texture_source = new MenuTextureSource(m_device->getVideoDriver());
+
//create soundmanager
MenuMusicFetcher soundfetcher;
#if USE_SOUND
m_sound_manager = &dummySoundManager;
//create topleft header
- core::rect<s32> rect(0, 0, 500, 40);
+ core::rect<s32> rect(0, 0, 500, 20);
rect += v2s32(4, 0);
- std::string t = "Minetest " VERSION_STRING;
+ std::string t = std::string("Minetest ") + minetest_version_hash;
m_irr_toplefttext =
m_device->getGUIEnvironment()->addStaticText(narrow_to_wide(t).c_str(),
-1,
m_menumanager,
0 /* &client */,
- 0 /* gamedef */);
+ 0 /* gamedef */,
+ m_texture_source);
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);
// Initialize scripting
}
else {
infostream
- << "GUIEngine: execution of custom menu failed!"
+ << "GUIEngine: execution of custom menu: \""
+ << menuscript << "\" failed!"
<< std::endl
<< "\tfalling back to builtin menu"
<< std::endl;
cloudInit();
- while(m_device->run() && (!m_startgame)) {
+ while(m_device->run() && (!m_startgame) && (!m_kill)) {
driver->beginScene(true, true, video::SColor(255,140,186,250));
if (m_clouds_enabled)
cloudPostProcess();
else
sleep_ms(25);
+
+ m_script->Step();
}
}
m_irr_toplefttext->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]);
}
+
+ delete m_texture_source;
if (m_cloud.clouds)
m_cloud.clouds->drop();
}
/* Draw background texture */
- v2u32 sourcesize = texture->getSize();
+ v2u32 sourcesize = texture->getOriginalSize();
driver->draw2DImage(texture,
core::rect<s32>(0, 0, screensize.X, screensize.Y),
core::rect<s32>(0, 0, sourcesize.X, sourcesize.Y),
return;
/* Draw background texture */
- v2u32 sourcesize = texture->getSize();
+ v2u32 sourcesize = texture->getOriginalSize();
driver->draw2DImage(texture,
core::rect<s32>(0, 0, screensize.X, screensize.Y),
core::rect<s32>(0, 0, sourcesize.X, sourcesize.Y),
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,
driver->draw2DImage(texture, splashrect,
core::rect<s32>(core::position2d<s32>(0,0),
- core::dimension2di(texture->getSize())),
+ core::dimension2di(texture->getOriginalSize())),
NULL, NULL, true);
}
}
driver->draw2DImage(texture, rect,
core::rect<s32>(core::position2d<s32>(0,0),
- core::dimension2di(texture->getSize())),
+ core::dimension2di(texture->getOriginalSize())),
NULL, NULL, true);
}
}
}
/******************************************************************************/
-#if USE_CURL
-static size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *userp)
-{
- 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;
-
- curl = curl_easy_init();
-
- if (curl)
- {
- CURLcode res;
- bool retval = true;
+ bool retval = true;
- FILE* targetfile = fopen(target.c_str(),"wb");
+ 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);
+ if (targetfile) {
+ HTTPFetchRequest fetchrequest;
+ HTTPFetchResult fetchresult;
+ fetchrequest.url = url;
+ fetchrequest.caller = HTTPFETCH_SYNC;
+ httpfetch_sync(fetchrequest,fetchresult);
- res = curl_easy_perform(curl);
- if (res != CURLE_OK) {
- errorstream << "File at url \"" << url
- <<"\" not found (" << curl_easy_strerror(res) << ")" <<std::endl;
+ if (fetchresult.succeeded) {
+ if (fwrite(fetchresult.data.c_str(),1,fetchresult.data.size(),targetfile) != fetchresult.data.size()) {
retval = false;
}
- fclose(targetfile);
}
else {
retval = false;
}
-
- curl_easy_cleanup(curl);
- return retval;
+ fclose(targetfile);
}
-#endif
+ else {
+ retval = false;
+ }
+
+ return retval;
+#else
return false;
+#endif
}
/******************************************************************************/
void GUIEngine::setTopleftText(std::string append) {
- std::string toset = "Minetest " VERSION_STRING;
+ std::string toset = std::string("Minetest ") + minetest_version_hash;
if (append != "") {
toset += " / ";
{
m_sound_manager->stopSound(handle);
}
+
+/******************************************************************************/
+unsigned int GUIEngine::DoAsync(std::string serialized_fct,
+ std::string serialized_params) {
+ return m_script->DoAsync(serialized_fct,serialized_params);
+}
projects / dragonfireclient.git / blobdiff