Merge branch 'master' into aomdc

2018-03-31 18:06:50 +05:00 · 2018-03-31 18:06:50 +05:00 · 696b94c74a
parent a000cbf8ad 9d7ab6acf4
commit 696b94c74a
16 changed files with 144 additions and 62 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -21,17 +21,25 @@
 #

 cmake_minimum_required(VERSION 2.6.0)
+
+# Install custom module path
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
+
+include(VSForceXPToolchain) # Force XP toolchain for Visual Studio
+
 project (HLSDK-XASH3D)

 #--------------
 # USER DEFINES \
 ################\
+option(64BIT "Allow 64 Bit builds" OFF)
 option(USE_VGUI "Enable VGUI1. UNDONE" OFF)
 option(USE_VGUI2 "Enable VGUI2. UNDONE" OFF)
 option(USE_VOICEMGR "Enable VOICE MANAGER." OFF)
 option(BUILD_CLIENT "Build client dll" ON)
 option(BUILD_SERVER "Build server dll" ON)
 option(GOLDSOURCE_SUPPORT "Build goldsource compatible client library" OFF)
+option(64BIT "Disable auto -m32 appending to compiler flags" OFF)
 set(GAMEDIR "valve" CACHE STRING "Gamedir path")
 set(SERVER_INSTALL_DIR "dlls" CACHE STRING "Where put server dll")
 set(CLIENT_INSTALL_DIR "cl_dlls" CACHE STRING "Where put client dll")
