Fixed horrible naming convention

client/scenes/in_world.cpp

@@ -29,10 +29,10 @@
 //Public access members
 //-------------------------
 
-InWorld::InWorld(ConfigUtility* const arg1, UDPNetworkUtility* const arg2, int* const arg3):
+InWorld::InWorld(ConfigUtility* const argConfig, UDPNetworkUtility* const argNetwork, int* const argClientIndex):
-	config(*arg1),
+	config(*argConfig),
-	network(*arg2),
+	network(*argNetwork),
-	clientIndex(*arg3)
+	clientIndex(*argClientIndex)
 {
 	//setup the utility objects
 	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");

client/scenes/lobby_menu.cpp

@@ -29,10 +29,10 @@
 //Public access members
 //-------------------------
 
-LobbyMenu::LobbyMenu(ConfigUtility* const arg1, UDPNetworkUtility* const arg2, int* const arg3):
+LobbyMenu::LobbyMenu(ConfigUtility* const argConfig, UDPNetworkUtility* const argNetwork, int* const argClientIndex):
-	config(*arg1),
+	config(*argConfig),
-	network(*arg2),
+	network(*argNetwork),
-	clientIndex(*arg3)
+	clientIndex(*argClientIndex)
 {
 	//setup the utility objects
 	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");

client/scenes/main_menu.cpp

@@ -25,8 +25,8 @@
 //Public access members
 //-------------------------
 
-MainMenu::MainMenu(ConfigUtility* const arg1):
+MainMenu::MainMenu(ConfigUtility* const argConfig):
-	config(*arg1)
+	config(*argConfig)
 {
 	//setup the utility objects
 	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");

client/scenes/options_menu.cpp

@@ -25,8 +25,8 @@
 //Public access members
 //-------------------------
 
-OptionsMenu::OptionsMenu(ConfigUtility* const arg1):
+OptionsMenu::OptionsMenu(ConfigUtility* const argConfig):
-	config(*arg1)
+	config(*argConfig)
 {
 	//setup the utility objects
 	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");

client/scenes/splash_screen.cpp

@@ -25,8 +25,8 @@
 //Public access members
 //-------------------------
 
-SplashScreen::SplashScreen(ConfigUtility* const arg1):
+SplashScreen::SplashScreen(ConfigUtility* const argConfig):
-	config(*arg1)
+	config(*argConfig)
 {
 	logo.LoadSurface(config["dir.logos"] + "krstudios.bmp");
 	startTick = std::chrono::steady_clock::now();

server/player_entity.hpp

@@ -0,0 +1,38 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef PLAYERENTITY_HPP_
+#define PLAYERENTITY_HPP_
+
+#include "vector2.hpp"
+
+#include <map>
+#include <string>
+
+struct PlayerEntity {
+	int playerIndex;
+	Vector2 position;
+	Vector2 motion;
+};
+
+typedef std::map<int, PlayerEntity> PlayerEntityMap;
+
+#endif

server/world_room.cpp

@@ -26,8 +26,8 @@
 
 using namespace std;
 
-int worldRoomThread(void* arg) {
+int worldRoomThread(void* argRoom) {
-	WorldRoom* room = reinterpret_cast<WorldRoom*>(arg);
+	WorldRoom* room = reinterpret_cast<WorldRoom*>(argRoom);
 	try {
 		room->Init();
 		room->Loop();
@@ -40,8 +40,8 @@ int worldRoomThread(void* arg) {
 	return 0;
 }
 
-WorldRoom::WorldRoom(PlayerMap const& arg1):
+WorldRoom::WorldRoom(PlayerMap const& argPlayerMap):
-	playerMap(arg1)
+	playerMap(argPlayerMap)
 {
 	//
 }

server/world_room.hpp

@@ -25,6 +25,7 @@
 #include "network_packet.hpp"
 #include "thread_safe_queue.hpp"
 #include "player.hpp"
+#include "player_entity.hpp"
 
 #include "SDL/SDL_thread.h"
 
@@ -58,6 +59,7 @@ private:
 	ThreadSafeQueue<NetworkPacket> networkOutQueue;
 
 	PlayerMap playerMap;
+	PlayerEntityMap playerEntityMap;
 };
 
 #endif