From 01244005e9746d5b51d65bcee8d3a901b06f6ceb Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Tue, 13 May 2014 00:09:37 +1000 Subject: [PATCH] Minor file renaming and tweaks --- client/scenes/in_world.cpp | 4 +++ common/network/serial_packet.hpp | 4 ++- .../sql_utility.cpp | 2 +- .../sql_utility.hpp | 0 ..._management.cpp => account_management.cpp} | 2 ++ ...anagement.cpp => character_management.cpp} | 0 server/combat_instance.hpp | 30 ------------------- server/server_application.hpp | 2 -- server/server_internals.cpp | 3 +- todo.txt | 4 ++- 10 files changed, 14 insertions(+), 37 deletions(-) rename server/server_utility.cpp => common/sql_utility.cpp (98%) rename server/server_utility.hpp => common/sql_utility.hpp (100%) rename server/{server_account_management.cpp => account_management.cpp} (99%) rename server/{server_character_management.cpp => character_management.cpp} (100%) delete mode 100644 server/combat_instance.hpp diff --git a/client/scenes/in_world.cpp b/client/scenes/in_world.cpp index 1f4538b..28e7ce5 100644 --- a/client/scenes/in_world.cpp +++ b/client/scenes/in_world.cpp @@ -367,7 +367,9 @@ void InWorld::RequestDisconnect() { //send a disconnect request packet.meta.type = SerialPacket::Type::DISCONNECT; + packet.clientInfo.clientIndex = clientIndex; packet.clientInfo.accountIndex = accountIndex; + packet.clientInfo.characterIndex = characterIndex; serialize(&packet, buffer); network.Send(Channels::SERVER, buffer, PACKET_BUFFER_SIZE); } @@ -378,7 +380,9 @@ void InWorld::RequestShutDown() { //send a shutdown request packet.meta.type = SerialPacket::Type::SHUTDOWN; + packet.clientInfo.clientIndex = clientIndex; packet.clientInfo.accountIndex = accountIndex; + packet.clientInfo.characterIndex = characterIndex; serialize(&packet, buffer); network.Send(Channels::SERVER, buffer, PACKET_BUFFER_SIZE); } diff --git a/common/network/serial_packet.hpp b/common/network/serial_packet.hpp index 29f4af1..3b8c4e5 100644 --- a/common/network/serial_packet.hpp +++ b/common/network/serial_packet.hpp @@ -27,7 +27,7 @@ #include "SDL/SDL_net.h" -#define NETWORK_VERSION 20140506 +#define NETWORK_VERSION 20140512 #define PACKET_STRING_SIZE 100 #pragma pack(push, 0) @@ -42,6 +42,8 @@ union SerialPacket { PING = 1, PONG = 2, + //TODO: rejection message + //Searching for a server to join BROADCAST_REQUEST = 3, BROADCAST_RESPONSE = 4, diff --git a/server/server_utility.cpp b/common/sql_utility.cpp similarity index 98% rename from server/server_utility.cpp rename to common/sql_utility.cpp index 8ef171f..5d586d4 100644 --- a/server/server_utility.cpp +++ b/common/sql_utility.cpp @@ -19,7 +19,7 @@ * 3. This notice may not be removed or altered from any source * distribution. */ -#include "server_utility.hpp" +#include "sql_utility.hpp" #include "utility.hpp" diff --git a/server/server_utility.hpp b/common/sql_utility.hpp similarity index 100% rename from server/server_utility.hpp rename to common/sql_utility.hpp diff --git a/server/server_account_management.cpp b/server/account_management.cpp similarity index 99% rename from server/server_account_management.cpp rename to server/account_management.cpp index 761c1e5..3559714 100644 --- a/server/server_account_management.cpp +++ b/server/account_management.cpp @@ -186,6 +186,8 @@ void ServerApplication::DeleteUserAccount(int uid) { throw( std::runtime_error(std::string() + "Unknown SQL error when deleting an account: " + sqlite3_errmsg(database)) ); } + //TODO: delete this account's characters? + //finish the routine sqlite3_finalize(statement); accountMap.erase(uid); diff --git a/server/server_character_management.cpp b/server/character_management.cpp similarity index 100% rename from server/server_character_management.cpp rename to server/character_management.cpp diff --git a/server/combat_instance.hpp b/server/combat_instance.hpp deleted file mode 100644 index 9f4dedb..0000000 --- a/server/combat_instance.hpp +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright: (c) Kayne Ruse 2014 - * - * 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 COMBATINSTANCE_HPP_ -#define COMBATINSTANCE_HPP_ - -struct CombatInstance { - //uid - static int uidCounter; -}; - -#endif diff --git a/server/server_application.hpp b/server/server_application.hpp index 1b0cd60..5925ccd 100644 --- a/server/server_application.hpp +++ b/server/server_application.hpp @@ -26,7 +26,6 @@ #include "client_data.hpp" #include "account_data.hpp" #include "character_data.hpp" -#include "combat_instance.hpp" //maps #include "map_allocator.hpp" @@ -102,7 +101,6 @@ private: std::map clientMap; std::map accountMap; std::map characterMap; - std::map combatMap; //maps //TODO: I need to handle multiple map objects diff --git a/server/server_internals.cpp b/server/server_internals.cpp index d4fd93b..3432618 100644 --- a/server/server_internals.cpp +++ b/server/server_internals.cpp @@ -21,7 +21,7 @@ */ #include "server_application.hpp" -#include "server_utility.hpp" +#include "sql_utility.hpp" #include #include @@ -33,7 +33,6 @@ int ClientData::uidCounter = 0; int CharacterData::uidCounter = 0; -int CombatInstance::uidCounter = 0; //------------------------- //Define the public members diff --git a/todo.txt b/todo.txt index d232e7d..c37d3e4 100644 --- a/todo.txt +++ b/todo.txt @@ -1,4 +1,6 @@ -I need to keep the documentation up to date. Namely, the GDD is getting out of date. +* I need to keep the documentation up to date. Namely, the GDD is getting out of date. +* How many lookups is the map system using? +* Add the serial packet to the network utility --Naming conventions--