#include "clouds.h"
#include "httpfetch.h"
#include "util/numeric.h"
+#ifdef __ANDROID__
+#include "tile.h"
+#include <GLES/gl.h>
+#endif
#include <IGUIStaticText.h>
#include <ICameraSceneNode.h>
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());
}
}
m_menu->quitMenu();
- m_menu->drop();
- m_menu = 0;
+ m_menu->remove();
+ delete m_menu;
+ m_menu = NULL;
}
/******************************************************************************/
sleep_ms(25);
m_script->step();
+
+#ifdef __ANDROID__
+ m_menu->getAndroidUIInput();
+#endif
}
}
m_sound_manager = NULL;
}
- //TODO: clean up m_menu here
-
infostream<<"GUIEngine: Deinitializing scripting"<<std::endl;
delete m_script;
HTTPFetchResult fetchresult;
fetchrequest.url = url;
fetchrequest.caller = HTTPFETCH_SYNC;
+ fetchrequest.timeout = g_settings->getS32("curl_file_download_timeout");
httpfetch_sync(fetchrequest, fetchresult);
if (fetchresult.succeeded) {