ForsakenX · jopadan · Jul 16, 2024
diff --git a/.gitignore b/.gitignore
@@ -4,10 +4,9 @@ projectx*
 libs*
 unix*
 mingw*
-data
-configs
-logs
-pilots
+configs/*
+logs/*
+pilots/*
 savegame
 *.dll
 gmon.out
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "data"]
+	path = data
+	url = https://github.com/ForsakenX/forsaken-data
diff --git a/2dpolys.c b/2dpolys.c
diff --git a/2dpolys.h b/2dpolys.h
diff --git a/2dtextures.c b/2dtextures.c
diff --git a/2dtextures.h b/2dtextures.h
diff --git a/Makefile b/Makefile
@@ -64,7 +64,7 @@ endif
 #
 
 # some systems use lua5.1
-LUA=$(shell pkg-config lua && echo lua || echo lua5.1)
+LUA=lua5.1
 MACOSX=$(shell uname -a | grep -qi darwin && echo 1 || echo 0)
 
 # which version of sdl do you want to ask pkgconfig for ?
@@ -82,7 +82,10 @@ $(if $(shell test "$(GL)" -ge 3 -a "$(SDL)" -lt 2 && echo fail), \
      $(error "GL >= 3 only supported with SDL >= 2"))
 
 # library headers
-CFLAGS+= `pkg-config --cflags $(SDL_) $(LUA) $(LUA)-socket libenet libpng zlib openal`
+CFLAGS+= `pkg-config --cflags $(SDL_)`
+CFLAGS+= `pkg-config --cflags $(LUA)`
+CFLAGS+= `pkg-config --cflags libenet`
+CFLAGS+= `pkg-config --cflags libpng zlib openal`
 ifeq ($(MACOSX),1)
   CFLAGS += -DMACOSX
 endif
@@ -95,7 +98,9 @@ ifeq ($(STATIC),1)
   LIB+= -Wl,-dn
   PKG_CFG_OPTS= --static
 endif
-LIB+= `pkg-config $(PKG_CFG_OPTS) --libs $(LUA) $(LUA)-socket libenet libpng zlib openal` -lm
+LIBDIR=`pkg-config --variable=libdir $(LUA)`
+LIB+= `pkg-config $(PKG_CFG_OPTS) --libs $(LUA) libenet libpng zlib openal`
+LIB+= -L$(LIBDIR)/lua/5.1/ $(LIBDIR)/lua/5.1/mime/core.so $(LIBDIR)/lua/5.1/socket/core.so -lm
 ifeq ($(STATIC),1)
   LIB+= -Wl,-dy
 endif

diff --git a/ProjectX-vs10.README.txt b/ProjectX-vs10.README.txt
diff --git a/ai.h b/ai.h
diff --git a/aicrashandburn.c b/aicrashandburn.c
diff --git a/aidogfight.c b/aidogfight.c
diff --git a/aiexogenon.c b/aiexogenon.c
diff --git a/aifire.c b/aifire.c
diff --git a/aifleshmorph.c b/aifleshmorph.c
diff --git a/aifollow.c b/aifollow.c
diff --git a/aiformation.c b/aiformation.c
diff --git a/aiidle.c b/aiidle.c
diff --git a/aikillmine.c b/aikillmine.c
diff --git a/ailib.c b/ailib.c
diff --git a/aimain.c b/aimain.c
diff --git a/aimovet.c b/aimovet.c
diff --git a/aipingoff.c b/aipingoff.c
diff --git a/aipsycho.c b/aipsycho.c
diff --git a/airetreat.c b/airetreat.c
diff --git a/aiscan.c b/aiscan.c
diff --git a/aispline.c b/aispline.c
diff --git a/bgobjects.c b/bgobjects.c
diff --git a/bgobjects.h b/bgobjects.h
diff --git a/bsp.c b/bsp.c
diff --git a/bsp.h b/bsp.h
diff --git a/camera.c b/camera.c
diff --git a/camera.h b/camera.h
diff --git a/collision.c b/collision.c
diff --git a/collision.h b/collision.h
diff --git a/compobjects.c b/compobjects.c
diff --git a/compobjects.h b/compobjects.h
diff --git a/config.c b/config.c
diff --git a/config.h b/config.h
diff --git a/controls.c b/controls.c
diff --git a/controls.h b/controls.h
diff --git a/data b/data
diff --git a/demo.c b/demo.c
diff --git a/demo.h b/demo.h
diff --git a/enemies.c b/enemies.c
diff --git a/enemies.h b/enemies.h
diff --git a/englishlocal.h b/englishlocal.h
diff --git a/extforce.c b/extforce.c
diff --git a/extforce.h b/extforce.h
diff --git a/goal.c b/goal.c
diff --git a/goal.h b/goal.h
diff --git a/lights.c b/lights.c
diff --git a/lights.h b/lights.h
diff --git a/lines.c b/lines.c
diff --git a/lines.h b/lines.h
diff --git a/loadsave.c b/loadsave.c
diff --git a/loadsave.h b/loadsave.h
diff --git a/local.h b/local.h
diff --git a/localtitle.h b/localtitle.h
diff --git a/lua_common.c b/lua_common.c
@@ -31,8 +31,8 @@
 
 #include <stdio.h>
 #include "lua_common.h"
-#include "luasocket.h"
-#include "mime.h"
+#include "luasocket/luasocket.h"
+#include "luasocket/mime.h"
 #include "main.h"
 
 lua_State *L1;

diff --git a/main.h b/main.h
diff --git a/mload.c b/mload.c
diff --git a/mload.h b/mload.h
diff --git a/models.c b/models.c
diff --git a/models.h b/models.h
diff --git a/multiplayer.c b/multiplayer.c
diff --git a/multiplayer.h b/multiplayer.h
diff --git a/mxaload.c b/mxaload.c
diff --git a/mxaload.h b/mxaload.h
diff --git a/mxload.c b/mxload.c
diff --git a/mxload.h b/mxload.h
diff --git a/net_enet_2.c b/net_enet_2.c
@@ -237,7 +237,7 @@ static network_return_t enet_setup( char* str_address, int port )
 	DebugPrintf("network: enet setup address %s\n",
 		address_to_str(&address));
 
-	enet_host = enet_host_create( &address, max_peers, 0, 0 );
+	enet_host = enet_host_create( &address, max_peers, 2, 0, 0 );
 
 	if ( enet_host == NULL )
 	{
@@ -267,7 +267,7 @@ static int enet_connect( char* str_address, int port )
 	DebugPrintf("network: enet connect to address %s\n",
 		address_to_str(&address));
 
-	peer = enet_host_connect( enet_host, &address, max_channels );
+	peer = enet_host_connect( enet_host, &address, max_channels, 0 );
 
 	if (peer == NULL)
 	{
@@ -761,7 +761,7 @@ static void new_connection( ENetPeer * peer )
 
 static void lost_connection( ENetPeer * peer, enet_uint32 data )
 {
-	char* reason = &data;
+	char* reason = (char*)&data;
 	network_peer_data_t * peer_data = peer->data;
 
 	// print debug info
@@ -1311,7 +1311,7 @@ static void new_packet( ENetEvent * event )
 					network_peer_data_t * new_peer_data;
 					DebugPrintf("network: host told us to connect to player %d address %s\n",
 						packet->id, address_to_str( address ));
-					new_peer = enet_host_connect( enet_host, address, max_channels );
+					new_peer = enet_host_connect( enet_host, address, max_channels, 0 );
 					if(!new_peer)
 					{
 						DebugPrintf("network: enet host connect returned NULL.\n");

diff --git a/net_test/chat/client.c b/net_test/chat/client.c
diff --git a/net_test/chat/test.sh b/net_test/chat/test.sh
diff --git a/net_test/smasher/smasher.c b/net_test/smasher/smasher.c
diff --git a/networking.c b/networking.c
@@ -36,7 +36,7 @@
 #include "net_tracker.h"
 #include "timer.h"
 #include "oct2.h"
-
+#include "util.h"
 
 BYTE WhoIAm = UNASSIGNED_SHIP;
 

diff --git a/networking.h b/networking.h
diff --git a/new3d.c b/new3d.c
diff --git a/new3d.h b/new3d.h
@@ -140,24 +140,6 @@ typedef struct VERT2D {
 	float	x;
 	float	y;
 } VERT2D;
-/*===================================================================
-	3D Vertices
-===================================================================*/
-typedef struct VERT {
-	float	x;
-	float	y;
-	float	z;
-} VERT;
-
-/*===================================================================
-	3D Normal
-===================================================================*/
-typedef struct NORMAL {
-	union { float nx; float x; };
-	union { float ny; float y; };
-	union { float nz; float z; };
-} NORMAL;
-
 /*===================================================================
 	4 X 4 Matrix
 ===================================================================*/
