From 85ebe3a7cacc4f4d99efe2a18b1fcb06440fb528 Mon Sep 17 00:00:00 2001 From: Dennis Andersen Date: Sun, 16 Feb 2014 01:38:03 +0100 Subject: [PATCH] GameServer - Merged with Input, Added some athur info in headers --- .../Implementation/GameLobby_ProtocolParser.cpp | 3 +++ Code/Input/Include/Input.h | 12 ++++++++++++ Code/Input/Input.vcxproj | 1 + Code/Input/Input.vcxproj.filters | 3 +++ Code/Network/NetworkAPI/NetworkAPI_Preprocessor.h | 3 +++ Code/Network/NetworkAPI/NetworkClient.cpp | 4 ++++ Code/Network/NetworkAPI/NetworkServer.cpp | 5 +++++ Code/Network/NetworkAPI/NetworkServerEventStruct.h | 3 +++ 8 files changed, 34 insertions(+) create mode 100644 Code/Input/Include/Input.h diff --git a/Code/Game/GameServer/Implementation/GameLobby_ProtocolParser.cpp b/Code/Game/GameServer/Implementation/GameLobby_ProtocolParser.cpp index eba91b28..7493cb5a 100644 --- a/Code/Game/GameServer/Implementation/GameLobby_ProtocolParser.cpp +++ b/Code/Game/GameServer/Implementation/GameLobby_ProtocolParser.cpp @@ -1,3 +1,6 @@ +///////////////////////////////////////////////////////////////////// +// Created by [Dennis Andersen] [2013] +///////////////////////////////////////////////////////////////////// #include "..\GameLobby.h" using namespace DanBias; diff --git a/Code/Input/Include/Input.h b/Code/Input/Include/Input.h new file mode 100644 index 00000000..3de235ca --- /dev/null +++ b/Code/Input/Include/Input.h @@ -0,0 +1,12 @@ +///////////////////////////////////////////////////////////////////// +// Created by [Dennis Andersen] [2013] +///////////////////////////////////////////////////////////////////// +#ifndef INPUT_INPUT_H +#define INPUT_INPUT_H + +#include "InputManager.h" +#include "InputObject.h" +#include "Keyboard.h" +#include "Mouse.h" + +#endif // !INPUT_INPUT_H diff --git a/Code/Input/Input.vcxproj b/Code/Input/Input.vcxproj index 5c2cc0ce..8642e69e 100644 --- a/Code/Input/Input.vcxproj +++ b/Code/Input/Input.vcxproj @@ -29,6 +29,7 @@ + diff --git a/Code/Input/Input.vcxproj.filters b/Code/Input/Input.vcxproj.filters index ac91edc7..1b318c0a 100644 --- a/Code/Input/Input.vcxproj.filters +++ b/Code/Input/Input.vcxproj.filters @@ -68,5 +68,8 @@ Header Files + + Header Files + \ No newline at end of file diff --git a/Code/Network/NetworkAPI/NetworkAPI_Preprocessor.h b/Code/Network/NetworkAPI/NetworkAPI_Preprocessor.h index 351dbaf0..1abf9266 100644 --- a/Code/Network/NetworkAPI/NetworkAPI_Preprocessor.h +++ b/Code/Network/NetworkAPI/NetworkAPI_Preprocessor.h @@ -1,3 +1,6 @@ +////////////////////////////////////// +// Created by Dennis Andersen 2014 // +////////////////////////////////////// #ifndef NETWORK_API_NETWORK_API_PREPROCESSOR_H #define NETWORK_API_NETWORK_API_PREPROCESSOR_H diff --git a/Code/Network/NetworkAPI/NetworkClient.cpp b/Code/Network/NetworkAPI/NetworkClient.cpp index 501aefdb..cf604d53 100644 --- a/Code/Network/NetworkAPI/NetworkClient.cpp +++ b/Code/Network/NetworkAPI/NetworkClient.cpp @@ -1,3 +1,7 @@ +////////////////////////////////////// +// Created by Pontus Fransson 2013 // +// Modified by Dennis Andersen 2014 // +////////////////////////////////////// #ifndef INCLUDE_WINSOCK_LIB #define INCLUDE_WINSOCK_LIB #pragma comment(lib, "ws2_32.lib") diff --git a/Code/Network/NetworkAPI/NetworkServer.cpp b/Code/Network/NetworkAPI/NetworkServer.cpp index e31efcde..68a61a1a 100644 --- a/Code/Network/NetworkAPI/NetworkServer.cpp +++ b/Code/Network/NetworkAPI/NetworkServer.cpp @@ -1,3 +1,8 @@ +////////////////////////////////////// +// Created by Pontus Fransson 2013 // +// Modified by Dennis Andersen 2014 // +////////////////////////////////////// + #ifndef INCLUDE_WINSOCK_LIB #define INCLUDE_WINSOCK_LIB #pragma comment(lib, "ws2_32.lib") diff --git a/Code/Network/NetworkAPI/NetworkServerEventStruct.h b/Code/Network/NetworkAPI/NetworkServerEventStruct.h index a48d97de..ba1e21af 100644 --- a/Code/Network/NetworkAPI/NetworkServerEventStruct.h +++ b/Code/Network/NetworkAPI/NetworkServerEventStruct.h @@ -1,3 +1,6 @@ +///////////////////////////////////////////////////////////////////// +// Created by [Dennis Andersen] [2013] +///////////////////////////////////////////////////////////////////// #ifndef NETWORK_API_SERVEREVENT_H #define NETWORK_API_SERVEREVENT_H