#include "guiPauseMenu.h"\r
#include "debug.h"\r
#include "serialization.h"\r
+#include "porting.h"\r
+#include "config.h"\r
\r
GUIPauseMenu::GUIPauseMenu(gui::IGUIEnvironment* env,\r
gui::IGUIElement* parent, s32 id,\r
- IrrlichtDevice *dev,\r
- int *active_menu_count):\r
- GUIModalMenu(env, parent, id, active_menu_count)\r
+ IGameCallback *gamecallback,\r
+ IMenuManager *menumgr):\r
+ GUIModalMenu(env, parent, id, menumgr)\r
{\r
- m_dev = dev;\r
+ m_gamecallback = gamecallback;\r
}\r
\r
GUIPauseMenu::~GUIPauseMenu()\r
if(e != NULL)\r
e->remove();\r
}\r
+ {\r
+ gui::IGUIElement *e = getElementFromId(260);\r
+ if(e != NULL)\r
+ e->remove();\r
+ }\r
}\r
\r
void GUIPauseMenu::regenerateGui(v2u32 screensize)\r
*/\r
{\r
core::rect<s32> rect(0, 0, 140, 30);\r
- rect = rect + v2s32(size.X/2-140/2, size.Y/2-30/2-25);\r
+ rect = rect + v2s32(size.X/2-140/2, size.Y/2-30/2-50);\r
Environment->addButton(rect, this, 256, L"Continue");\r
}\r
{\r
core::rect<s32> rect(0, 0, 140, 30);\r
- rect = rect + v2s32(size.X/2-140/2, size.Y/2-30/2+25);\r
- Environment->addButton(rect, this, 257, L"Exit");\r
+ rect = rect + v2s32(size.X/2-140/2, size.Y/2-30/2+0);\r
+ Environment->addButton(rect, this, 260, L"Disconnect");\r
}\r
{\r
- core::rect<s32> rect(0, 0, 180, 220);\r
+ core::rect<s32> rect(0, 0, 140, 30);\r
+ rect = rect + v2s32(size.X/2-140/2, size.Y/2-30/2+50);\r
+ Environment->addButton(rect, this, 257, L"Exit to OS");\r
+ }\r
+ {\r
+ core::rect<s32> rect(0, 0, 180, 240);\r
rect = rect + v2s32(size.X/2 + 90, size.Y/2-rect.getHeight()/2);\r
const wchar_t *text =\r
L"Keys:\n"\r
L"- Mouse left: dig blocks\n"\r
L"- Mouse right: place blocks\n"\r
L"- Mouse wheel: select item\n"\r
+ L"- 0...9: select item\n"\r
+ L"- Shift: sneak\n"\r
L"- R: Toggle viewing all loaded chunks\n"\r
L"- I: Inventory menu\n"\r
L"- ESC: This menu\n"\r
- L"- T: Chat\n"\r
- L"\n"\r
- L"To generate a new map, remove the map directory.\n";\r
+ L"- T: Chat\n";\r
Environment->addStaticText(text, rect, false, true, this, 258);\r
}\r
{\r
core::rect<s32> rect(0, 0, 180, 220);\r
rect = rect + v2s32(size.X/2 - 90 - rect.getWidth(), size.Y/2-rect.getHeight()/2);\r
- wchar_t text[200];\r
+ \r
+ v2u32 max_texture_size;\r
+ {\r
+ video::IVideoDriver* driver = Environment->getVideoDriver();\r
+ max_texture_size = driver->getMaxTextureSize();\r
+ }\r
+\r
+ /*wchar_t text[200];\r
swprintf(text, 200,\r
L"Minetest-c55\n"\r
- L"SER_FMT_VER_HIGHEST=%i",\r
- (int)SER_FMT_VER_HIGHEST\r
- );\r
+ L"by Perttu Ahola\n"\r
+ L"celeron55@gmail.com\n\n"\r
+ SWPRINTF_CHARSTRING L"\n"\r
+ L"userdata path = "\r
+ SWPRINTF_CHARSTRING\r
+ ,\r
+ BUILD_INFO,\r
+ porting::path_userdata.c_str()\r
+ );*/\r
+\r
+ std::ostringstream os;\r
+ os<<"Minetest-c55\n";\r
+ os<<"by Perttu Ahola\n";\r
+ os<<"celeron55@gmail.com\n";\r
+ os<<BUILD_INFO<<"\n";\r
+ os<<"ud_path = "<<wrap_rows(porting::path_userdata, 20)<<"\n";\r
\r
- Environment->addStaticText(text, rect, false, true, this, 259);\r
+ Environment->addStaticText(narrow_to_wide(os.str()).c_str(), rect, false, true, this, 259);\r
}\r
}\r
\r
{\r
if(event.EventType==EET_KEY_INPUT_EVENT)\r
{\r
- if(event.KeyInput.Key==KEY_ESCAPE && event.KeyInput.PressedDown)\r
+ if(event.KeyInput.PressedDown)\r
{\r
- quitMenu();\r
- return true;\r
+ if(event.KeyInput.Key==KEY_ESCAPE)\r
+ {\r
+ quitMenu();\r
+ return true;\r
+ }\r
+ else if(event.KeyInput.Key==KEY_RETURN)\r
+ {\r
+ quitMenu();\r
+ return true;\r
+ }\r
}\r
}\r
if(event.EventType==EET_GUI_EVENT)\r
{\r
case 256: // continue\r
quitMenu();\r
- break;\r
+ // ALWAYS return immediately after quitMenu()\r
+ return true;\r
+ case 260: // disconnect\r
+ m_gamecallback->disconnect();\r
+ quitMenu();\r
+ return true;\r
case 257: // exit\r
- m_dev->closeDevice();\r
- break;\r
+ m_gamecallback->exitToOS();\r
+ quitMenu();\r
+ return true;\r
}\r
}\r
}\r