@@ -182,10 +164,12 @@ typedef struct MATRIX3X3 {
 	Vector
 ===================================================================*/
 typedef struct VECTOR {
-	float	x;
-	float	y;
-	float	z;
+	union { float nx; float x; };
+	union { float ny; float y; };
+	union { float nz; float z; };
 } VECTOR;
+typedef VECTOR VERT;
+typedef VECTOR NORMAL;
 
 /*===================================================================
 	Short Vector

diff --git a/node.c b/node.c
diff --git a/node.h b/node.h
diff --git a/object.h b/object.h
diff --git a/oct2.c b/oct2.c
diff --git a/pickups.c b/pickups.c
diff --git a/pickups.h b/pickups.h
diff --git a/polys.c b/polys.c
diff --git a/polys.h b/polys.h
diff --git a/primary.c b/primary.c
diff --git a/primary.h b/primary.h
diff --git a/quat.c b/quat.c
diff --git a/quat.h b/quat.h
diff --git a/render.h b/render.h
diff --git a/render_gl1.c b/render_gl1.c
@@ -278,9 +278,9 @@ void light_vert( LVERTEX * vert, u_int8_t * color )
 	VECTOR world, v = {vert->x,vert->y,vert->z};
 	MxV( &world_matrix, &v, &world );
 	if( render_lighting_env_whiteout )
-		do_whiteout_effect( &world, color );
+		do_whiteout_effect( &world, (COLOR*)color );
 	else if( render_lighting_env_water )
-		do_water_effect( &world, color );
+		do_water_effect( &world, (COLOR*)color );
 #ifndef LIGHT_EVERYTHING
 	if( render_lighting_enabled )
 #endif

diff --git a/render_gl_shared.c b/render_gl_shared.c
@@ -508,7 +508,7 @@ static bool set_defaults( void )
 	return true;
 }
 
-static resize_viewport( int width, int height )
+static void resize_viewport( int width, int height )
 {
 	render_viewport_t viewport;
 	viewport.X = 0;

diff --git a/restart.c b/restart.c
diff --git a/restart.h b/restart.h
diff --git a/rtlight.c b/rtlight.c
diff --git a/rtlight.h b/rtlight.h
diff --git a/screenpolys.c b/screenpolys.c
diff --git a/screenpolys.h b/screenpolys.h
diff --git a/scripts/mime.lua b/scripts/mime.lua
diff --git a/scripts/socket.lua b/scripts/socket.lua