Sync with head

CMakeLists.txt

@@ -37,7 +37,7 @@ include(CPack)
 # USER DEFINES \
 ################\
 
-set (XASH3D_VERSION 0.19.1)
+set (XASH3D_VERSION 0.19.2)
 
 option(XASH_DEDICATED "Enable dedicated build. Servers must choose this." OFF) # Servers must choose this
 

CONTRIBUTING.md

@@ -33,10 +33,14 @@ But if you want your patch to be accepted, we can give you few guidelines.
 
 | OS | Macro |
 | -- | ----- |
-| Linux | `defined(__linux__)`|
-| *BSD | `defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)` |
+| Linux | `defined(__linux__)` |
+| FreeBSD | `defined(__FreeBSD__)` |
+| NetBSD | `defined(__NetBSD__)` |
+| OpenBSD | `defined(__OpenBSD__)` |
+| OS X/iOS | `defined(__APPLE__)` and TargetConditionals macros |
 | Windows | `defined(_WIN32)` |
 | Android | `defined(__ANDROID__)` |
+| Emscripten | `defined(__EMSCRIPTEN__)` |
 
 ### Licensing
 
@@ -50,4 +54,4 @@ But if you want your patch to be accepted, we can give you few guidelines.
   * Use tabs, not spaces, for indentation.
   * Any brace must have it's own line.
   * Short blocks, if statements and loops on single line is allowed.
-* You can use clang-format here. Config is located in `.clang-format` file in repository's root .
+* You can use clang-format here. Config is located in `.clang-format` file in repository's root .

common/defaults.h

@@ -21,7 +21,7 @@ GNU General Public License for more details.
 /*
 ===================================================================
 
-SETUP BACKENDS DEFINATIONS
+SETUP BACKENDS DEFINITIONS
 
 ===================================================================
 */
@@ -129,10 +129,16 @@ Default build-depended cvar and constant values
 #endif
 
 #if defined XASH_NANOGL || defined XASH_WES || defined XASH_REGAL
+#ifndef XASH_GLES
+#define XASH_GLES
+#endif // XASH_GLES
+#ifndef XASH_GL_STATIC
 #define XASH_GL_STATIC
-#endif
+#endif // XASH_GL_STATIC
+#endif // XASH_NANOGL || XASH_WES || XASH_REGAL
 
-#define DEFAULT_SV_MASTER "ms.xash.su:27010"
+#define DEFAULT_PRIMARY_MASTER "ms.xash.su:27010"
+#define DEFAULT_SECONDARY_MASTER "ms2.xash.su:27010"
 // Set ForceSimulating to 1 by default for dedicated, because AMXModX timers require this
 // TODO: enable simulating for any server?
 #ifdef XASH_DEDICATED
@@ -151,7 +157,7 @@ Default build-depended cvar and constant values
 #endif
 
 #if TARGET_OS_IPHONE
-    #define DEFAULT_CON_MAXFRAC "0.5"
+	#define DEFAULT_CON_MAXFRAC "0.5"
 #else
 	#define DEFAULT_CON_MAXFRAC "1"
 #endif

common/port.h

@@ -53,6 +53,11 @@ GNU General Public License for more details.
         #define OPEN_COMMAND "xdg-open"
 	#endif
 
+
+	#ifdef __EMSCRIPTEN__
+	#include <emscripten.h>
+	#endif
+
 	#if defined(__ANDROID__)
 		#if defined(LOAD_HARDFP)
 			#define POSTFIX "_hardfp"

engine/CMakeLists.txt

@@ -97,7 +97,7 @@ else()
 		add_definitions(-DUSE_SELECT)
 	endif()
 	add_definitions(-DCOLORIZE_CONSOLE)
-endif() 
+endif()
 
 if(LINUX)
 	add_definitions(-DGDB_BREAK)
@@ -138,7 +138,7 @@ if(XASH_SDL)
 endif()
 
 if(XASH_GLES)
-	add_definitions(-DXASH_GLES)
+	add_definitions(-DXASH_GLES -DXASH_GL_STATIC)
 endif()
 
 if(XASH_DLL_LOADER)
@@ -161,6 +161,10 @@ else()
 	add_definitions(-DNO_LIBDL)
 endif()
 
+if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+	add_definitions(-D_DEBUG)
+endif()
+
 if(XASH_RELEASE)
 	add_definitions(-DXASH_RELEASE)
 else()

engine/client/cl_main.c

@@ -1743,7 +1743,7 @@ void CL_ConnectionlessPacket( netadr_t from, sizebuf_t *msg )
 		if( !Q_strcmp( Cmd_Argv( 1 ), "nostore" ) )
 			preferStore = false;
 
