From a494bfbb380bdaeeb23353479fb066980527d3bc Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Wed, 25 Dec 2013 22:09:59 +1100 Subject: [PATCH] Fixed horrible naming convention --- client/scenes/in_world.cpp | 8 +++---- client/scenes/lobby_menu.cpp | 8 +++---- client/scenes/main_menu.cpp | 4 ++-- client/scenes/options_menu.cpp | 4 ++-- client/scenes/splash_screen.cpp | 4 ++-- server/player_entity.hpp | 38 +++++++++++++++++++++++++++++++++ server/world_room.cpp | 8 +++---- server/world_room.hpp | 2 ++ 8 files changed, 58 insertions(+), 18 deletions(-) create mode 100644 server/player_entity.hpp diff --git a/client/scenes/in_world.cpp b/client/scenes/in_world.cpp index d319e5a..cefcc86 100644 --- a/client/scenes/in_world.cpp +++ b/client/scenes/in_world.cpp @@ -29,10 +29,10 @@ //Public access members //------------------------- -InWorld::InWorld(ConfigUtility* const arg1, UDPNetworkUtility* const arg2, int* const arg3): - config(*arg1), - network(*arg2), - clientIndex(*arg3) +InWorld::InWorld(ConfigUtility* const argConfig, UDPNetworkUtility* const argNetwork, int* const argClientIndex): + config(*argConfig), + network(*argNetwork), + clientIndex(*argClientIndex) { //setup the utility objects image.LoadSurface(config["dir.interface"] + "button_menu.bmp"); diff --git a/client/scenes/lobby_menu.cpp b/client/scenes/lobby_menu.cpp index cfea108..9f91b68 100644 --- a/client/scenes/lobby_menu.cpp +++ b/client/scenes/lobby_menu.cpp @@ -29,10 +29,10 @@ //Public access members //------------------------- -LobbyMenu::LobbyMenu(ConfigUtility* const arg1, UDPNetworkUtility* const arg2, int* const arg3): - config(*arg1), - network(*arg2), - clientIndex(*arg3) +LobbyMenu::LobbyMenu(ConfigUtility* const argConfig, UDPNetworkUtility* const argNetwork, int* const argClientIndex): + config(*argConfig), + network(*argNetwork), + clientIndex(*argClientIndex) { //setup the utility objects image.LoadSurface(config["dir.interface"] + "button_menu.bmp"); diff --git a/client/scenes/main_menu.cpp b/client/scenes/main_menu.cpp index 1fd8118..d5b2064 100644 --- a/client/scenes/main_menu.cpp +++ b/client/scenes/main_menu.cpp @@ -25,8 +25,8 @@ //Public access members //------------------------- -MainMenu::MainMenu(ConfigUtility* const arg1): - config(*arg1) +MainMenu::MainMenu(ConfigUtility* const argConfig): + config(*argConfig) { //setup the utility objects image.LoadSurface(config["dir.interface"] + "button_menu.bmp"); diff --git a/client/scenes/options_menu.cpp b/client/scenes/options_menu.cpp index ec59b39..414d94c 100644 --- a/client/scenes/options_menu.cpp +++ b/client/scenes/options_menu.cpp @@ -25,8 +25,8 @@ //Public access members //------------------------- -OptionsMenu::OptionsMenu(ConfigUtility* const arg1): - config(*arg1) +OptionsMenu::OptionsMenu(ConfigUtility* const argConfig): + config(*argConfig) { //setup the utility objects image.LoadSurface(config["dir.interface"] + "button_menu.bmp"); diff --git a/client/scenes/splash_screen.cpp b/client/scenes/splash_screen.cpp index fa6603a..dd9697b 100644 --- a/client/scenes/splash_screen.cpp +++ b/client/scenes/splash_screen.cpp @@ -25,8 +25,8 @@ //Public access members //------------------------- -SplashScreen::SplashScreen(ConfigUtility* const arg1): - config(*arg1) +SplashScreen::SplashScreen(ConfigUtility* const argConfig): + config(*argConfig) { logo.LoadSurface(config["dir.logos"] + "krstudios.bmp"); startTick = std::chrono::steady_clock::now(); diff --git a/server/player_entity.hpp b/server/player_entity.hpp new file mode 100644 index 0000000..f350384 --- /dev/null +++ b/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 +#include + +struct PlayerEntity { + int playerIndex; + Vector2 position; + Vector2 motion; +}; + +typedef std::map PlayerEntityMap; + +#endif diff --git a/server/world_room.cpp b/server/world_room.cpp index 7876a48..c6a65f6 100644 --- a/server/world_room.cpp +++ b/server/world_room.cpp @@ -26,8 +26,8 @@ using namespace std; -int worldRoomThread(void* arg) { - WorldRoom* room = reinterpret_cast(arg); +int worldRoomThread(void* argRoom) { + WorldRoom* room = reinterpret_cast(argRoom); try { room->Init(); room->Loop(); @@ -40,8 +40,8 @@ int worldRoomThread(void* arg) { return 0; } -WorldRoom::WorldRoom(PlayerMap const& arg1): - playerMap(arg1) +WorldRoom::WorldRoom(PlayerMap const& argPlayerMap): + playerMap(argPlayerMap) { // } diff --git a/server/world_room.hpp b/server/world_room.hpp index a2cc664..fffcee7 100644 --- a/server/world_room.hpp +++ b/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 networkOutQueue; PlayerMap playerMap; + PlayerEntityMap playerEntityMap; }; #endif