Game Mode Switcher on World Creation Screen (#446)

Author: samdotjpg

source/client/gui/screens/CreateWorldScreen.cpp

@@ -16,6 +16,7 @@ static char g_CreateWorldFilterArray[] = { '/','\n','\r','\x09','\0','\xC','`','
 CreateWorldScreen::CreateWorldScreen() :
 	m_textName(this, 1, 0, 0, 0, 0, "", "Unnamed world"),
 	m_textSeed(this, 2, 0, 0, 0, 0, ""),
+	m_btnGameMode(5, "Game Mode"),
 	m_btnBack(3, "Cancel"),
 	m_btnCreate(4, "Create New World")
 {
@@ -84,31 +85,40 @@ void CreateWorldScreen::_buttonClicked(Button* pButton)
 				seed = Util::hashCode(seedThing);
 		}
 
-		LevelSettings levelSettings(seed);
+		LevelSettings levelSettings(seed, m_gameMode);
 		m_pMinecraft->selectLevel(levelUniqueName, levelNickname, levelSettings);
 	}
+
+	if (pButton->getId() == m_btnGameMode.getId())
+		m_gameMode = static_cast<GameType>((static_cast<int>(m_gameMode) + 1) % (GAME_TYPES_MAX + 1));
 }
 
-#define CRAMPED() (100 + 32 + 58 > m_height)
+#define CRAMPED() (100 + 32 + 58 + 16 > m_height)
 
 void CreateWorldScreen::init()
 {
-	m_textName.m_width  = m_textSeed.m_width  = 200;
+	bool touchscreen = m_pMinecraft->isTouchscreen();
+
 	m_textName.m_height = m_textSeed.m_height = 20;
+
+	// provide thicker buttons for pressing on touchscreen and match the rest of the ui
+	if (!touchscreen)
+		m_btnBack.m_height = m_btnCreate.m_height = m_btnGameMode.m_height = m_textName.m_height = m_textSeed.m_height = 20;
+
+	m_textName.m_width  = m_textSeed.m_width  = 200;
 	m_textName.m_xPos   = m_textSeed.m_xPos   = (m_width - 200) / 2;
 	m_textName.m_yPos = 60;
 	m_textSeed.m_yPos = 100;
-
+	m_btnGameMode.m_yPos  	= 140;
+	m_btnGameMode.m_width   = 150;
 	m_btnCreate.m_yPos  = m_height - 56;
-	m_btnBack.m_yPos    = m_height - 30;
-	m_btnBack.m_width   = m_btnCreate.m_width  = 200;
-	m_btnBack.m_height  = m_btnCreate.m_height = 20;
-	
-	m_btnBack.m_xPos   = m_width / 2 - 200 / 2;
-	m_btnCreate.m_xPos = m_width / 2 - 200 / 2;
+	m_btnCreate.m_yPos 	= m_btnBack.m_yPos 	  = m_height - 30 + ((touchscreen) ? 2 : 0); // on touchscreens, align the create/cancel buttons with previous screen's Y values
+	m_btnBack.m_xPos 	= (m_width / 2) + 5;
+	m_btnBack.m_width   = m_btnCreate.m_width = 150;
 
 	_addElement(m_textName);
 	_addElement(m_textSeed);
+	_addElement(m_btnGameMode);
 	_addElement(m_btnCreate);
 	_addElement(m_btnBack);
 	m_textName.init(m_pFont);
@@ -117,26 +127,46 @@ void CreateWorldScreen::init()
 	// 100 - yPos of textSeed
 	// 32  - offset + height of "Leave blank for random" text
 	// 58  - approximately the Y position of the create button
+	// 16  - extra offset for gamemode text to make sure it never overlaps with create new world / cancel
 	bool crampedMode = CRAMPED();
 	if (crampedMode)
 	{
 		// crush everything down as much as we can
-		m_textName.m_yPos = 40;
-		m_textSeed.m_yPos = 80;
-		m_btnCreate.m_yPos += 10;
-		m_btnBack.m_yPos += 5;
+		m_textName.m_yPos = 34;
+		m_textSeed.m_yPos = 69;
+		m_btnGameMode.m_yPos = m_textSeed.m_yPos + 24;
+		m_btnCreate.m_width -= 50;
+		m_btnBack.m_width -= 50;
 	}
+
+	// calculate after crush
+	m_btnGameMode.m_xPos = m_width / 2 - m_btnGameMode.m_width / 2;
+	m_btnCreate.m_xPos = m_width / 2 - m_btnCreate.m_width - 5;
+
+	m_gameMode = GAME_TYPE_SURVIVAL;
 }
 
 void CreateWorldScreen::render(float f)
 {
 	renderBackground();
 	Screen::render(f);
 
+	const std::string gameTypeStr = GameTypeConv::GameTypeDescriptionToNonLocString(m_gameMode);
+	m_btnGameMode.setMessage("Game Mode: " + GameTypeConv::GameTypeToNonLocString(m_gameMode));
+
 	drawCenteredString(*m_pFont, "Create New World", m_width / 2, CRAMPED() ? 10 : 30, 0xFFFFFF);
 	drawString(*m_pFont, "World name",                    m_textName.m_xPos, m_textName.m_yPos - 10, 0xDDDDDD);
 	drawString(*m_pFont, "Seed for the World Generator",  m_textSeed.m_xPos, m_textSeed.m_yPos - 10, 0xDDDDDD);
+	
+	bool crampedMode = CRAMPED();
+
+	// Extra text not necessarily needed
+	if (crampedMode)
+		return;
+	
 	drawString(*m_pFont, "Leave blank for a random seed", m_textSeed.m_xPos, m_textSeed.m_yPos + 22, 0x999999);
+	int textCenteredX = m_btnGameMode.m_xPos + (m_btnGameMode.m_width / 2) - (m_pFont->width(gameTypeStr.c_str()) / 2);
+	drawString(*m_pFont, gameTypeStr.c_str(), textCenteredX, m_btnGameMode.m_yPos + m_btnGameMode.m_height + 3, 0x999999);
 }
 
 bool CreateWorldScreen::handleBackEvent(bool b)