-		if( NET_StringToAdr( DEFAULT_SV_MASTER, &adr ) )
+		if( NET_StringToAdr( DEFAULT_PRIMARY_MASTER, &adr ) )
 		{
 			if( NET_CompareAdr( from, adr ))
 			{

engine/client/cl_menu.c

@@ -955,6 +955,16 @@ static void pfnCvarSetValue( const char *name, float value )
 	Cvar_Set2( name, val, false );
 }
 
+static void pfnWriteGameConfig( const char *name )
+{
+	// do not use game.cfg or listenserver.cfg
+	// as it will be executed from hlsdk
+	Host_WriteGameConfig( "gamesettings.cfg" );
+
+	// remove old game.cfg, prevent it from resetting settings
+	FS_Delete( "game.cfg" );
+}
+
 // engine callbacks
 static ui_enginefuncs_t gEngfuncs = 
 {
@@ -1028,7 +1038,7 @@ static ui_enginefuncs_t gEngfuncs =
 	pfnCheckGameDll,
 	pfnGetClipboardData,
 	(void*)Sys_ShellExecute,
-	Host_WriteGameConfig,
+	pfnWriteGameConfig,
 	pfnChangeInstance,
 	pfnStartBackgroundTrack,
 	pfnHostEndGame,

engine/client/cl_parse.c

@@ -1103,7 +1103,6 @@ void CL_CheckingResFile( char *pResFileName )
 
 	downloadcount++;
 
-
 	if( cl_allow_fragment->integer )
 	{
 		Msg( "Starting file download: %s\n", pResFileName );
@@ -1119,8 +1118,7 @@ void CL_CheckingResFile( char *pResFileName )
 		// make sure message will be delivered
 		Netchan_Transmit( &cls.netchan, BF_GetNumBytesWritten( &buf ), BF_GetData( &buf ));
 	}
-	else
-	HTTP_AddDownload( pResFileName, -1, true );
+	else HTTP_AddDownload( pResFileName, -1, true );
 
 }
 

engine/client/gl_sprite.c

@@ -873,7 +873,7 @@ static void R_DrawSpriteQuad( mspriteframe_t *frame, vec3_t org, vec3_t v_right,
 		VectorMA( org, frame->up * scale, v_up, point );
 		VectorMA( point, frame->right * scale, v_right, point );
 		pglVertex3fv( point );
- 	        	pglTexCoord2f( 1.0f, 1.0f );
+		pglTexCoord2f( 1.0f, 1.0f );
 		VectorMA( org, frame->down * scale, v_up, point );
 		VectorMA( point, frame->right * scale, v_right, point );
 		pglVertex3fv( point );

engine/client/touch.c

@@ -1,6 +1,6 @@
 /*
 touch.c - touchscreen support prototype
-Copyright (C) 2015 a1batross
+Copyright (C) 2015-2018 mittorn
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -366,7 +366,7 @@ void Touch_GenetateCode_f( void )
 		aspect = ( B(y2) - B(y1) ) / ( ( B(x2) - B(x1) ) /(SCR_H/SCR_W) );
 		if( Q_memcmp( &c, &B(color), sizeof( rgba_t ) ) )
 		{
-			Msg( "MakeRGBA( color, %d, %d, %d, %d );\n", B(color[0]), B(color[1]), B(color[2]), B(color[3]) );
+			Msg( "unsigned char color[] = { %d, %d, %d, %d };\n", B(color[0]), B(color[1]), B(color[2]), B(color[3]) );
 			Q_memcpy( &c, &B(color), sizeof( rgba_t ) );
 		}
 		Msg( "TOUCH_ADDDEFAULT( \"%s\", \"%s\", \"%s\", %f, %f, %f, %f, color, %d, %f, %d );\n",
@@ -430,6 +430,10 @@ void Touch_SetClientOnly( qboolean state )
 {
 	touch.clientonly = state;
 	host.mouse_visible = state;
+
+	touch.move_finger = touch.look_finger = -1;
+	touch.forward = touch.side = 0;
+
 #ifdef XASH_SDL
 	if( state )
 	{
@@ -489,7 +493,7 @@ void Touch_ClearList( touchbuttonlist_t *list )
 		list->first = list->first->next;
 		Mem_Free ( remove );
 	}
-	list->first= list->last = NULL;
+	list->first = list->last = NULL;
 }
 
 void Touch_RemoveAll_f( void )
@@ -881,6 +885,9 @@ void Touch_Init( void )
 	touch.swidth = 1;
 	g_LastDefaultButton = 0;
 
+	touch.list_edit.first = touch.list_edit.last = NULL;
+	touch.list_user.first = touch.list_user.last = NULL;
+
 	// fill default buttons list
 	MakeRGBA( color, 255, 255, 255, 255 );
 	Touch_AddDefaultButton( "look", "", "_look", 0.500000, 0.000000, 1.000000, 1, color, 0, 0, 0 );

engine/client/touch.h

@@ -1,6 +1,6 @@
 /*
 touch.h - natoive touch controls
-Copyright (C) 2015 mittorn
+Copyright (C) 2015-2018 mittorn
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

engine/client/vid_common.c

@@ -954,7 +954,7 @@ void Win_SetDPIAwareness( void )
 				MsgDev( D_NOTE, "SetDPIAwareness: Success\n" );
 				bSuccess = TRUE;
 			}
-			else if( hResult = E_INVALIDARG ) MsgDev( D_NOTE, "SetDPIAwareness: Invalid argument\n" );
+			else if( hResult == E_INVALIDARG ) MsgDev( D_NOTE, "SetDPIAwareness: Invalid argument\n" );
 			else if( hResult == E_ACCESSDENIED ) MsgDev( D_NOTE, "SetDPIAwareness: Access Denied\n" );
 		}
 		else MsgDev( D_NOTE, "SetDPIAwareness: Can't get SetProcessDpiAwareness\n" );

engine/common/cfgscript.c

@@ -209,7 +209,7 @@ qboolean CSCR_ParseHeader( parserstate_t *ps )
 ======================
 CSCR_WriteGameCVars
 
-Print all cvars declared in script to game.cfg file
+Print all cvars declared in script to gamesettings.cfg file
 ======================
 */
 int CSCR_WriteGameCVars( file_t *cfg, const char *scriptfilename )
@@ -251,7 +251,7 @@ int CSCR_WriteGameCVars( file_t *cfg, const char *scriptfilename )
 			convar_t *cvar = Cvar_FindVar( var.name );
 			if( cvar && !( cvar->flags & ( CVAR_SERVERNOTIFY | CVAR_ARCHIVE ) ) )
 			{
-				// cvars will be placed in game.cfg and restored on map start
+				// cvars will be placed in gamesettings.cfg and restored on map start
 				if( var.flags & CVAR_USERINFO )
 					FS_Printf( cfg, "// %s ( %s )\nsetu %s \"%s\"\n", var.desc, var.value, var.name, cvar->string );
 				else

engine/common/common.h

@@ -168,7 +168,7 @@ typedef enum
 #include "crtlib.h"
 #include "base_cmd.h"
 
-#define XASH_VERSION	"0.19.1"		// engine current version
+#define XASH_VERSION	"0.19.2"		// engine current version
 // since this fork have own version, this is just left for compability
 #define BASED_VERSION	0.98f
 

engine/common/con_utils.c

@@ -1405,27 +1405,37 @@ void Host_WriteGameConfig( const char *name )
 {
 	/* Old Xash3D behaviour is writing listenserver config
 	every time when starting server from ui.
-	WON Half-Life uses game.cfg for this purpose*/
+	WON Half-Life used game.cfg for this purpose
+	but this causes reseting all cvars on map change.
+	since server not unloaded, we do not need to restore cvars
+	*/
 	file_t	*f;
+	string oldconfigfile, newconfigfile;
+
+	Q_snprintf( oldconfigfile, MAX_STRING, "%s.bak", name );
+	Q_snprintf( newconfigfile, MAX_STRING, "%s.new", name );
 
 	SV_InitGameProgs();	// collect user variables
 
-	if(( f = FS_Open( "game.cfg", "w", false )) != NULL )
+	if(( f = FS_Open( newconfigfile, "w", false )) != NULL )
 	{
 		FS_Printf( f, "//=======================================================================\n" );
 		FS_Printf( f, "//\t\t\tCopyright Flying With Gauss Team %s ©\n", Q_timestamp( TIME_YEAR_ONLY ));
-		FS_Printf( f, "//\t\t\tgame.cfg - multiplayer config\n" );
+		FS_Printf( f, "//\t\t\t%s - multiplayer config\n", name );
 		FS_Printf( f, "//=======================================================================\n" );
 
 		Cmd_WriteServerVariables( f );
 		CSCR_WriteGameCVars( f, "user.scr" );
 		CSCR_WriteGameCVars( f, "settings.scr" );
 
 		FS_Close( f );
-	}
-	else MsgDev( D_ERROR, "Couldn't write game.cfg.\n" );
 
-	//SV_FreeGameProgs();	// release progs with all variables
+		FS_Rename( name, oldconfigfile );
+		FS_Delete( name );
+		FS_Rename( newconfigfile, name );
+		FS_Delete( oldconfigfile );
+	}
+	else MsgDev( D_ERROR, "Couldn't write game settings file %s.\n", name );
 }
 /*
 ===============

engine/common/cvar.c

@@ -73,9 +73,9 @@ convar_t *Cvar_FindVar( const char *var_name )
 		if( !Q_stricmp( var_name, var->name ))
 			return var;
 	}
-#endif
 
 	return NULL;
+#endif
 }
 
 /*