Implemented DisconnectedScreen, and removed CharacterMap

Project also builds, since I went through and adjusted it. It's hacky
right now, but I just want to make sure it worked. I'll give it another
pass before merging into develop.

client/client_application.cpp

@@ -38,8 +38,7 @@
 #include "options_menu.hpp"
 #include "lobby_menu.hpp"
 #include "in_world.hpp"
-//#include "in_combat.hpp"
-#include "clean_up.hpp"
+#include "disconnected_screen.hpp"
 
 //-------------------------
 //Public access members
@@ -179,16 +178,13 @@ void ClientApplication::LoadScene(SceneList sceneIndex) {
 			activeScene = new OptionsMenu();
 		break;
 		case SceneList::LOBBYMENU:
-			activeScene = new LobbyMenu(&clientIndex, &accountIndex);
+			activeScene = new LobbyMenu(&clientIndex, &accountIndex); //TODO: can I use the ConfigUtility for these parameters?
 		break;
 		case SceneList::INWORLD:
-			activeScene = new InWorld(&clientIndex, &accountIndex, &characterIndex, &characterMap);
+			activeScene = new InWorld(&clientIndex, &accountIndex);
 		break;
-//		case SceneList::INCOMBAT:
-//			activeScene = new InCombat(&clientIndex, &accountIndex, &characterIndex, &characterMap);
-//		break;
-		case SceneList::CLEANUP:
-			activeScene = new CleanUp(&clientIndex, &accountIndex, &characterIndex, &characterMap);
+		case SceneList::DISCONNECTEDSCREEN:
+			activeScene = new DisconnectedScreen();
 		break;
 		default:
 			throw(std::logic_error("Failed to recognize the scene index"));

client/client_application.hpp

@@ -26,7 +26,6 @@
 #include "base_scene.hpp"
 
 #include "udp_network_utility.hpp"
-#include "character.hpp"
 
 #include "singleton.hpp"
 
@@ -54,9 +53,6 @@ private:
 	//shared parameters
 	int clientIndex = -1;
 	int accountIndex = -1;
-	int characterIndex = -1;
-
-	CharacterMap characterMap;
 };
 
 #endif

client/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. client_utilities scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities
+INCLUDES+=. client_utilities renderable scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities
 LIBS+=client.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
@@ -18,6 +18,7 @@ OUT=$(addprefix $(OUTDIR)/,client)
 all: $(OBJ) $(OUT)
 	$(MAKE) -C client_utilities
 	$(MAKE) -C scenes
+	$(MAKE) -C renderable
 	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
 
 $(OBJ): | $(OBJDIR)

client/scene_list.hpp

@@ -34,8 +34,7 @@ enum class SceneList {
 	OPTIONSMENU,
 	LOBBYMENU,
 	INWORLD,
-	INCOMBAT,
-	CLEANUP,
+	DISCONNECTEDSCREEN,
 };
 
 #endif

client/scenes/disconnected_screen.cpp

@@ -19,10 +19,11 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "clean_up.hpp"
+#include "disconnected_screen.hpp"
 
 #include "channels.hpp"
 #include "config_utility.hpp"
+#include "udp_network_utility.hpp"
 
 #include <stdexcept>
 
@@ -30,17 +31,7 @@
 //Public access members
 //-------------------------
 