@@ -147,4 +177,4 @@ bool CreateWorldScreen::handleBackEvent(bool b)
 	}
 
 	return true;
-}
+}

source/client/gui/screens/CreateWorldScreen.hpp

@@ -30,8 +30,10 @@ class CreateWorldScreen : public Screen
 public:
 	TextBox m_textName;
 	TextBox m_textSeed;
+	Button m_btnGameMode;
 	Button m_btnBack;
 	Button m_btnCreate;
+	GameType m_gameMode;
 };
 
 #endif

source/world/gamemode/GameType.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <string>
+#include "common/Util.hpp"
 
 enum GameType
 {
@@ -15,20 +16,53 @@ enum GameType
 class GameTypeConv
 {
 public:
-	static std::string GameTypeToNonLocString(GameType type)
-	{
-		switch (type)
-		{
-		case GAME_TYPE_SURVIVAL:
-			return "Survival";
-		case GAME_TYPE_CREATIVE:
-			return "Creative";
-		case GAME_TYPE_ADVENTURE:
-			return "Adventure";
-		case GAME_TYPE_SPECTATOR:
-			return "Spectator";
-		default:
-			return "Undefined";
-		}
+static const std::string& GameTypeToNonLocString(GameType type)
+{
+	switch (type)
+	{
+	case GAME_TYPE_SURVIVAL:
+	{
+		static const std::string survival = "Survival";
+		return survival;
+	}
+	case GAME_TYPE_CREATIVE:
+	{
+		static const std::string creative = "Creative";
+		return creative;
+	}
+	case GAME_TYPE_ADVENTURE:
+	{
+		static const std::string adventure = "Adventure";
+		return adventure;
+	}
+	case GAME_TYPE_SPECTATOR:
+	{
+		static const std::string spectator = "Spectator";
+		return spectator;
+	}
+	default:
+		return Util::EMPTY_STRING;
+	}
+}
+
+static const std::string& GameTypeDescriptionToNonLocString(GameType type)
+{
+	switch (type)
+	{
+	case GAME_TYPE_SURVIVAL:
+	{
+		static const std::string survival = "Mobs, health and gather resources";
+		return survival;
+	}
+	case GAME_TYPE_CREATIVE:
+	{
+		static const std::string creative = "Unlimited resources, flying";
+		return creative;
+	}
+	case GAME_TYPE_ADVENTURE:
+	case GAME_TYPE_SPECTATOR:
+	default:
+		return Util::EMPTY_STRING;
 	}
+}
 };