From bf73b542f15ce255e42f1ff5cffc0467ac1a9306 Mon Sep 17 00:00:00 2001
From: Kayne Ruse <ratstail91@yahoo.com.au>
Date: Mon, 20 May 2013 18:54:10 +1000
Subject: [PATCH] Implemented server selection interface

---
 client/lobby.cpp                   |  57 ++++++++++++++++++++++-------
 client/lobby.hpp                   |   5 ++-
 client/main_menu.cpp               |  11 ++----
 screenshots/select your poison.png | Bin 0 -> 6047 bytes
 4 files changed, 50 insertions(+), 23 deletions(-)
 create mode 100644 screenshots/select your poison.png

diff --git a/client/lobby.cpp b/client/lobby.cpp
index 5ad8e3e..d55a4d6 100644
--- a/client/lobby.cpp
+++ b/client/lobby.cpp
@@ -20,17 +20,19 @@ Lobby::Lobby(ConfigUtility* cUtil, SurfaceManager* sMgr, UDPNetworkUtility* nUti
 
 	//members
 	font.SetSurface(surfaceMgr->Get("font"));
-	pingButton.SetSurfaces(surfaceMgr->Get("button"), surfaceMgr->Get("font"));
-	pingButton.SetText("Refresh");
-	pingButton.SetX(50);
-	pingButton.SetY(50);
 
-	//ping the network, ping the preset "phone home" servers
-	//generate the server list
-	//eventually
+	buttonMap["ping"] = new Button(50, 50 , surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Refresh");
+	buttonMap["join"] = new Button(50, 100, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Join");
+	buttonMap["back"] = new Button(50, 150, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Back");
+
+	//ping the network
+	PingNetwork();
 }
 
 Lobby::~Lobby() {
+	for (auto it : buttonMap) {
+		delete it.second;
+	}
 #ifdef DEBUG
 	cout << "leaving Lobby" << endl;
 #endif
@@ -67,9 +69,16 @@ void Lobby::Receive() {
 }
 
 void Lobby::Render(SDL_Surface* const screen) {
-	pingButton.DrawTo(screen);
+	for (auto it : buttonMap) {
+		it.second->DrawTo(screen);
+	}
+	//draw the server list, highlighting the selected server
 	for (int i = 0; i < serverVector.size(); i++) {
-		font.DrawStringTo(serverVector[i].name, screen, 50, 16*i + 100);
+		if (selectedServer && selectedServer == &serverVector[i]) {
+			SDL_Rect clip = {250, Sint16(16*i + 50), Uint16(screen->w - 250), 16};
+			SDL_FillRect(screen, &clip, SDL_MapRGB(screen->format, 255, 127, 39));
+		}
+		font.DrawStringTo(serverVector[i].name, screen, 250, 16*i + 50);
 	}
 }
 
@@ -78,23 +87,43 @@ void Lobby::Render(SDL_Surface* const screen) {
 //-------------------------
 
 void Lobby::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	pingButton.MouseMotion(motion);
+	for (auto it : buttonMap) {
+		it.second->MouseMotion(motion);
+	}
 }
 
 void Lobby::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	pingButton.MouseButtonDown(button);
+	for (auto it : buttonMap) {
+		it.second->MouseButtonDown(button);
+	}
 }
 
 void Lobby::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (pingButton.MouseButtonUp(button) == Button::State::HOVER) {
+	if (buttonMap["ping"]->MouseButtonUp(button) == Button::State::HOVER) {
 		PingNetwork();
 	}
+	if (buttonMap["join"]->MouseButtonUp(button) == Button::State::HOVER) {
+		//join...
+		if (selectedServer) {
+			cout << "joining server: " << selectedServer->name << endl;
+		}
+	}
+	if (buttonMap["back"]->MouseButtonUp(button) == Button::State::HOVER) {
+		SetNextScene(SceneList::MAINMENU);
+	}
+	//select a server
+	if (button.x >= 250 && button.y >= 50 && button.y < serverVector.size() * 16 + 50) {
+		selectedServer = &serverVector[(button.y-50)/16];
+	}
+	else {
+		selectedServer = nullptr;
+	}
 }
 
 void Lobby::KeyDown(SDL_KeyboardEvent const& key) {
 	switch(key.keysym.sym) {
 		case SDLK_ESCAPE:
-			QuitEvent();
+			SetNextScene(SceneList::MAINMENU);
 		break;
 	}
 }
@@ -113,7 +142,7 @@ void Lobby::PingNetwork() {
 	packet.type = PacketList::PING;
 	netUtil->Send("255.255.255.255", configUtil->Integer("server.port"), reinterpret_cast<void*>(&packet), sizeof(Packet));
 	//reset the server list
-	serverVector.clear();
+//	serverVector.clear();
 }
 
 void Lobby::PushServer(Packet* packet) {
diff --git a/client/lobby.hpp b/client/lobby.hpp
index dcc4ee3..5d68ff2 100644
--- a/client/lobby.hpp
+++ b/client/lobby.hpp
@@ -12,6 +12,7 @@
 #include "button.hpp"
 
 #include <vector>
+#include <map>
 #include <string>
 
 struct Server {
@@ -43,6 +44,7 @@ protected:
 	//utilities
 	void PingNetwork();
 	void PushServer(Packet*);
+	typedef std::map<std::string, Button*> ButtonMap;
 
 	//members
 	ConfigUtility* configUtil = nullptr;
@@ -50,9 +52,10 @@ protected:
 	UDPNetworkUtility* netUtil = nullptr;
 
 	RasterFont font;
-	Button pingButton;
+	ButtonMap buttonMap;
 
 	std::vector<Server> serverVector;
+	Server* selectedServer = nullptr;
 };
 
 #endif
diff --git a/client/main_menu.cpp b/client/main_menu.cpp
index 6d7afe3..758d5fa 100644
--- a/client/main_menu.cpp
+++ b/client/main_menu.cpp
@@ -15,9 +15,9 @@ MainMenu::MainMenu(ConfigUtility* cUtil, SurfaceManager* sMgr) {
 	configUtil = cUtil;
 	surfaceMgr = sMgr;
 
-	buttonMap["start"] = new Button(50, 50, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "start");
-	buttonMap["options"] = new Button(50, 100, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "options");
-	buttonMap["quit"] = new Button(50, 150, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "quit");
+	buttonMap["start"] = new Button(50, 50, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Start");
+	buttonMap["options"] = new Button(50, 100, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Options");
+	buttonMap["quit"] = new Button(50, 150, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Quit");
 }
 
 MainMenu::~MainMenu() {
@@ -69,18 +69,13 @@ void MainMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
 
 void MainMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 	if (buttonMap["start"]->MouseButtonUp(button) == Button::State::HOVER) {
-		//TODO
 		SetNextScene(SceneList::LOBBY);
-		cout << "start" << endl;
 	}
 	if (buttonMap["options"]->MouseButtonUp(button) == Button::State::HOVER) {
 		//TODO
-		cout << "options" << endl;
 	}
 	if (buttonMap["quit"]->MouseButtonUp(button) == Button::State::HOVER) {
-		//TODO
 		QuitEvent();
-		cout << "quit" << endl;
 	}
 }
 
diff --git a/screenshots/select your poison.png b/screenshots/select your poison.png
new file mode 100644
index 0000000000000000000000000000000000000000..303b3df49dfd7a0cf0c6ecb0c3e03a941e83ff81
GIT binary patch
literal 6047
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
b8Jm4;&-m;&!2x3AMcaRHw9VN<_@93OFxuzn

literal 0
HcmV?d00001