projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added detecting use of touch device for user input on current platform
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 3ab46d0f1b2b54e31265149df4209e1dcc6b3016..683bacdb44dcf328f2ce18389100ffe4a809de46 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-6061,6
+6061,8
@@
void OpenAll(void)
InitNetworkSettings();
InitNetworkSettings();
+ InitRuntimeInfo();
+
if (network.serveronly)
{
#if defined(PLATFORM_UNIX)
if (network.serveronly)
{
#if defined(PLATFORM_UNIX)
@@
-6194,16
+6196,13
@@
void CloseAllAndExit(int exit_value)
FreeAllImages();
FreeAllImages();
-#if defined(TARGET_SDL)
-#if defined(TARGET_SDL2)
// !!! TODO !!!
// set a flag to tell the network server thread to quit and wait for it
// using SDL_WaitThread()
// !!! TODO !!!
// set a flag to tell the network server thread to quit and wait for it
// using SDL_WaitThread()
-#else
- if (network_server) // terminate network server
- SDL_KillThread(server_thread);
-#endif
-#endif
+ //
+ // Code used with SDL 1.2:
+ // if (network_server) // terminate network server
+ // SDL_KillThread(server_thread);
CloseVideoDisplay();
ClosePlatformDependentStuff();
CloseVideoDisplay();
ClosePlatformDependentStuff();