-CleanUp::CleanUp(
-	int* const argClientIndex,
-	int* const argAccountIndex,
-	int* const argCharacterIndex,
-	CharacterMap* argCharacterMap
-	):
-	clientIndex(*argClientIndex),
-	accountIndex(*argAccountIndex),
-	characterIndex(*argCharacterIndex),
-	characterMap(*argCharacterMap)
-{
+DisconnectedScreen::DisconnectedScreen() {
 	ConfigUtility& config = ConfigUtility::GetSingleton();
 
 	//setup the utility objects
@@ -60,19 +51,13 @@ CleanUp::CleanUp(
 	backButton.SetText("Back");
 
 	//full reset
-	network.Unbind(Channels::SERVER);
-	clientIndex = -1;
-	accountIndex = -1;
-	characterIndex = -1;
-//	combatMap.clear();
-	characterMap.clear();
-//	enemyMap.clear();
+	UDPNetworkUtility::GetSingleton().Unbind(Channels::SERVER);
 
 	//auto return
 	startTick = std::chrono::steady_clock::now();
 }
 
-CleanUp::~CleanUp() {
+DisconnectedScreen::~DisconnectedScreen() {
 	//
 }
 
@@ -80,16 +65,16 @@ CleanUp::~CleanUp() {
 //Frame loop
 //-------------------------
 
-void CleanUp::Update() {
+void DisconnectedScreen::Update() {
 	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(10)) {
 		SetNextScene(SceneList::MAINMENU);
 	}
 
 	//Eat incoming packets
-	while(network.Receive());
+	while(UDPNetworkUtility::GetSingleton().Receive());
 }
 
-void CleanUp::Render(SDL_Surface* const screen) {
+void DisconnectedScreen::Render(SDL_Surface* const screen) {
 	ConfigUtility& config = ConfigUtility::GetSingleton();
 
 	backButton.DrawTo(screen);
@@ -100,25 +85,25 @@ void CleanUp::Render(SDL_Surface* const screen) {
 //Event handlers
 //-------------------------
 
-void CleanUp::QuitEvent() {
+void DisconnectedScreen::QuitEvent() {
 	SetNextScene(SceneList::QUIT);
 }
 
-void CleanUp::MouseMotion(SDL_MouseMotionEvent const& motion) {
+void DisconnectedScreen::MouseMotion(SDL_MouseMotionEvent const& motion) {
 	backButton.MouseMotion(motion);
 }
 
-void CleanUp::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+void DisconnectedScreen::MouseButtonDown(SDL_MouseButtonEvent const& button) {
 	backButton.MouseButtonDown(button);
 }
 
-void CleanUp::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+void DisconnectedScreen::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 	if (backButton.MouseButtonUp(button) == Button::State::HOVER) {
 		SetNextScene(SceneList::MAINMENU);
 	}
 }
 
-void CleanUp::KeyDown(SDL_KeyboardEvent const& key) {
+void DisconnectedScreen::KeyDown(SDL_KeyboardEvent const& key) {
 	switch(key.keysym.sym) {
 		case SDLK_ESCAPE:
 			SetNextScene(SceneList::MAINMENU);
@@ -126,6 +111,6 @@ void CleanUp::KeyDown(SDL_KeyboardEvent const& key) {
 	}
 }
 
-void CleanUp::KeyUp(SDL_KeyboardEvent const& key) {
+void DisconnectedScreen::KeyUp(SDL_KeyboardEvent const& key) {
 	//
 }

client/scenes/disconnected_screen.hpp

@@ -19,11 +19,8 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CLEANUP_HPP_
-#define CLEANUP_HPP_
-
-//network
-#include "udp_network_utility.hpp"
+#ifndef DISCONNECTEDSCREEN_HPP_
+#define DISCONNECTEDSCREEN_HPP_
 
 //graphics
 #include "image.hpp"
@@ -31,22 +28,16 @@
 #include "button.hpp"
 
 //client
-#include "character.hpp"
 #include "base_scene.hpp"
 
 //std namespace
 #include <chrono>
 
-class CleanUp : public BaseScene {
+class DisconnectedScreen : public BaseScene {
 public:
 	//Public access members
-	CleanUp(
-		int* const argClientIndex,
-		int* const argAccountIndex,
-		int* const argCharacterIndex,
-		CharacterMap* argCharacterMap
-	);
-	~CleanUp();
+	DisconnectedScreen();
+	~DisconnectedScreen();
 
 protected:
 	//Frame loop
@@ -61,13 +52,6 @@ protected:
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
-	//shared parameters
-	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
-	int& clientIndex;
-	int& accountIndex;
-	int& characterIndex;
-	CharacterMap& characterMap;
-
 	//graphics
 	Image image;
 	RasterFont font;

client/scenes/in_world.cpp

@@ -34,16 +34,9 @@
 //Public access members
 //-------------------------
 
-InWorld::InWorld(
-	int* const argClientIndex,
-	int* const argAccountIndex,
-	int* const argCharacterIndex,
-	CharacterMap* argCharacterMap
-	):
+InWorld::InWorld(int* const argClientIndex,	int* const argAccountIndex):
 	clientIndex(*argClientIndex),
-	accountIndex(*argAccountIndex),
-	characterIndex(*argCharacterIndex),
-	characterMap(*argCharacterMap)
+	accountIndex(*argAccountIndex)
 {
 	ConfigUtility& config = ConfigUtility::GetSingleton();
 
@@ -153,7 +146,7 @@ void InWorld::Update() {
 	if (Clock::now() - lastBeat > std::chrono::seconds(3)) {
 		if (attemptedBeats > 2) {
 			RequestDisconnect();
-			SetNextScene(SceneList::CLEANUP);
+			SetNextScene(SceneList::DISCONNECTEDSCREEN);
 			ConfigUtility::GetSingleton()["client.disconnectMessage"] = "Error: Lost connection to the server";
 		}
 
@@ -342,7 +335,7 @@ void InWorld::HandlePong(ServerPacket* const argPacket) {
 
 void InWorld::HandleDisconnect(ClientPacket* const argPacket) {
 	//TODO: More needed in the disconnection
-	SetNextScene(SceneList::CLEANUP);
+	SetNextScene(SceneList::DISCONNECTEDSCREEN);
 	ConfigUtility::GetSingleton()["client.disconnectMessage"] = "You have been disconnected";
 }
 
@@ -352,7 +345,7 @@ void InWorld::HandleCharacterNew(CharacterPacket* const argPacket) {
 	}
 
 	//create the character object
-	Character& newCharacter = characterMap[argPacket->characterIndex];
+	BaseCharacter& newCharacter = characterMap[argPacket->characterIndex];
 
 	//fill out the character's members
 	newCharacter.SetHandle(argPacket->handle);
@@ -369,7 +362,7 @@ void InWorld::HandleCharacterNew(CharacterPacket* const argPacket) {
 		CHARACTER_BOUNDS_HEIGHT
 	});
 
-	(*newCharacter.GetStats()) = argPacket->stats;
+//	(*newCharacter.GetBaseStats()) = argPacket->stats;
 
 	//bookkeeping code
 	newCharacter.CorrectSprite();
@@ -407,7 +400,7 @@ void InWorld::HandleCharacterUpdate(CharacterPacket* const argPacket) {
 		return;
 	}
 
-	Character& character = characterMap[argPacket->characterIndex];
+	BaseCharacter& character = characterMap[argPacket->characterIndex];
 
 	//other characters moving
 	if (argPacket->characterIndex != characterIndex) {
@@ -419,7 +412,7 @@ void InWorld::HandleCharacterUpdate(CharacterPacket* const argPacket) {
 
 void InWorld::HandleCharacterRejection(TextPacket* const argPacket) {
 	RequestDisconnect();
-	SetNextScene(SceneList::CLEANUP);
+	SetNextScene(SceneList::DISCONNECTEDSCREEN);
 	ConfigUtility& config = ConfigUtility::GetSingleton();
 	config["client.disconnectMessage"] = "Error: ";
 	config["client.disconnectMessage"] += argPacket->text;
@@ -464,7 +457,7 @@ void InWorld::SendPlayerUpdate() {
 	newPacket.roomIndex = 0; //TODO: room index
 	newPacket.origin = localCharacter->GetOrigin();
 	newPacket.motion = localCharacter->GetMotion();
-	newPacket.stats = *localCharacter->GetStats();
+//	newPacket.stats = *localCharacter->GetBaseStats();
 
 	//TODO: gameplay components: equipment, items, buffs, debuffs
 

client/scenes/in_world.hpp

@@ -38,7 +38,8 @@
 //common
 #include "frame_rate.hpp"
 
-#include "character.hpp"
+#include "base_character.hpp"
+#include "local_character.hpp"
 
 //client
 #include "base_scene.hpp"
@@ -51,12 +52,7 @@
 class InWorld : public BaseScene {
 public:
 	//Public access members
-	InWorld(
-		int* const argClientIndex,
-		int* const argAccountIndex,
-		int* const argCharacterIndex,
-		CharacterMap* argCharacterMap
-	);
+	InWorld(int* const argClientIndex, int* const argAccountIndex);
 	~InWorld();
 
 protected:
@@ -100,8 +96,8 @@ protected:
 	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
 	int& clientIndex;
 	int& accountIndex;
-	int& characterIndex;
-	CharacterMap& characterMap;
+	int characterIndex = -1;
+	std::map<int, BaseCharacter> characterMap;
 
 	//graphics
 	Image buttonImage;
@@ -124,7 +120,7 @@ protected:
 	FrameRate fps;
 
 	//game
-	Character* localCharacter = nullptr;
+	BaseCharacter* localCharacter = nullptr;
 
 	//connections
 	//TODO: This needs it's own utility, for both InWorld and InCombat

client/scenes/lobby_menu.cpp

@@ -34,6 +34,10 @@ LobbyMenu::LobbyMenu(int* const argClientIndex, int* const argAccountIndex):
 	clientIndex(*argClientIndex),
 	accountIndex(*argAccountIndex)
 {
+	//preemptive reset
+	clientIndex = -1;
+	accountIndex = -1;
+
 	//setup the utility objects
 	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
 	image.SetClipH(image.GetClipH()/3);

client/scenes/makefile

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