added libsocket and updated watt32, but network still not work

[d2df-sdl.git] / src / game / g_main.pas

diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 4e38444dcb9c78e5ce6a3e0c0e04ab14ba9923f5..627ebb0162401d14d3384fa5963f709ce8d0ee4d 100644 (file)
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
@@ -38,9 +38,12 @@ implementation
 
 uses
 {$INCLUDE ../nogl/noGLuses.inc}
-{$IF DEFINED(GO32V2) AND NOT DEFINED(USE_ENETWRAP)}
+{$IFDEF USE_WATT32}
   Watt32,
 {$ENDIF}
+{$IFDEF USE_LIBSOCKET}
+  Socket,
+{$ENDIF}
 {$IFDEF ENABLE_HOLMES}
   g_holmes, fui_wadread, fui_style, fui_gfx_gl,
 {$ENDIF}
@@ -83,13 +86,13 @@ begin
     TMsgType.Notify
   );
 
-{$IF DEFINED(GO32V2) AND NOT DEFINED(USE_ENETWRAP)}
+{$IFDEF USE_WATT32}
   sdlflags := sock_init;
   {$IFDEF USE_SDL2ALLEGRO}
     hires_timer(0);
     init_userSuppliedTimerTick;
   {$ENDIF}
-  e_WriteLog('Wattcp Init: (' + IntToStr(sdlflags) + ') ' + sock_init_err, TMsgType.Notify);
+  e_WriteLog('Wattcp Init: (' + IntToStr(sdlflags) + ') ' + sock_init_err(sdlflags), TMsgType.Notify);
   e_WriteLog('Wattcp Version: ' + wattcpVersion, TMsgType.Notify);
   e_WriteLog('Wattcp Capabilities: ' + wattcpCapabilities, TMsgType.Notify);
   e_WriteLog('Wattcp IP: ' +
@@ -100,6 +103,11 @@ begin
     TMsgType.Notify
  );
 {$ENDIF}
+{$IFDEF USE_LIBSOCKET}
+  sdlflags := __lsck_init;
+  e_WriteLog('libsocket Init: (' + IntToStr(sdlflags) + ') ' + lsck_strerror(sdlflags), TMsgType.Notify);
+  e_WriteLog('libsocket Version: ' + __lsck_get_version, TMsgType.Notify);
+{$ENDIF}
 
 {$IFDEF HEADLESS}
   conbufDumpToStdOut := true;