Began working changes into lobby

client/client_utilities/makefile

@@ -1,37 +0,0 @@
-#config
-INCLUDES+=.
-LIBS+=
-CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
-
-#source
-CXXSRC=$(wildcard *.cpp)
-
-#objects
-OBJDIR=obj
-OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
-
-#output
-OUTDIR=..
-OUT=$(addprefix $(OUTDIR)/,client.a)
-
-#targets
-all: $(OBJ) $(OUT)
-	ar -crs $(OUT) $(OBJ)
-
-$(OBJ): | $(OBJDIR)
-
-$(OUT): | $(OUTDIR)
-
-$(OBJDIR):
-	mkdir $(OBJDIR)
-
-$(OUTDIR):
-	mkdir $(OUTDIR)
-
-$(OBJDIR)/%.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c -o $@ $<
-
-clean:
-	$(RM) *.o *.a *.exe
-
-rebuild: clean all

client/makefile

@@ -1,5 +1,5 @@
 #include directories
-INCLUDES+=. client_utilities renderable scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities
+INCLUDES+=. entities scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities
 
 #libraries
 #the order of the $(LIBS) is important, at least for MinGW
@@ -25,9 +25,8 @@ OUT=$(addprefix $(OUTDIR)/,client)
 
 #targets
 all: $(OBJ) $(OUT)
-	$(MAKE) -C client_utilities
+	$(MAKE) -C entities
 	$(MAKE) -C scenes
-	$(MAKE) -C renderable
 	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
 
 $(OBJ): | $(OBJDIR)

client/scenes/in_world.hpp

@@ -40,7 +40,6 @@
 
 #include "base_character.hpp"
 #include "base_monster.hpp"
-#include "local_character.hpp"
 
 //client
 #include "base_scene.hpp"

client/scenes/lobby_menu.cpp

