NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic

This commit is contained in:
lindaandersson 2014-01-30 15:20:44 +01:00
parent 0aa39275e3 4167b6a93b
commit bb8e92ec36
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Code/Game/aDanBiasGameLauncher/Launcher.cpp
View File

@ -57,7 +57,7 @@ int WINAPI WinMain( HINSTANCE hinst, HINSTANCE prevInst, PSTR cmdLine, int cmdSh
return cmdShow; return cmdShow;
} }
serverThread = std::thread(ServerFnc); //serverThread = std::thread(ServerFnc);
Sleep(200); Sleep(200);

2
Code/Network/NetworkAPI/NetworkSession.h
View File

@ -13,7 +13,7 @@
#include "NetworkAPI_Preprocessor.h" #include "NetworkAPI_Preprocessor.h"
#include "NetworkServerEventStruct.h" #include "NetworkServerEventStruct.h"
#include "NetworkClient.h" #include "NetworkClient.h"
#include "Utilities.h" #include "..\Misc\Utilities.h"
#include "DynamicArray.h" #include "DynamicArray.h"
namespace Oyster namespace Oyster