Mapbase v7.3

.github/workflows/mapbase_build-base.yml

@@ -54,7 +54,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Add MSBuild to PATH
-      uses: microsoft/setup-[email protected]
+      uses: compnerd/gha-setup-vsdevenv@v6
 
     - name: Enable VS2022
       working-directory: '${{inputs.branch}}/src/vpc_scripts'
@@ -77,107 +77,40 @@ jobs:
 
       # --------------------------------------------------------------------
 
-      # "I'm invoking msbuild for each project individually, which looks a bit odd considering there is a solution file which should be able to invoke the builds in their proper order automatically, but passing the solution to msbuild doesn't seem to work."
-      # https://github.com/mapbase-source/source-sdk-2013/pull/162
-
-    - name: Build mathlib
+    - name: Build
       #if: steps.filter.outputs.game == 'true'
       working-directory: '${{inputs.branch}}/src'
       shell: cmd
       run: |
-        msbuild -m -p:Configuration=${{inputs.configuration}} mathlib\mathlib.vcxproj
-
-    - name: Build Base Libraries
-      if: inputs.project-group == 'all' || inputs.project-group == 'game' || inputs.project-group == 'maptools'
-      working-directory: '${{inputs.branch}}/src'
-      shell: cmd
-      run: |
-        msbuild -m -p:Configuration=${{inputs.configuration}} raytrace\raytrace.vcxproj
-        msbuild -m -p:Configuration=${{inputs.configuration}} tier1\tier1.vcxproj
-        msbuild -m -p:Configuration=${{inputs.configuration}} vgui2\vgui_controls\vgui_controls.vcxproj
-        msbuild -m -p:Configuration=${{inputs.configuration}} vscript\vscript.vcxproj
-
-    - name: Build Map Tools
-      if: inputs.project-group == 'all' || inputs.project-group == 'maptools'
-      working-directory: '${{inputs.branch}}/src'
-      shell: cmd
-      run: |
-        msbuild -m -p:Configuration=${{inputs.configuration}} fgdlib\fgdlib.vcxproj
-        msbuild -m -p:Configuration=${{inputs.configuration}} utils\vbsp\vbsp.vcxproj
-        msbuild -m -p:Configuration=${{inputs.configuration}} utils\vvis\vvis_dll.vcxproj
-        msbuild -m -p:Configuration=${{inputs.configuration}} utils\vvis_launcher\vvis_launcher.vcxproj
-        msbuild -m -p:Configuration=${{inputs.configuration}} utils\vrad\vrad_dll.vcxproj
-        msbuild -m -p:Configuration=${{inputs.configuration}} utils\vrad_launcher\vrad_launcher.vcxproj
-
-    - name: Build Shaders
-      if: inputs.project-group == 'shaders'
-      working-directory: '${{inputs.branch}}/src'
-      shell: cmd
-      run: |
-        msbuild -m -p:Configuration=${{inputs.configuration}} materialsystem\stdshaders\game_shader_dx9_${{inputs.game}}.vcxproj
-
-    - name: Build Game
-      if: inputs.project-group == 'game'
-      working-directory: '${{inputs.branch}}/src'
-      shell: cmd
-      run: |
-        msbuild -m -p:Configuration=${{inputs.configuration}} responserules\runtime\responserules.vcxproj
-        msbuild -m -p:Configuration=${{inputs.configuration}} game\client\client_${{inputs.game}}.vcxproj
-        msbuild -m -p:Configuration=${{inputs.configuration}} game\server\server_${{inputs.game}}.vcxproj
-
-    # TODO: Hook to game naming?
-    - name: Build everything
-      if: inputs.project-group == 'all'
-      working-directory: '${{inputs.branch}}/src'
-      shell: cmd
-      run: |
-        msbuild -m -p:Configuration=${{inputs.configuration}} responserules\runtime\responserules.vcxproj
-        msbuild -m -p:Configuration=${{inputs.configuration}} materialsystem\stdshaders\game_shader_dx9_episodic.vcxproj
-        msbuild -m -p:Configuration=${{inputs.configuration}} materialsystem\stdshaders\game_shader_dx9_hl2.vcxproj
-        msbuild -m -p:Configuration=${{inputs.configuration}} game\client\client_episodic.vcxproj
-        msbuild -m -p:Configuration=${{inputs.configuration}} game\client\client_hl2.vcxproj
-        msbuild -m -p:Configuration=${{inputs.configuration}} game\server\server_episodic.vcxproj
-        msbuild -m -p:Configuration=${{inputs.configuration}} game\server\server_hl2.vcxproj
+        devenv ${{inputs.solution-name}}.sln /upgrade
+        msbuild -m -t:Rebuild -p:Configuration=${{inputs.configuration}};Platform=x86 ${{inputs.solution-name}}.sln
 
       # --------------------------------------------------------------------
 
