X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2FguiPauseMenu.cpp;h=2d42fdb77dec4189933ed5de7f3fd7f1a2043277;hb=7df125c249dc9b99b66f047a395106c2038eb00e;hp=d905d32227bdc5288a715b8f74aacf23ca3ccf93;hpb=c914cbb0a081b30b28271618bbaa8e987a108ae7;p=dragonfireclient.git

diff --git a/src/guiPauseMenu.cpp b/src/guiPauseMenu.cpp
index d905d3222..2d42fdb77 100644
--- a/src/guiPauseMenu.cpp
+++ b/src/guiPauseMenu.cpp
@@ -115,12 +115,12 @@ void GUIPauseMenu::regenerateGui(v2u32 screensize)
 		L"- Mouse left: dig blocks\n"
 		L"- Mouse right: place blocks\n"
 		L"- Mouse wheel: select item\n"
+		L"- 0...9: select item\n"
+		L"- Shift: sneak\n"
 		L"- R: Toggle viewing all loaded chunks\n"
 		L"- I: Inventory menu\n"
 		L"- ESC: This menu\n"
-		L"- T: Chat\n"
-		L"\n"
-		L"To generate a new map, remove the map directory.\n";
+		L"- T: Chat\n";
 		Environment->addStaticText(text, rect, false, true, this, 258);
 	}
 	{
@@ -133,7 +133,7 @@ void GUIPauseMenu::regenerateGui(v2u32 screensize)
 			max_texture_size = driver->getMaxTextureSize();
 		}
 
-		wchar_t text[200];
+		/*wchar_t text[200];
 		swprintf(text, 200,
 				L"Minetest-c55\n"
 				L"by Perttu Ahola\n"
@@ -144,9 +144,16 @@ void GUIPauseMenu::regenerateGui(v2u32 screensize)
 				,
 				BUILD_INFO,
 				porting::path_userdata.c_str()
-		);
+		);*/
+
+		std::ostringstream os;
+		os<<"Minetest-c55\n";
+		os<<"by Perttu Ahola\n";
+		os<<"celeron55@gmail.com\n";
+		os<<BUILD_INFO<<"\n";
+		os<<"ud_path = "<<wrap_rows(porting::path_userdata, 20)<<"\n";
 	
-		Environment->addStaticText(text, rect, false, true, this, 259);
+		Environment->addStaticText(narrow_to_wide(os.str()).c_str(), rect, false, true, this, 259);
 	}
 }
 
@@ -167,10 +174,18 @@ bool GUIPauseMenu::OnEvent(const SEvent& event)
 {
 	if(event.EventType==EET_KEY_INPUT_EVENT)
 	{
-		if(event.KeyInput.Key==KEY_ESCAPE && event.KeyInput.PressedDown)
+		if(event.KeyInput.PressedDown)
 		{
-			quitMenu();
-			return true;
+			if(event.KeyInput.Key==KEY_ESCAPE)
+			{
+				quitMenu();
+				return true;
+			}
+			else if(event.KeyInput.Key==KEY_RETURN)
+			{
+				quitMenu();
+				return true;
+			}
 		}
 	}
 	if(event.EventType==EET_GUI_EVENT)
@@ -192,15 +207,16 @@ bool GUIPauseMenu::OnEvent(const SEvent& event)
 			{
 			case 256: // continue
 				quitMenu();
-				break;
+				// ALWAYS return immediately after quitMenu()
+				return true;
 			case 260: // disconnect
 				m_gamecallback->disconnect();
 				quitMenu();
-				break;
+				return true;
 			case 257: // exit
 				m_gamecallback->exitToOS();
 				quitMenu();
-				break;
+				return true;
 			}
 		}
 	}