Leidev24

Makefile

@@ -228,6 +228,14 @@ ifndef USE_LOCAL_HEADERS
 USE_LOCAL_HEADERS=1
 endif
 
+ifndef WINFOUR
+WINFOUR=0
+endif
+
+ifndef USE_REACTOS_WINSOCK_HEADER
+USE_REACTOS_WINSOCK_HEADER=0
+endif
+
 ifndef USE_RENDERER_DLOPEN
 USE_RENDERER_DLOPEN=1
 endif
@@ -244,6 +252,15 @@ ifndef SDL_VERSION
 SDL_VERSION=2
 endif
 
+ifeq ($(WINFOUR),1)
+  BASE_CFLAGS += -DWINFOUR
+  BASE_CFLAGS += -DUSE_REACTOS_WINSOCK_HEADER
+  BASE_CFLAGS += -DUSE_INTERNAL_JPEG
+  SDL_VERSION=1
+  USE_CURL=0
+ # CLIENTBIN=oa95
+endif
+
 #############################################################################
 
 BD=$(BUILD_DIR)/debug-$(PLATFORM)-$(ARCH)
@@ -1141,6 +1158,10 @@ ifeq ($(USE_LOCAL_HEADERS),1)
   BASE_CFLAGS += -DUSE_LOCAL_HEADERS
 endif
 
+ifeq ($(USE_REACTOS_WINSOCK_HEADER),1)
+  BASE_CFLAGS += -DUSE_REACTOS_WINSOCK_HEADER
+endif
+
 ifeq ($(BUILD_STANDALONE),1)
   BASE_CFLAGS += -DSTANDALONE
 endif
@@ -1154,14 +1175,15 @@ endif
 ifeq ($(NO_STRIP),1)
   STRIP_FLAG =
 else
-  STRIP_FLAG = -s
+  STRIP_FLAG = -s 
 endif
 
 BASE_CFLAGS += -DPRODUCT_VERSION=\\\"$(VERSION)\\\"
 BASE_CFLAGS += -Wformat=2 -Wno-format-zero-length -Wformat-security -Wno-format-nonliteral
 BASE_CFLAGS += -Wstrict-aliasing=2 -Wmissing-format-attribute
 BASE_CFLAGS += -Wdisabled-optimization
 BASE_CFLAGS += -Werror-implicit-function-declaration
+BASE_CFLAGS += -Wno-int-conversion
 
 ifeq ($(V),1)
 echo_cmd=@:
@@ -1267,7 +1289,7 @@ endef
 #############################################################################
 
 default: release
-all: debug release
+all: debug release 
 
 debug:
 	@$(MAKE) targets B=$(BD) CFLAGS="$(CFLAGS) $(BASE_CFLAGS) $(DEPEND_CFLAGS)" \
@@ -1757,6 +1779,7 @@ Q3ROAOBJ = \
   $(B)/renderer_oa/tr_image_jpg.o \
   $(B)/renderer_oa/tr_image_bmp.o \
   $(B)/renderer_oa/tr_image_tga.o \
+  $(B)/renderer_oa/tr_image_dds.o \
   $(B)/renderer_oa/tr_image_pcx.o \
   $(B)/renderer_oa/tr_init.o \
   $(B)/renderer_oa/tr_light.o \
@@ -1831,6 +1854,7 @@ Q3RSOFTOBJ = \
   $(B)/renderer_oa/tr_image_jpg.o \
   $(B)/renderer_oa/tr_image_bmp.o \
   $(B)/renderer_oa/tr_image_tga.o \
+  $(B)/renderer_oa/tr_image_dds.o \
   $(B)/renderer_oa/tr_image_pcx.o \
   $(B)/renderer_oa/tr_init.o \
   $(B)/renderer_oa/tr_light.o \
@@ -3020,8 +3044,8 @@ else
 	@$(MAKE) VERSION=$(VERSION) -C $(LOKISETUPDIR) V=$(V)
 endif
 