-    - name: Publish Windows game DLLs
-      if: inputs.project-group == 'game'
-      uses: actions/upload-artifact@v3
-      with:
-        name: 'Windows Game DLLs (server & client.dll) [${{ inputs.configuration }}]'
-        path: |
-          ${{inputs.branch}}/game/mod_${{inputs.game}}/bin/client.dll
-          ${{inputs.branch}}/game/mod_${{inputs.game}}/bin/server.dll
-        if-no-files-found: error
-
-    - name: Publish Windows shader DLL
-      if: inputs.project-group == 'shaders'
-      uses: actions/upload-artifact@v3
+    - name: Publish game binaries
+      if: inputs.project-group == 'game' || inputs.project-group == 'shaders'
+      uses: actions/upload-artifact@v4
       with:
-        name: 'Windows Shader DLL (game_shader_dx9.dll) [${{ inputs.configuration }}]'
+        name: '${{inputs.project-group}}_${{inputs.game}}_win32_${{ inputs.configuration }}'
         path: |
-          ${{inputs.branch}}/game/mod_${{inputs.game}}/bin/game_shader_dx9.dll
+          ${{inputs.branch}}/game/mod_${{inputs.game}}/bin/*.dll
         if-no-files-found: error
 
-    - name: Publish Windows map tools
+    - name: Publish map tools
       if: inputs.project-group == 'maptools'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: 'Windows Map Tools [${{ inputs.configuration }}]'
+        name: '${{inputs.project-group}}_win32_${{ inputs.configuration }}'
         path: |
-          ${{inputs.branch}}/game/bin/vbsp.exe
-          ${{inputs.branch}}/game/bin/vvis.exe
-          ${{inputs.branch}}/game/bin/vvis_dll.dll
-          ${{inputs.branch}}/game/bin/vrad.exe
-          ${{inputs.branch}}/game/bin/vrad_dll.dll
+          ${{inputs.branch}}/game/bin/*.exe
+          ${{inputs.branch}}/game/bin/*.dll
         if-no-files-found: error
 
-    - name: Publish everything (Windows)
+    - name: Publish everything
       if: inputs.project-group == 'all'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: 'Everything (Windows) [${{ inputs.configuration }}]'
+        name: 'everything_win32_${{ inputs.configuration }}'
         path: |
           ${{inputs.branch}}/game/bin
           ${{inputs.branch}}/game/mod_*/bin
@@ -224,30 +157,21 @@ jobs:
 
       # --------------------------------------------------------------------
 
-    - name: Publish Linux game SOs
-      if: inputs.project-group == 'game'
-      uses: actions/upload-artifact@v3
-      with:
-        name: 'Linux Game SOs (server & client.so) [${{ inputs.configuration }}]'
-        path: |
-          ${{inputs.branch}}/game/mod_${{inputs.game}}/bin/client.so
-          ${{inputs.branch}}/game/mod_${{inputs.game}}/bin/server.so
-        if-no-files-found: error
-
-    - name: Publish Linux shader SO
-      if: inputs.project-group == 'shaders'
-      uses: actions/upload-artifact@v3
+    - name: Publish game binaries
+      if: inputs.project-group == 'game' || inputs.project-group == 'shaders'
+      uses: actions/upload-artifact@v4
       with:
-        name: 'Linux Shader SO (game_shader_dx9.so) [${{ inputs.configuration }}]'
+        name: '${{inputs.project-group}}_${{inputs.game}}_linux32_${{ inputs.configuration }}'
         path: |
