Warnings fix

[minetest.git] / src / guiFormSpecMenu.cpp

diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index abe519798ed404b34e997ae5d21e70cba8f80a8a..a173c0d25573293305025c9a749b38645851b9ef 100644 (file)
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -611,7 +611,7 @@ void GUIFormSpecMenu::parseTextList(parserData* data,std::string element) {
                std::vector<std::string> v_pos = split(parts[0],',');
                std::vector<std::string> v_geom = split(parts[1],',');
                std::string name = parts[2];
-               std::vector<std::string> items = split(parts[3],',');
+               std::vector<std::string> items = split(parts[3],',',true);
                std::string str_initial_selection = "";
                std::string str_transparent = "false";
 
@@ -1010,7 +1010,7 @@ void GUIFormSpecMenu::parseTextArea(parserData* data,std::vector<std::string>& p
 }
 
 void GUIFormSpecMenu::parseField(parserData* data,std::string element,std::string type) {
-       std::vector<std::string> parts = split(element,';');
+       std::vector<std::string> parts = split(element,';',true);
 
        if (parts.size() == 3) {
                parseSimpleField(data,parts);
@@ -1116,7 +1116,7 @@ void GUIFormSpecMenu::parseVertLabel(parserData* data,std::string element) {
 void GUIFormSpecMenu::parseImageButton(parserData* data,std::string element,std::string type) {
        std::vector<std::string> parts = split(element,';');
 
-       if ((parts.size() == 5) || (parts.size() == 7)) {
+       if ((parts.size() == 5) || (parts.size() == 7) || (parts.size() == 8)) {
                std::vector<std::string> v_pos = split(parts[0],',');
                std::vector<std::string> v_geom = split(parts[1],',');
                std::string image_name = parts[2];
@@ -1136,13 +1136,19 @@ void GUIFormSpecMenu::parseImageButton(parserData* data,std::string element,std:
                bool noclip = false;
                bool drawborder = true;
 
-               if ((parts.size() == 7)) {
+               if ((parts.size() >= 7)) {
                        if (parts[5] == "true")
                                noclip = true;
 
                        if (parts[6] == "false")
                                drawborder = false;
                }
+               
+               std::string pressed_image_name = "";
+               
+               if ((parts.size() == 8)) {
+                       pressed_image_name = parts[7];
+               }
 
                core::rect<s32> rect = core::rect<s32>(pos.X, pos.Y, pos.X+geom.X, pos.Y+geom.Y);
 
@@ -1151,9 +1157,16 @@ void GUIFormSpecMenu::parseImageButton(parserData* data,std::string element,std:
 
                label = unescape_string(label);
 
+               wchar_t* wlabel = 0;
+
+               if (m_use_gettext)
+                       wlabel = wgettext(label.c_str());
+               else
+                       wlabel = (wchar_t*) narrow_to_wide(label.c_str()).c_str();
+
                FieldSpec spec = FieldSpec(
                        narrow_to_wide(name.c_str()),
-                       narrow_to_wide(label.c_str()),
+                       wlabel,
                        narrow_to_wide(image_name.c_str()),
                        258+m_fields.size()
                );
@@ -1162,26 +1175,38 @@ void GUIFormSpecMenu::parseImageButton(parserData* data,std::string element,std:
                        spec.is_exit = true;
 
                video::ITexture *texture = 0;
+               video::ITexture *pressed_texture = 0;
                //if there's no gamedef specified try to get direct
                //TODO check for possible texture leak
-               if (m_gamedef != 0)
+               if (m_gamedef != 0) {
                        texture = m_gamedef->tsrc()->getTexture(image_name);
-               else {
+                       if ((parts.size() == 8)) {
+                               pressed_texture = m_gamedef->tsrc()->getTexture(pressed_image_name);
+                       }
+               } else {
                        if (fs::PathExists(image_name)) {
                                texture = Environment->getVideoDriver()->getTexture(image_name.c_str());
                                m_Textures.push_back(texture);
                        }
+                       if (fs::PathExists(pressed_image_name)) {
+                               pressed_texture = Environment->getVideoDriver()->getTexture(pressed_image_name.c_str());
+                               m_Textures.push_back(pressed_texture);
+                       }
                }
+               if (parts.size() < 8)
+                       pressed_texture = texture;
 
                gui::IGUIButton *e = Environment->addButton(rect, this, spec.fid, spec.flabel.c_str());
                e->setUseAlphaChannel(true);
                e->setImage(texture);
-               e->setPressedImage(texture);
+               e->setPressedImage(pressed_texture);
                e->setScaleImage(true);
                e->setNotClipped(noclip);
                e->setDrawBorder(drawborder);
 
                m_fields.push_back(spec);
+               if (m_use_gettext)
+                       delete[] wlabel;
                return;
        }
 
@@ -1352,6 +1377,7 @@ void GUIFormSpecMenu::parseBox(parserData* data,std::string element) {
 }
 
 void GUIFormSpecMenu::parseElement(parserData* data,std::string element) {
+
        //some prechecks
        if (element == "")
                return;