X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2FguiEngine.cpp;h=e9b4e54c19c8e1d8a86806f685097de6e7a91de7;hb=b24e6433df3c3b2926568aff9c0173459e3e8eab;hp=5f5b4bbff419702866c579b6b823c7fd5ce297a5;hpb=b3a36f7378ea0f299cfa36c81de42e00adb7292d;p=dragonfireclient.git

diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp
index 5f5b4bbff..e9b4e54c1 100644
--- a/src/guiEngine.cpp
+++ b/src/guiEngine.cpp
@@ -60,9 +60,8 @@ void TextDestGuiEngine::gotText(const std::wstring &text)
 /******************************************************************************/
 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();
+	for (const std::string &texture_to_delete : m_to_delete) {
+		const char *tname = texture_to_delete.c_str();
 		video::ITexture *texture = m_driver->getTexture(tname);
 		m_driver->removeTexture(texture);
 	}
@@ -126,8 +125,8 @@ GUIEngine::GUIEngine(JoystickController *joystick,
 	m_kill(kill)
 {
 	//initialize texture pointers
-	for (unsigned int i = 0; i < TEX_LAYER_MAX; i++) {
-		m_textures[i].texture = NULL;
+	for (image_definition &texture : m_textures) {
+		texture.texture = NULL;
 	}
 	// is deleted by guiformspec!
 	m_buttonhandler = new TextDestGuiEngine(this);
@@ -299,9 +298,9 @@ GUIEngine::~GUIEngine()
 	m_irr_toplefttext->setText(L"");
 
 	//clean up texture pointers
-	for (unsigned int i = 0; i < TEX_LAYER_MAX; i++) {
-		if (m_textures[i].texture)
-			RenderingEngine::get_video_driver()->removeTexture(m_textures[i].texture);
+	for (image_definition &texture : m_textures) {
+		if (texture.texture)
+			RenderingEngine::get_video_driver()->removeTexture(texture.texture);
 	}
 
 	delete m_texture_source;
@@ -313,8 +312,9 @@ GUIEngine::~GUIEngine()
 /******************************************************************************/
 void GUIEngine::cloudInit()
 {
-	m_cloud.clouds = new Clouds(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));
@@ -501,7 +501,7 @@ bool GUIEngine::setTexture(texture_layer layer, std::string texturepath,
 		m_textures[layer].texture = NULL;
 	}
 
-	if ((texturepath == "") || !fs::PathExists(texturepath)) {
+	if (texturepath.empty() || !fs::PathExists(texturepath)) {
 		return false;
 	}
 
@@ -509,7 +509,7 @@ bool GUIEngine::setTexture(texture_layer layer, std::string texturepath,
 	m_textures[layer].tile    = tile_image;
 	m_textures[layer].minsize = minsize;
 
-	if (m_textures[layer].texture == NULL) {
+	if (!m_textures[layer].texture) {
 		return false;
 	}
 
@@ -547,7 +547,7 @@ bool GUIEngine::downloadFile(const std::string &url, const std::string &target)
 /******************************************************************************/
 void GUIEngine::setTopleftText(const std::string &text)
 {
-	m_toplefttext = utf8_to_wide(text);
+	m_toplefttext = translate_string(utf8_to_wide(text));
 
 	updateTopLeftTextSize();
 }