@ -43,25 +51,35 @@ set(SERVER_LIBRARY_NAME "hl" CACHE STRING "Library name for Linux/MacOS/Windows"

 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")

-# Build 32-bit Xash on 64-bit, because Xash3D not support this
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+if(CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT 64BIT)
 	if(MSVC)
-			error("UNDONE: set 32 build flags")
+		error("UNDONE: set 32 build flags")
 	else()
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
-	set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
+		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32")
 	endif()
+	set(CMAKE_SIZEOF_VOID_P 4)
+endif()
+
+if(64BIT AND CMAKE_SIZEOF_VOID_P EQUAL 4)
+	message(FATAL_ERROR "You enabled XASH_64BIT, but compiler can't create 64 bit code!")
+endif()
+
+if(64BIT)
+	message(STATUS "Building for 64 Bit")
+else()
+	message(STATUS "Building for 32 Bit")
 endif()

 # add_compile_options for older cmake versions
 if(${CMAKE_VERSION} VERSION_LESS "3.0.2")
-macro(add_compile_options)
-	set(list_var "${ARGV}")
-	foreach(arg IN LISTS list_var)
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${arg}")
-	endforeach()
-endmacro()
+	macro(add_compile_options)
+		set(list_var "${ARGV}")
+		foreach(arg IN LISTS list_var)
+			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${arg}")
+		endforeach()
+	endmacro()
 endif()

 if(BUILD_CLIENT)
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-# Half-Life SDK for Xash3D [![Build Status](https://travis-ci.org/FWGS/hlsdk-xash3d.svg)](https://travis-ci.org/FWGS/hlsdk-xash3d)
+# Half-Life SDK for Xash3D [![Build Status](https://travis-ci.org/FWGS/hlsdk-xash3d.svg)](https://travis-ci.org/FWGS/hlsdk-xash3d) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/github/FWGS/hlsdk-xash3d?svg=true)](https://ci.appveyor.com/project/a1batross/hlsdk-xash3d)

 Half-Life SDK for Xash3D & GoldSource with some fixes.

@ -31,7 +31,7 @@ These scripts also can be ran via wine:

 The libraries built this way are always GoldSource compatible.

-There're dsp projects for MVS 6 in `cl_dll` and `dlls` directories, but we don't keep them up-to-date. You're free to adapt them for yourself and try to import into the newer MVS versions.
+There're dsp projects for Visual Studio 6 in `cl_dll` and `dlls` directories, but we don't keep them up-to-date. You're free to adapt them for yourself and try to import into the newer Visual Studio versions.

 #### Using mingw

@ -44,7 +44,7 @@ TODO

 ### OS X

-TODO
+Nothing here.

 ### FreeBSD

--- a/appveyor.yml
+++ b/appveyor.yml
@ -0,0 +1,28 @@
+version: 1.0.{build}
+
+branches:
+  only:
+    - master
+
+environment:
+  matrix:
+    - os: Visual Studio 2013
+      GENERATOR_NAME: "Visual Studio 12 2013"
+    - os: Visual Studio 2015
+      GENERATOR_NAME: "Visual Studio 14 2015"
+# TODO: Uncomment when AppVeyor will provide XP toolchain for VS2017
+#    - os: Visual Studio 2017
+#      GENERATOR_NAME: "Visual Studio 15 2017"
+
+clone_folder: c:\projects\xash\hlsdk-xash3d
+
+build:
+  project: INSTALL.vcxproj
+  verbosity: normal
+
+configuration:
+  - Debug
+
+before_build:
+  - git submodule update --init --recursive
+  - cmake -G "%GENERATOR_NAME%"
--- a/cl_dll/Android.mk
+++ b/cl_dll/Android.mk
@ -93,7 +93,7 @@ SRCS+=./input_xash3d.cpp
 SRCS+=./scoreboard.cpp
 SRCS+=./MOTD.cpp
 INCLUDES =  -I../common -I. -I../game_shared -I../pm_shared -I../engine -I../dlls -I../utils/false_vgui/include
-DEFINES = -Wno-write-strings -DLINUX -D_LINUX -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -DCLIENT_WEAPONS -DCLIENT_DLL -w
+DEFINES = -Wno-write-strings -DLINUX -D_LINUX -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -DCLIENT_WEAPONS -DCLIENT_DLL -w -D_snprintf=snprintf

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/. \
 		 $(LOCAL_PATH)/../common \
--- a/cl_dll/CMakeLists.txt
+++ b/cl_dll/CMakeLists.txt
@ -129,8 +129,13 @@ set_target_properties (${CLDLL_LIBRARY} PROPERTIES
 	POSITION_INDEPENDENT_CODE 1)

 if(APPLE OR WIN32 OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+	set(CLDLL_NAME "client")
+	if(64BIT)
+		set(CLDLL_NAME "client64")
+	endif()
+
 	set_target_properties(${CLDLL_LIBRARY} PROPERTIES
-		OUTPUT_NAME "client"
+		OUTPUT_NAME ${CLDLL_NAME}
 		PREFIX "")
 endif()

--- a/cl_dll/hl/hl_objects.cpp
+++ b/cl_dll/hl/hl_objects.cpp
@ -31,36 +31,6 @@ void HUD_GetLastOrg( float *org );

 void UpdateBeams( void )
 {
-	vec3_t forward, vecSrc, vecEnd, origin, angles, right, up;
-	vec3_t view_ofs;
-	pmtrace_t tr;
-	cl_entity_t *pthisplayer = gEngfuncs.GetLocalPlayer();
-	int idx = pthisplayer->index;
-		
-	// Get our exact viewangles from engine
-	gEngfuncs.GetViewAngles( (float *)angles );
-
-	// Determine our last predicted origin
-	HUD_GetLastOrg( (float *)&origin );
-
-	AngleVectors( angles, forward, right, up );
-
-	VectorCopy( origin, vecSrc );
-
-	VectorMA( vecSrc, 2048, forward, vecEnd );
-
-	gEngfuncs.pEventAPI->EV_SetUpPlayerPrediction( false, true );	
-					
-	// Store off the old count
-	gEngfuncs.pEventAPI->EV_PushPMStates();
-
-	// Now add in all of the players.
-	gEngfuncs.pEventAPI->EV_SetSolidPlayers( idx - 1 );	
-
-	gEngfuncs.pEventAPI->EV_SetTraceHull( 2 );
-	gEngfuncs.pEventAPI->EV_PlayerTrace( vecSrc, vecEnd, PM_STUDIO_BOX, -1, &tr );
-
-	gEngfuncs.pEventAPI->EV_PopPMStates();
 }

 /*
--- a/cl_dll/hl/hl_weapons.cpp
+++ b/cl_dll/hl/hl_weapons.cpp
@ -34,6 +34,7 @@

 extern globalvars_t *gpGlobals;
 extern int g_iUser1;
+extern bool g_hasPredictedFOV;	// Vit_amiN: from HUD

 // Pool of client side entities/entvars_t
 static entvars_t ev[32];
@ -890,6 +891,7 @@ void HUD_WeaponsPostThink( local_state_s *from, local_state_s *to, usercmd_t *cm
 	to->client.fuser2 = player.m_flNextAmmoBurn;
 	to->client.fuser3 = player.m_flAmmoStartCharge;
 	to->client.maxspeed = player.pev->maxspeed;
+	g_hasPredictedFOV	= true;	// Vit_amiN: ready

 	//HL Weapons
 	to->client.vuser1[0] = player.ammo_9mm;
--- a/cl_dll/hud.cpp
+++ b/cl_dll/hud.cpp
@ -514,6 +514,7 @@ int CHud::MsgFunc_HUDColor(const char *pszName,  int iSize, void *pbuf)
 }

 float g_lastFOV = 0.0;
+bool g_hasPredictedFOV = false;	// Vit_amiN: it'll became true after the first prediction

 /*
 ============
@ -615,7 +616,7 @@ int CHud::MsgFunc_SetFOV( const char *pszName,  int iSize, void *pbuf )
 	int def_fov = CVAR_GET_FLOAT( "default_fov" );

 	//Weapon prediction already takes care of changing the fog. ( g_lastFOV ).
-	if( cl_lw && cl_lw->value )
+	if( g_hasPredictedFOV )
 		return 1;

 	g_lastFOV = newfov;
--- a/cl_dll/hud_msg.cpp
+++ b/cl_dll/hud_msg.cpp
@ -31,6 +31,9 @@ float g_fFadeDuration; //negative = fading out

 #define MAX_CLIENTS 32

+extern float g_lastFOV;			// Vit_amiN
+extern bool g_hasPredictedFOV;	// Vit_amiN
+
 /// USER-DEFINED SERVER MESSAGE HANDLERS

 int CHud::MsgFunc_ResetHUD( const char *pszName, int iSize, void *pbuf )
@ -57,6 +60,11 @@ int CHud::MsgFunc_ResetHUD( const char *pszName, int iSize, void *pbuf )
 	g_fStartDist = 0;
 	g_fEndDist = 0;

+	// Vit_amiN: reset the FOV
+	m_iFOV = 0;	// default_fov
+	g_lastFOV = 0.0f;
+	g_hasPredictedFOV = false;
+
 	return 1;
 }

@ -229,10 +237,14 @@ int CHud::MsgFunc_Damage( const char *pszName, int iSize, void *pbuf )

 int CHud::MsgFunc_Concuss( const char *pszName, int iSize, void *pbuf )
 {
+	int r, g, b;
 	BEGIN_READ( pbuf, iSize );
 	m_iConcussionEffect = READ_BYTE();
 	if( m_iConcussionEffect )
-		this->m_StatusIcons.EnableIcon( "dmg_concuss", 255, 160, 0 );
+	{
+		UnpackRGB( r, g, b, RGB_YELLOWISH );	// Vit_amiN: fixed
+		this->m_StatusIcons.EnableIcon( "dmg_concuss", r, g, b );
+	}
 	else
 		this->m_StatusIcons.DisableIcon( "dmg_concuss" );
 	return 1;
--- a/cl_dll/text_message.cpp
+++ b/cl_dll/text_message.cpp
@ -181,20 +181,20 @@ int CHudTextMessage::MsgFunc_TextMsg( const char *pszName, int iSize, void *pbuf
 	switch( msg_dest )
 	{
 	case HUD_PRINTCENTER:
-		snprintf( psz, MSG_BUF_SIZE, szBuf[0], szBuf[1], szBuf[2], szBuf[3], szBuf[4] );
+		_snprintf( psz, MSG_BUF_SIZE, szBuf[0], szBuf[1], szBuf[2], szBuf[3], szBuf[4] );
 		CenterPrint( ConvertCRtoNL( psz ) );
 		break;
 	case HUD_PRINTNOTIFY:
 		psz[0] = 1;  // mark this message to go into the notify buffer
-		snprintf( psz + 1, MSG_BUF_SIZE - 1, szBuf[0], szBuf[1], szBuf[2], szBuf[3], szBuf[4] );
+		_snprintf( psz + 1, MSG_BUF_SIZE - 1, szBuf[0], szBuf[1], szBuf[2], szBuf[3], szBuf[4] );
 		ConsolePrint( ConvertCRtoNL( psz ) );
 		break;
 	case HUD_PRINTTALK:
-		snprintf( psz, MSG_BUF_SIZE, szBuf[0], szBuf[1], szBuf[2], szBuf[3], szBuf[4] );
+		_snprintf( psz, MSG_BUF_SIZE, szBuf[0], szBuf[1], szBuf[2], szBuf[3], szBuf[4] );
 		gHUD.m_SayText.SayTextPrint( ConvertCRtoNL( psz ), MSG_BUF_SIZE );
 		break;
 	case HUD_PRINTCONSOLE:
-		snprintf( psz, MSG_BUF_SIZE, szBuf[0], szBuf[1], szBuf[2], szBuf[3], szBuf[4] );
+		_snprintf( psz, MSG_BUF_SIZE, szBuf[0], szBuf[1], szBuf[2], szBuf[3], szBuf[4] );
 		ConsolePrint( ConvertCRtoNL( psz ) );
 		break;
 	}
--- a/cmake/VSForceXPToolchain.cmake
+++ b/cmake/VSForceXPToolchain.cmake
@ -0,0 +1,29 @@
+if(WIN32)
+	# Windows XP compatible platform toolset. Must be set before project(),
+	# otherwise change of CMAKE_*_TOOLSET will take no effect.
+	# We get VS version from the generator name because neither MSVC* nor other
+	# variables that describe the compiler aren't available before project().
+	if ("${CMAKE_GENERATOR}" MATCHES "Visual Studio ([0-9]+)")
+		if(${CMAKE_MATCH_1} LESS 11)
+			# Nothing. Older VS does support XP by default.
+		elseif(${CMAKE_MATCH_1} EQUAL 11)
+			# Visual Studio 11 2012
+			set(CMAKE_GENERATOR_TOOLSET "v110_xp" CACHE STRING "CMAKE_GENERATOR_TOOLSET" FORCE)
+			set(CMAK_VS_PLATFORM_TOOLSET "v110_xp" CACHE STRING "CMAKE_VS_PLATFORM_TOOLSET" FORCE)
+		elseif (${CMAKE_MATCH_1} EQUAL 12)
+			# Visual Studio 12 2013
+			set(CMAKE_GENERATOR_TOOLSET "v120_xp" CACHE STRING "CMAKE_GENERATOR_TOOLSET" FORCE)
+			set(CMAKE_VS_PLATFORM_TOOLSET "v120_xp" CACHE STRING "CMAKE_VS_PLATFORM_TOOLSET" FORCE)
+		elseif (${CMAKE_MATCH_1} EQUAL 14)
+			# Visual Studio 14 2015
+			set(CMAKE_GENERATOR_TOOLSET "v140_xp" CACHE STRING "CMAKE_GENERATOR_TOOLSET" FORCE)
+			set(CMAKE_VS_PLATFORM_TOOLSET "v140_xp" CACHE STRING "CMAKE_VS_PLATFORM_TOOLSET" FORCE)
+		elseif (${CMAKE_MATCH_1} EQUAL 15)
+			# Visual Studio 15 2017
+			set(CMAKE_GENERATOR_TOOLSET "v141_xp" CACHE STRING "CMAKE_GENERATOR_TOOLSET" FORCE)
+			set(CMAKE_VS_PLATFORM_TOOLSET "v141_xp" CACHE STRING "CMAKE_VS_PLATFORM_TOOLSET" FORCE)
+		else()
+			message(WARNING "WARNING: You maybe building without Windows XP compability. See which toolchain version Visual Studio provides, and say cmake to use it: cmake -G \"Visual Studio XX\" -T \"vXXX_xp\"")
+		endif()
+	endif()
+endif()
--- a/dlls/CMakeLists.txt
+++ b/dlls/CMakeLists.txt
@ -178,8 +178,13 @@ set_target_properties (${SVDLL_LIBRARY} PROPERTIES
 	POSITION_INDEPENDENT_CODE 1)

 if(APPLE OR WIN32 OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+	set(SVDLL_NAME "${SERVER_LIBRARY_NAME}")
+	if(64BIT)
+		set(SVDLL_NAME "${SERVER_LIBRARY_NAME}64")
+	endif()
+
 	set_target_properties(${SVDLL_LIBRARY} PROPERTIES
-		OUTPUT_NAME ${SERVER_LIBRARY_NAME}
+		OUTPUT_NAME ${SVDLL_NAME}
 		PREFIX "")
 endif()

--- a/dlls/cbase.h
+++ b/dlls/cbase.h
@ -396,7 +396,7 @@ public:
 #ifdef _DEBUG
 	void FunctionCheck( void *pFunction, char *name ) 
 	{ 
-		if( pFunction && !NAME_FOR_FUNCTION( (size_t)( pFunction ) ) )
+		if( pFunction && !NAME_FOR_FUNCTION( pFunction ) )
 			ALERT( at_error, "No EXPORT: %s:%s (%08lx)\n", STRING( pev->classname ), name, (size_t)pFunction );
 	}

--- a/dlls/client.cpp
+++ b/dlls/client.cpp
@ -111,7 +111,7 @@ void ClientDisconnect( edict_t *pEntity )

 	char text[256] = "";
 	if( pEntity->v.netname )
-		snprintf( text, sizeof(text), "- %s has left the game\n", STRING( pEntity->v.netname ) );
+		_snprintf( text, sizeof(text), "- %s has left the game\n", STRING( pEntity->v.netname ) );
 	MESSAGE_BEGIN( MSG_ALL, gmsgSayText, NULL );
 		WRITE_BYTE( ENTINDEX( pEntity ) );
 		WRITE_STRING( text );
@ -679,7 +679,7 @@ void ClientUserInfoChanged( edict_t *pEntity, char *infobuffer )
 		if( gpGlobals->maxClients > 1 )
 		{
 			char text[256];
-			snprintf( text, 256, "* %s changed name to %s\n", STRING( pEntity->v.netname ), g_engfuncs.pfnInfoKeyValue( infobuffer, "name" ) );
+			_snprintf( text, 256, "* %s changed name to %s\n", STRING( pEntity->v.netname ), g_engfuncs.pfnInfoKeyValue( infobuffer, "name" ) );
 			MESSAGE_BEGIN( MSG_ALL, gmsgSayText, NULL );
 				WRITE_BYTE( ENTINDEX( pEntity ) );
 				WRITE_STRING( text );
--- a/dlls/monsters.cpp
+++ b/dlls/monsters.cpp
@ -2121,7 +2121,8 @@ void CBaseMonster::StartMonster( void )
 	SetThink( &CBaseMonster::CallMonsterThink );
 	AbsoluteNextThink( m_fNextThink + RANDOM_FLOAT(0.1, 0.4) ); // spread think times.

-	if( !FStringNull( pev->targetname ) )// wait until triggered
+	// Vit_amiN: fixed -- now it doesn't touch any scripted_sequence target
+	if( !FStringNull( pev->targetname ) && !m_pCine )// wait until triggered
 	{
 		SetState( MONSTERSTATE_IDLE );
 		// UNDONE: Some scripted sequence monsters don't have an idle?
--- a/dlls/player.cpp
+++ b/dlls/player.cpp
@ -2020,6 +2020,7 @@ void CBasePlayer::PreThink( void )
 	{
 		CBaseEntity *pTrain = CBaseEntity::Instance( pev->groundentity );
 		float vel;
+		int iGearId;	// Vit_amiN: keeps the train control HUD in sync

 		if( !pTrain )
 		{
@ -2060,10 +2061,12 @@ void CBasePlayer::PreThink( void )
 			pTrain->Use( this, this, USE_SET, (float)vel );
 		}

-		if( vel )
+		iGearId = TrainSpeed( pTrain->pev->speed, pTrain->pev->impulse );
+
+		if( iGearId != ( m_iTrain & 0x0F ) )	// Vit_amiN: speed changed
 		{
-			m_iTrain = TrainSpeed( (int)pTrain->pev->speed, pTrain->pev->impulse );
-			m_iTrain |= TRAIN_ACTIVE|TRAIN_NEW;
+			m_iTrain = iGearId;
+			m_iTrain |= TRAIN_ACTIVE | TRAIN_NEW;
 		}
 	}
 	else if( m_iTrain & TRAIN_ACTIVE )
@ -3103,6 +3106,7 @@ void CBasePlayer::Precache( void )
 	if (CVAR_GET_FLOAT("v_dark"))
 		g_fEnvFadeTime = gpGlobals->time + 10;
 #endif
+	pev->fov = m_iFOV;	// Vit_amiN: restore the FOV on level change or map/saved game load
 }

 int CBasePlayer::Save( CSave &save )
@ -3534,6 +3538,8 @@ void CBasePlayer::ForceClientDllUpdate( void )
 {
 	m_iClientHealth = -1;
 	m_iClientBattery = -1;
+	m_iClientHideHUD = -1;	// Vit_amiN: forcing to update
+	m_iClientFOV = -1;	// Vit_amiN: force client weapons to be sent
 	m_iTrain |= TRAIN_NEW;  // Force new train message.
 	m_fWeapon = FALSE;          // Force weapon send
 	m_fKnownItem = FALSE;    // Force weaponinit messages.
@ -4116,6 +4122,11 @@ void CBasePlayer::UpdateClientData( void )
 			WRITE_BYTE( m_iFlashBattery );
 		MESSAGE_END();

+		// Vit_amiN: the geiger state could run out of sync, too
+		MESSAGE_BEGIN( MSG_ONE, gmsgGeigerRange, NULL, pev );
+			WRITE_BYTE( 0 );
+		MESSAGE_END();
+
 		InitStatusBar();
 	}

@ -4171,7 +4182,7 @@ void CBasePlayer::UpdateClientData( void )
 		m_iClientHealth = (int)pev->health;
 	}

-	if( pev->armorvalue != m_iClientBattery )
+	if( (int)pev->armorvalue != m_iClientBattery )
 	{
 		m_iClientBattery = (int)pev->armorvalue;