-dist:
-	git archive --format zip --output $(CLIENTBIN)-$(VERSION).zip HEAD
+# dist:
+#	git archive --format zip --output $(CLIENTBIN)-$(VERSION).zip HEAD
 
 #############################################################################
 # DEPENDENCIES

Makefile.OpenArena

@@ -10,11 +10,13 @@ BUILD_CLIENT=1
 BUILD_SERVER=1
 BUILD_GAME_SO=0
 BUILD_GAME_QVM=0
+USE_GIT=0
 BUILD_BASEGAME=0
 BUILD_MISSIONPACK=0
 BASEGAME=baseoa
 # VERSION=1.36+0.8.8
-VERSION=3.0.0a
+VERSION=TEST
+
 
 # OpenArena doesn't use opus yet
 USE_CODEC_VORBIS=1
@@ -24,13 +26,17 @@ ifndef USE_CODEC_XMP
 USE_CODEC_XMP=1
 endif
 
+USE_CURL=1
+
 # FLTO Test
 
 OPTIMIZE += -flto
 
-# This doesn't work with OpenArena yet
+# Not supported
 BUILD_RENDERER_OPENGL2=0
 # You can disable the renderer libraries and build in the OA renderer by default
+# This is disabled because we have some client builtins used (trace etc) and 
+# we are scaling back some modularization for security and support reasons.
 USE_RENDERER_DLOPEN=0
 
 # Choose version 1 or 2
@@ -58,6 +64,12 @@ CLIENTBIN=openarena
 SERVERBIN=oa_ded
 COPYDIR=/usr/local/games/openarena
 
+# Use the Winsock2 headers from ReactOS, which doesn't give errors in Win9x
+# USE_REACTOS_WINSOCK_HEADER=1
+
+# Enable changes to allow Windows 95 and NT4 to work 
+# (Overrides enabling libraries above that don't work well, and outputs to oa95.exe)
+WINFOUR=0
 
 # DEBUG_CFLAGS=-ggdb -O0
 

code/cgame/cg_public.h

@@ -183,7 +183,8 @@ typedef enum {
 	CG_TESTPRINTINT,
 	CG_TESTPRINTFLOAT,
 	CG_ACOS,
-	CG_R_LFX_PARTICLEEFFECT	// leilei - particle effects
+	CG_R_LFX_PARTICLEEFFECT,	// leilei - particle effects
+	CG_R_VIEWPOSITION		// leilei - view position 
 } cgameImport_t;
 
 

code/cgame/cg_syscalls.asm

@@ -104,3 +104,4 @@ equ	testPrintInt				-110
 equ	testPrintFloat				-111
 equ acos						-112
 equ trap_R_LFX_ParticleEffect				-113
+equ trap_R_GetViewPosition				-114

code/client/cl_cgame.c

