From 60c31ff56df6fdc524dabfab404b5a0124c94ad3 Mon Sep 17 00:00:00 2001
From: Kayne Ruse <ratstail91@yahoo.com.au>
Date: Fri, 7 Mar 2014 20:27:34 +1100
Subject: [PATCH] Slight code tweak

---
 client/scenes/in_world.cpp   | 15 +++++++++------
 client/scenes/lobby_menu.cpp | 12 ++++++++----
 common/network/serial.cpp    |  4 ++--
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/client/scenes/in_world.cpp b/client/scenes/in_world.cpp
index c316ae8..b156064 100644
--- a/client/scenes/in_world.cpp
+++ b/client/scenes/in_world.cpp
@@ -290,6 +290,9 @@ void InWorld::HandlePlayerUpdate(NetworkPacket packet) {
 
 void InWorld::SendState() {
 	NetworkPacket packet;
+	char buffer[sizeof(NetworkPacket)];
+
+	//pack the packet
 	packet.meta.type = NetworkPacket::Type::PLAYER_UPDATE;
 	packet.playerInfo.clientIndex = clientIndex;
 	packet.playerInfo.playerIndex = playerIndex;
@@ -298,28 +301,28 @@ void InWorld::SendState() {
 	packet.playerInfo.position = localCharacter->GetPosition();
 	packet.playerInfo.motion = localCharacter->GetMotion();
 
-	char buffer[sizeof(NetworkPacket)];
 	serialize(&packet, buffer);
-
 	network.Send(Channels::SERVER, buffer, sizeof(NetworkPacket));
 }
 
 void InWorld::RequestDisconnect() {
-	//send a disconnect request
 	NetworkPacket packet;
+	char buffer[sizeof(NetworkPacket)];
+
+	//send a disconnect request
 	packet.meta.type = NetworkPacket::Type::DISCONNECT;
 	packet.clientInfo.index = clientIndex;
-	char buffer[sizeof(NetworkPacket)];
 	serialize(&packet, buffer);
 	network.Send(Channels::SERVER, buffer, sizeof(NetworkPacket));
 }
 
 void InWorld::RequestShutDown() {
-	//send a shutdown request
 	NetworkPacket packet;
+	char buffer[sizeof(NetworkPacket)];
+
+	//send a shutdown request
 	packet.meta.type = NetworkPacket::Type::SHUTDOWN;
 	packet.clientInfo.index = clientIndex;
-	char buffer[sizeof(NetworkPacket)];
 	serialize(&packet, buffer);
 	network.Send(Channels::SERVER, buffer, sizeof(NetworkPacket));
 }
\ No newline at end of file
diff --git a/client/scenes/lobby_menu.cpp b/client/scenes/lobby_menu.cpp
index dfed9e4..4b1c5fb 100644
--- a/client/scenes/lobby_menu.cpp
+++ b/client/scenes/lobby_menu.cpp
@@ -125,10 +125,12 @@ void LobbyMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
 
 void LobbyMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 	if (search.MouseButtonUp(button) == Button::State::HOVER) {
-		//broadcast to the network, or a specific server
+		//the vars
 		NetworkPacket packet;
-		packet.meta.type = NetworkPacket::Type::BROADCAST_REQUEST;
 		char buffer[sizeof(NetworkPacket)];
+
+		//broadcast to the network, or a specific server
+		packet.meta.type = NetworkPacket::Type::BROADCAST_REQUEST;
 		serialize(&packet, buffer);
 		network.Send(config["server.host"].c_str(), config.Int("server.port"), buffer, sizeof(NetworkPacket));
 
@@ -138,10 +140,12 @@ void LobbyMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 	}
 
 	else if (join.MouseButtonUp(button) == Button::State::HOVER && selection != nullptr) {
-		//join the selected server
+		//the vars
 		NetworkPacket packet;
-		packet.meta.type = NetworkPacket::Type::JOIN_REQUEST;
 		char buffer[sizeof(NetworkPacket)];
+
+		//join the selected server
+		packet.meta.type = NetworkPacket::Type::JOIN_REQUEST;
 		serialize(&packet, buffer);
 		network.Send(&selection->address, buffer, sizeof(NetworkPacket));
 		selection = nullptr;
diff --git a/common/network/serial.cpp b/common/network/serial.cpp
index 24e802c..c6f263b 100644
--- a/common/network/serial.cpp
+++ b/common/network/serial.cpp
@@ -139,7 +139,6 @@ void serialize(NetworkPacket* packet, void* buffer) {
 		case NetworkPacket::Type::BROADCAST_REQUEST:
 		case NetworkPacket::Type::JOIN_REQUEST:
 		case NetworkPacket::Type::SYNCHRONIZE:
-		case NetworkPacket::Type::SHUTDOWN:
 			serializeType(packet, reinterpret_cast<char*>(buffer));
 		break;
 
@@ -151,6 +150,7 @@ void serialize(NetworkPacket* packet, void* buffer) {
 		//Client info
 		case NetworkPacket::Type::JOIN_RESPONSE:
 		case NetworkPacket::Type::DISCONNECT:
+		case NetworkPacket::Type::SHUTDOWN:
 			serializeClient(packet, reinterpret_cast<char*>(buffer));
 		break;
 
@@ -178,7 +178,6 @@ void deserialize(NetworkPacket* packet, void* buffer) {
 		case NetworkPacket::Type::BROADCAST_REQUEST:
 		case NetworkPacket::Type::JOIN_REQUEST:
 		case NetworkPacket::Type::SYNCHRONIZE:
-		case NetworkPacket::Type::SHUTDOWN:
 			//
 		break;
 
@@ -190,6 +189,7 @@ void deserialize(NetworkPacket* packet, void* buffer) {
 		//Client info
 		case NetworkPacket::Type::JOIN_RESPONSE:
 		case NetworkPacket::Type::DISCONNECT:
+		case NetworkPacket::Type::SHUTDOWN:
 			deserializeClient(packet, reinterpret_cast<char*>(buffer));
 		break;