zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-14 00:21:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed the ENet dependency from gamecontrol.cpp as well.

Browse source 
The global init/shutdown code has been moved to the enet.cpp stub so that now only the networking files which need access include enet.h
This commit is contained in:
Christoph Oelckers 2020-02-03 21:14:35 +01:00
parent 4350a4dd31
commit 95c906e21a
2 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/common/gamecontrol.cpp
View file

@ -56,9 +56,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "resourcefile.h" #include "resourcefile.h"
#include "c_dispatch.h" #include "c_dispatch.h"
#include "glbackend/glbackend.h" #include "glbackend/glbackend.h"
#ifndef NETCODE_DISABLE
#include "enet.h"
#endif
MapRecord mapList[512]; // Due to how this gets used it needs to be static. EDuke defines 7 episode plus one spare episode with 64 potential levels each and relies on the static array which is freely accessible by scripts. MapRecord mapList[512]; // Due to how this gets used it needs to be static. EDuke defines 7 episode plus one spare episode with 64 potential levels each and relies on the static array which is freely accessible by scripts.
MapRecord *currentLevel; // level that is currently played. (The real level, not what script hacks modfifying the current level index can pretend.) MapRecord *currentLevel; // level that is currently played. (The real level, not what script hacks modfifying the current level index can pretend.)
@ -77,7 +74,8 @@ int ShowStartupWindow(TArray<GrpEntry> &);
FString GetGameFronUserFiles(); FString GetGameFronUserFiles();
void InitFileSystem(TArray<GrpEntry>&); void InitFileSystem(TArray<GrpEntry>&);
void I_SetWindowTitle(const char* caption); void I_SetWindowTitle(const char* caption);
bool gHaveNetworking; void InitENet();
void ShutdownENet();
bool AppActive; bool AppActive;
FString currentGame; FString currentGame;
@ -381,9 +379,7 @@ int GameMain()
delete gi; delete gi;
gi = nullptr; gi = nullptr;
} }
#ifndef NETCODE_DISABLE InitENet();
if (gHaveNetworking) enet_deinitialize();
#endif
DeleteStartupScreen(); DeleteStartupScreen();
if (Args) delete Args; if (Args) delete Args;
return r; return r;
@ -598,13 +594,7 @@ int RunGame()
SetClipshapes(); SetClipshapes();
userConfig.ProcessOptions(); userConfig.ProcessOptions();
G_LoadConfig(); G_LoadConfig();
ShutdownENet();
#ifndef NETCODE_DISABLE
gHaveNetworking = !enet_initialize();
if (!gHaveNetworking)
initprintf("An error occurred while initializing ENet.\n");
#endif
auto usedgroups = SetupGame(); auto usedgroups = SetupGame();

16
source/thirdparty/src/enet.cpp vendored
View file

@ -1,2 +1,18 @@
#define ENET_IMPLEMENTATION #define ENET_IMPLEMENTATION
#include "enet.h" #include "enet.h"
#include "printf.h"
bool gHaveNetworking;
void ShutdownENet()
{
if (gHaveNetworking) enet_deinitialize();
}
void InitENet()
{
gHaveNetworking = !enet_initialize();
if (!gHaveNetworking)
Printf("An error occurred while initializing ENet.\n");
}