@@ -637,7 +637,9 @@ intptr_t CL_CgameSystemCalls( intptr_t *args ) {
 	case CG_R_LFX_PARTICLEEFFECT:
 		re.LFX_ParticleEffect( args[1], VMA(2), VMA(3));
 		return 0;
-
+	case CG_R_VIEWPOSITION:
+		re.GetViewPosition( VMA(1) );
+		return VMA(1);
 	case CG_PC_ADD_GLOBAL_DEFINE:
 		return botlib_export->PC_AddGlobalDefine( VMA(1) );
 	case CG_PC_LOAD_SOURCE:

code/client/snd_dma.c

@@ -267,17 +267,17 @@ static sfx_t *S_FindName( const char *name ) {
 	}
 
 	if (!name[0]) {
-		Com_Printf( S_COLOR_YELLOW "WARNING: Sound name is empty\n" );
+		Com_DPrintf( S_COLOR_YELLOW "WARNING: Sound name is empty\n" );
 		return NULL;
 	}
 
 	if (strlen(name) >= MAX_QPATH) {
-		Com_Printf( S_COLOR_YELLOW "WARNING: Sound name is too long: %s\n", name );
+		Com_DPrintf( S_COLOR_YELLOW "WARNING: Sound name is too long: %s\n", name );
 		return NULL;
 	}
 
 	if (name[0] == '*') {
-		Com_Printf( S_COLOR_YELLOW "WARNING: Tried to load player sound directly: %s\n", name );
+		Com_DPrintf( S_COLOR_YELLOW "WARNING: Tried to load player sound directly: %s\n", name );
 		return NULL;
 	}
 
@@ -371,7 +371,7 @@ sfxHandle_t	S_Base_RegisterSound( const char *name, qboolean compressed ) {
 
 	if ( sfx->soundData ) {
 		if ( sfx->defaultSound ) {
-			Com_Printf( S_COLOR_YELLOW "WARNING: could not find %s - using default\n", sfx->soundName );
+			Com_DPrintf( S_COLOR_YELLOW "WARNING: could not find %s - using default\n", sfx->soundName );
 			return 0;
 		}
 		return sfx - s_knownSfx;
@@ -383,7 +383,7 @@ sfxHandle_t	S_Base_RegisterSound( const char *name, qboolean compressed ) {
   S_memoryLoad(sfx);
 
 	if ( sfx->defaultSound ) {
-		Com_Printf( S_COLOR_YELLOW "WARNING: could not find %s - using default\n", sfx->soundName );
+		Com_DPrintf( S_COLOR_YELLOW "WARNING: could not find %s - using default\n", sfx->soundName );
 		return 0;
 	}
 
@@ -1428,7 +1428,7 @@ static void S_OpenBackgroundStream( const char *filename ) {
 	// Open stream
 	s_backgroundStream = S_CodecOpenStream(filename);
 	if(!s_backgroundStream) {
-		Com_Printf( S_COLOR_YELLOW "WARNING: couldn't open music file %s\n", filename );
+		Com_DPrintf( S_COLOR_YELLOW "WARNING: couldn't open music file %s\n", filename );
 		return;
 	}
 

code/qcommon/net_ip.c

@@ -27,6 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #	include <winsock2.h>
 #	include <ws2tcpip.h>
 #	if WINVER < 0x501
+
 #		ifdef __MINGW32__
 			// wspiapi.h isn't available on MinGW, so if it's
 			// present it's because the end user has added it
@@ -37,6 +38,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #		endif
 #	else
 #		include <ws2spi.h>
+#	endif
+
+			// leilei - addition to fix win9x
+#	ifdef USE_REACTOS_WINSOCK_HEADER
+#		include "../reactos/wspiapi.h"
 #	endif
 
 typedef int socklen_t;

code/qcommon/qcommon.h

@@ -34,6 +34,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 //#define	PRE_RELEASE_DEMO
 
+// leilei - broken things
+
+//#define	BROKEN_MDRPHYS	// MDR physics are not serialized!
+//#define BROKEN_IQM	// crashes (and we don't plan to use the format anyway. IQM users are other games)
+
 //============================================================================
 
 //

code/qcommon/qfiles.h

@@ -300,6 +300,22 @@ typedef struct {
 	int			ofsEnd;				// end of file
 } mdrHeader_t;
 
+#ifdef BROKEN_MDRPHYS
+// leilei - bone deformery
+// 		MDR loading also checks for a text file that can set these properties so the "MDP" code can get to work with them.
+//		and working from the cliententity.
+typedef struct {
+
+		vec3_t ofs[MDR_MAX_BONES];
+		vec3_t wgt[MDR_MAX_BONES];
+		float jiggle[MDR_MAX_BONES];
+
+} mdrClBoneDeformSet_t;
+
+typedef struct {
+		mdrClBoneDeformSet_t def[4];	// up to 4 can alter bones
+} mdrDeformity_t;
+#endif
 
 /*
 ==============================================================================

code/reactos/readme.md

@@ -0,0 +1,2 @@
+Place ReactOS' wspiapi.h file here.
+