-          ${{inputs.branch}}/game/mod_${{inputs.game}}/bin/game_shader_dx9.so
+          ${{inputs.branch}}/game/mod_${{inputs.game}}/bin/*.so
+          !${{inputs.branch}}/game/mod_${{inputs.game}}/bin/*_srv.so
         if-no-files-found: error
 
-    #- name: Publish Linux map tools
+    #- name: Publish map tools
     #  if: inputs.project-group == 'maptools'
-    #  uses: actions/upload-artifact@v3
+    #  uses: actions/upload-artifact@v4
     #  with:
-    #    name: 'Linux Map Tools [${{ inputs.configuration }}]'
+    #    name: '${{inputs.project-group}}_linux32_${{ inputs.configuration }}'
     #    path: |
     #      ${{inputs.branch}}/game/bin/vbsp
     #      ${{inputs.branch}}/game/bin/vvis
@@ -258,11 +182,11 @@ jobs:
 
     # For now, don't publish the .dbg files even though we publish .pdb files on Windows
     # (they're too big)
-    - name: Publish everything (Linux)
+    - name: Publish everything
       if: inputs.project-group == 'all'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: 'Everything (Linux) [${{ inputs.configuration }}]'
+        name: 'everything_linux32_${{ inputs.configuration }}'
         path: |
           ${{inputs.branch}}/game/bin/*.so
           !${{inputs.branch}}/game/bin/*_srv.so

README

@@ -1,6 +1,6 @@
 //=========================================================================================================================
 
-               Mapbase v7.2 - Source 2013
+               Mapbase v7.3 - Source 2013
 	https://github.com/mapbase-source/source-sdk-2013
 		https://www.moddb.com/mods/mapbase
 
@@ -117,7 +117,18 @@ Direct contributions:
 - https://github.com/mapbase-source/source-sdk-2013/pull/237 (Commander goal trace fix by Agrimar)
 - https://github.com/mapbase-source/source-sdk-2013/pull/245 (ViewPunch random fix by Mr0maks)
 - https://github.com/mapbase-source/source-sdk-2013/pull/248 (soundlevel_t conversation warning fix by Mechami)
+- https://github.com/mapbase-source/source-sdk-2013/pull/266 ("OnPhysGunPull" output in CPhysicsProp by rlenhub)
+- https://github.com/mapbase-source/source-sdk-2013/pull/292 (env_headcrabcanister random spawn type by arbabf)
+- https://github.com/mapbase-source/source-sdk-2013/pull/294 (SDK_LightmappedGeneric editor blend swap fix by azzyr)
+- https://github.com/mapbase-source/source-sdk-2013/pull/308 (BlurFilterY fix by Wikot235)
+- https://github.com/mapbase-source/source-sdk-2013/pull/312 (Zombie improvements by Wikot235)
+- https://github.com/mapbase-source/source-sdk-2013/pull/315 (env_flare crash fix by Wikot235)
+- https://github.com/mapbase-source/source-sdk-2013/pull/324 (server-only info/func_null by SirYodaJedi)
+- https://github.com/mapbase-source/source-sdk-2013/pull/333 (Cvar to transition levels while in MOVETYPE_NOCLIP by Wikot235)
+- https://github.com/mapbase-source/source-sdk-2013/pull/342 (NaN particle cull radius fix by celisej567)
 - https://github.com/mapbase-source/mapbase-game-src/pull/1 (Advanced video options duplicate field name fix by arbabf; This is asset-based and not reflected in the code)
+- https://github.com/mapbase-source/mapbase-game-src/pull/2 (gameinfo.txt typo fix by CarePackage17; This is asset-based and not reflected in the code)
+- https://github.com/mapbase-source/mapbase-game-src/pull/3 (HudMessage cutoff fix by arbabf; This is asset-based and not reflected in the code)
 - Demo autorecord code provided by Klems
 - cc_emit crash fix provided by 1upD
 - Custom HL2 ammo crate models created by Rykah (Textures created by Blixibon; This is asset-based and, aside from the SLAM crate, not reflected in the code)
@@ -144,8 +155,10 @@ Direct contributions:
 =-- https://github.com/mapbase-source/source-sdk-2013/pull/206 (Fix CScriptNetMsgHelper::WriteEntity())
 =-- https://github.com/mapbase-source/source-sdk-2013/pull/213 (VScript HUD visibility control, optimizations for 3D skybox angles/fake worldportals)
 =-- https://github.com/mapbase-source/source-sdk-2013/pull/229 (VScript VGUI HUD viewport parenting, game_text and vgui_text_display VScript font fallback)
+=-- https://github.com/mapbase-source/source-sdk-2013/pull/260 (CScriptNetPropManager rewrite)
 =-- https://github.com/mapbase-source/source-sdk-2013/pull/261 (Misc VScript additions)
 =-- https://github.com/mapbase-source/source-sdk-2013/pull/279 (weapon_custom_scripted fixes)
+=-- https://github.com/mapbase-source/source-sdk-2013/pull/332 (Fix OOB access)
 
 == Contributions from z33ky:
 =-- https://github.com/mapbase-source/source-sdk-2013/pull/21 (Various GCC/Linux compilation fixes)
@@ -159,6 +172,7 @@ Direct contributions:
 =-- https://github.com/mapbase-source/source-sdk-2013/pull/159 (Additional GCC/Linux compilation fixes)
 =-- https://github.com/mapbase-source/source-sdk-2013/pull/162 (VS2019 exception specification fix)
 =-- https://github.com/mapbase-source/source-sdk-2013/pull/170 (HL2 non-Episodic build fix)
+=-- https://github.com/mapbase-source/source-sdk-2013/pull/322 (Small Mapbase fixes)
 
 == Contributions from Petercov:
 =-- https://github.com/mapbase-source/source-sdk-2013/pull/182 (NPCs load dynamic interactions from all animation MDLs)
@@ -168,6 +182,7 @@ Direct contributions:
 =-- https://github.com/mapbase-source/source-sdk-2013/pull/183 (Enhanced custom weapons support)
 =-- https://github.com/mapbase-source/source-sdk-2013/pull/230 (Caption fixes)
 =-- https://github.com/mapbase-source/source-sdk-2013/pull/231 (Sentence source bug fix)
+=-- https://github.com/mapbase-source/source-sdk-2013/pull/264 (Outputs for vgui_screen)
 
 //-------------------------------------------------------------------------------------------------------------------------
 

mp/src/game/client/particlemgr.cpp

@@ -146,6 +146,8 @@ CParticleEffectBinding::CParticleEffectBinding()
 	m_LastMin = m_Min;
 	m_LastMax = m_Max;
 
+	m_flParticleCullRadius = 0.0f;
+
 	SetParticleCullRadius( 0.0f );
 	m_nActiveParticles = 0;
 

mp/src/game/server/subs.cpp

@@ -22,10 +22,10 @@ void CPointEntity::Spawn( void )
 }
 
 
-class CNullEntity : public CBaseEntity
+class CNullEntity : public CServerOnlyEntity
 {
 public:
-	DECLARE_CLASS( CNullEntity, CBaseEntity );
+	DECLARE_CLASS( CNullEntity, CServerOnlyEntity );
 
 	void Spawn( void );
 };

sp/src/game/client/c_basecombatcharacter.cpp

@@ -34,6 +34,10 @@ C_BaseCombatCharacter::C_BaseCombatCharacter()
 	m_pGlowEffect = NULL;
 	m_bGlowEnabled = false;
 	m_bOldGlowEnabled = false;
+	m_GlowColor.Init( 0.76f, 0.76f, 0.76f );
+	m_OldGlowColor = m_GlowColor;
+	m_GlowAlpha = 1.0f;
+	m_OldGlowAlpha = 1.0f;
 #endif // GLOWS_ENABLE
 }
 
@@ -66,6 +70,8 @@ void C_BaseCombatCharacter::OnPreDataChanged( DataUpdateType_t updateType )
 
 #ifdef GLOWS_ENABLE
 	m_bOldGlowEnabled = m_bGlowEnabled;
+	m_OldGlowColor = m_GlowColor;
+	m_OldGlowAlpha = m_GlowAlpha;
 #endif // GLOWS_ENABLE
 }
 
@@ -77,7 +83,7 @@ void C_BaseCombatCharacter::OnDataChanged( DataUpdateType_t updateType )
 	BaseClass::OnDataChanged( updateType );
 
 #ifdef GLOWS_ENABLE
-	if ( m_bOldGlowEnabled != m_bGlowEnabled )
+	if ( m_bOldGlowEnabled != m_bGlowEnabled || m_OldGlowColor != m_GlowColor || m_OldGlowAlpha != m_GlowAlpha )
 	{
 		UpdateGlowEffect();
 	}
@@ -106,11 +112,13 @@ void C_BaseCombatCharacter::DoMuzzleFlash()
 //-----------------------------------------------------------------------------
 // Purpose: 
 //-----------------------------------------------------------------------------
-void C_BaseCombatCharacter::GetGlowEffectColor( float *r, float *g, float *b )
+void C_BaseCombatCharacter::GetGlowEffectColor( float *r, float *g, float *b, float *a )
 {
-	*r = 0.76f;
-	*g = 0.76f;
-	*b = 0.76f;
+	*r = m_GlowColor.x;
+	*g = m_GlowColor.y;
+	*b = m_GlowColor.z;
+	if (a)
+		*a = m_GlowAlpha;
 }
 
 //-----------------------------------------------------------------------------
@@ -127,10 +135,10 @@ void C_BaseCombatCharacter::UpdateGlowEffect( void )
 	// create a new effect
 	if ( m_bGlowEnabled )
 	{
-		float r, g, b;
-		GetGlowEffectColor( &r, &g, &b );
+		float r, g, b, a;
+		GetGlowEffectColor( &r, &g, &b, &a );
 
-		m_pGlowEffect = new CGlowObject( this, Vector( r, g, b ), 1.0, true );
+		m_pGlowEffect = new CGlowObject( this, Vector( r, g, b ), a, true );
 	}
 }
 
@@ -161,6 +169,8 @@ BEGIN_RECV_TABLE(C_BaseCombatCharacter, DT_BaseCombatCharacter)
 	RecvPropArray3( RECVINFO_ARRAY(m_hMyWeapons), RecvPropEHandle( RECVINFO( m_hMyWeapons[0] ) ) ),
 #ifdef GLOWS_ENABLE
 	RecvPropBool( RECVINFO( m_bGlowEnabled ) ),
+	RecvPropVector( RECVINFO( m_GlowColor ) ),
+	RecvPropFloat( RECVINFO( m_GlowAlpha ) ),
 #endif // GLOWS_ENABLE
 
 #ifdef INVASION_CLIENT_DLL

sp/src/game/client/c_basecombatcharacter.h

@@ -99,7 +99,7 @@ class C_BaseCombatCharacter : public C_BaseFlex
 
 #ifdef GLOWS_ENABLE
 	CGlowObject			*GetGlowObject( void ){ return m_pGlowEffect; }
-	virtual void		GetGlowEffectColor( float *r, float *g, float *b );
+	virtual void		GetGlowEffectColor( float *r, float *g, float *b, float *a = NULL );
 #endif // GLOWS_ENABLE
 
 #ifdef MAPBASE_VSCRIPT
@@ -133,6 +133,10 @@ class C_BaseCombatCharacter : public C_BaseFlex
 	bool				m_bGlowEnabled;
 	bool				m_bOldGlowEnabled;
 	CGlowObject			*m_pGlowEffect;
+	Vector				m_GlowColor;
+	Vector				m_OldGlowColor;
+	float				m_GlowAlpha;
+	int					m_OldGlowAlpha;
 #endif // GLOWS_ENABLE
 
 private:

sp/src/game/client/c_baseentity.cpp

@@ -485,6 +485,8 @@ BEGIN_ENT_SCRIPTDESC_ROOT( C_BaseEntity, "Root class of all client-side entities
 	DEFINE_SCRIPTFUNC_NAMED( ScriptEntityToWorldTransform, "EntityToWorldTransform", "Get the entity's transform" )
 
 	DEFINE_SCRIPTFUNC_NAMED( ScriptGetPhysicsObject, "GetPhysicsObject", "Get the entity's physics object if it has one" )
+	DEFINE_SCRIPTFUNC_NAMED( ScriptPhysicsInitNormal, "PhysicsInitNormal", "Initializes the entity's physics object with the specified solid type, solid flags, and whether to start asleep" )
+	DEFINE_SCRIPTFUNC_NAMED( ScriptPhysicsDestroyObject, "PhysicsDestroyObject", "Destroys the entity's physics object" )
 
 	DEFINE_SCRIPTFUNC( GetWaterLevel, "Get current level of water submergence" )
 

sp/src/game/client/c_baseentity.h

@@ -1206,6 +1206,8 @@ class C_BaseEntity : public IClientEntity
 	HSCRIPT ScriptEntityToWorldTransform( void );
 
 	HSCRIPT ScriptGetPhysicsObject( void );
+	void ScriptPhysicsInitNormal( int nSolidType, int nSolidFlags, bool createAsleep );
+	void ScriptPhysicsDestroyObject() { VPhysicsDestroyObject(); }
 
 	void ScriptSetParent( HSCRIPT hParent, const char *szAttachment );
 	HSCRIPT ScriptGetMoveParent( void );