@@ -190,15 +190,25 @@ void LobbyMenu::KeyUp(SDL_KeyboardEvent const& key) {
 
 void LobbyMenu::HandlePacket(SerialPacket* const argPacket) {
 		switch(argPacket->type) {
+			//responses
 		case SerialPacketType::BROADCAST_RESPONSE:
 			HandleBroadcastResponse(static_cast<ServerPacket*>(argPacket));
 		break;
 		case SerialPacketType::JOIN_RESPONSE:
 			HandleJoinResponse(static_cast<ClientPacket*>(argPacket));
 		break;
+		case SerialPacketType::LOGIN_RESPONSE:
+			HandleLoginResponse(static_cast<ClientPacket*>(argPacket));
+		break;
+
+		//rejections
 		case SerialPacketType::JOIN_REJECTION:
 			HandleJoinRejection(static_cast<TextPacket*>(argPacket));
 		break;
+		case SerialPacketType::LOGIN_REJECTION:
+			HandleLoginRejection(static_cast<TextPacket*>(argPacket));
+		break;
+
 		//handle errors
 		default:
 			throw(std::runtime_error(std::string() + "Unknown SerialPacketType encountered in LobbyMenu: " + to_string_custom(static_cast<int>(argPacket->type)) ));
@@ -222,9 +232,19 @@ void LobbyMenu::HandleBroadcastResponse(ServerPacket* const argPacket) {
 }
 
 void LobbyMenu::HandleJoinResponse(ClientPacket* const argPacket) {
+	//save the server's data
 	clientIndex = argPacket->clientIndex;
-	accountIndex = argPacket->accountIndex;
 	network.Bind(argPacket->srcAddress, Channels::SERVER);
+
+	//request login data
+	SendLoginRequest();
+}
+
+void LobbyMenu::HandleLoginResponse(ClientPacket* const argPacket) {
+	if (argPacket->clientIndex != clientIndex) {
+		throw(std::runtime_error("Client index invalid during login"));
+	}
+	accountIndex = argPacket->accountIndex;
 	SetNextScene(SceneList::INWORLD);
 }
 
@@ -232,6 +252,10 @@ void LobbyMenu::HandleJoinRejection(TextPacket* const argPacket) {
 	//TODO: Better output for join rejection
 }
 
+void LobbyMenu::HandleLoginRejection(TextPacket* const argPacket) {
+	//TODO: Better output for login rejection
+}
+
 //-------------------------
 //server control
 //-------------------------
@@ -251,9 +275,18 @@ void LobbyMenu::SendJoinRequest() {
 	//pack the packet
 		ClientPacket packet;
 		packet.type = SerialPacketType::JOIN_REQUEST;
-		strncpy(packet.username, config["client.username"].c_str(), PACKET_STRING_SIZE);
 
 		//join the selected server
 		network.SendTo(selection->address, &packet);
 		selection = nullptr;
 }
+
+void LobbyMenu::SendLoginRequest() {
+	//NOTE: high cohesion
+	ClientPacket packet;
+	packet.type = SerialPacketType::LOGIN_REQUEST;
+	packet.clientIndex = clientIndex;
+	strncpy(packet.username, config["client.username"].c_str(), PACKET_STRING_SIZE);
+
+	network.SendTo(Channels::SERVER, &packet);
+}

client/scenes/lobby_menu.hpp

@@ -63,11 +63,14 @@ protected:
 	void HandlePacket(SerialPacket* const);
 	void HandleBroadcastResponse(ServerPacket* const);
 	void HandleJoinResponse(ClientPacket* const);
+	void HandleLoginResponse(ClientPacket* const);
 	void HandleJoinRejection(TextPacket* const);
+	void HandleLoginRejection(TextPacket* const);
 
 	//server control
 	void SendBroadcastRequest();
 	void SendJoinRequest();
+	void SendLoginRequest();
 
 	//shared parameters
 	ConfigUtility& config = ConfigUtility::GetSingleton();

client/scenes/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. .. ../renderable ../../common/gameplay ../../common/graphics ../../common/map ../../common/network ../../common/network/packet_types ../../common/ui ../../common/utilities
+INCLUDES+=. .. ../entities ../../common/gameplay ../../common/graphics ../../common/map ../../common/network ../../common/network/packet_types ../../common/ui ../../common/utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 

common/network/serial_packet_type.hpp

@@ -115,6 +115,7 @@ enum class SerialPacketType {
 
 	//rejection/error messages
 	JOIN_REJECTION,
+	LOGIN_REJECTION,
 	CHARACTER_REJECTION,
 	SHUTDOWN_REJECTION,
 

common/network/serial_utility.cpp

@@ -81,6 +81,7 @@ void serializePacket(void* buffer, SerialPacketBase* packet) {
 		break;
 		case SerialPacketType::TEXT_BROADCAST:
 		case SerialPacketType::JOIN_REJECTION:
+		case SerialPacketType::LOGIN_REJECTION:
 		case SerialPacketType::CHARACTER_REJECTION:
 		case SerialPacketType::SHUTDOWN_REJECTION:
 			serializeText(buffer, static_cast<TextPacket*>(packet));
@@ -129,6 +130,7 @@ void deserializePacket(void* buffer, SerialPacketBase* packet) {
 		break;
 		case SerialPacketType::TEXT_BROADCAST:
 		case SerialPacketType::JOIN_REJECTION:
+		case SerialPacketType::LOGIN_REJECTION:
 		case SerialPacketType::CHARACTER_REJECTION:
 		case SerialPacketType::SHUTDOWN_REJECTION:
 			deserializeText(buffer, static_cast<TextPacket*>(packet));

todo.txt

@@ -24,3 +24,8 @@ The Entity base class handles position (including room) and motion, so something
 
 entity:
 	
+-------------------------
+
+Lobby:
+	JOIN_REQUEST -> JOIN_RESPONSE, JOIN_REJECTION
+	LOGIN_REQUEST -> LOGIN_RESPONSE, LOGIN_REJECTION