fix github windows build + warnings

wootguy · Sep 7, 2024 · 5bab194 · 5bab194
1 parent b78cc3c
commit 5bab194
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   build-windows:
-    runs-on: windows-2019
+    runs-on: windows-2022
 
     steps: 
     - name: Checkout repository
@@ -15,7 +15,7 @@ jobs:
     - name: Build release 
       run: |
         mkdir build && cd build
-        cmake .. -DBUILD_SERVER_ONLY=ON
+        cmake ..  -A win32 -DBUILD_SERVER_ONLY=ON
         cmake --build . --config Release
 
     - name: Upload artifact

diff --git a/dlls/gamerules.cpp b/dlls/gamerules.cpp
@@ -336,13 +336,12 @@ CGameRules *InstallGameRules( void )
 {
 	execCfgs();
 
-	if (1 == 1) {
-		g_teamplay = 0;
-		return new CHalfLifeMultiplay;
-	}
+	g_teamplay = 0;
+	return new CHalfLifeMultiplay;
 
 	// keeping other rules for reference only
 
+	/*
 	if ( !gpGlobals->deathmatch )
 	{
 		// generic half-life
@@ -371,5 +370,6 @@ CGameRules *InstallGameRules( void )
 			return new CHalfLifeMultiplay;
 		}
 	}
+	*/
 }
 
diff --git a/dlls/monster/CTalkSquadMonster.cpp b/dlls/monster/CTalkSquadMonster.cpp
@@ -1706,7 +1706,8 @@ BOOL CTalkSquadMonster::NoFriendlyFire(void)
 		return TRUE;
 	}
 
-
+	// legacy logic
+	/*
 	CPlane	backPlane;
 	CPlane  leftPlane;
 	CPlane	rightPlane;
@@ -1727,13 +1728,16 @@ BOOL CTalkSquadMonster::NoFriendlyFire(void)
 	leftPlane.InitializePlane(gpGlobals->v_right, vecLeftSide);
 	rightPlane.InitializePlane(v_left, vecRightSide);
 	backPlane.InitializePlane(gpGlobals->v_forward, pev->origin);
+	*/
 
 	/*
 		ALERT ( at_console, "LeftPlane: %f %f %f : %f\n", leftPlane.m_vecNormal.x, leftPlane.m_vecNormal.y, leftPlane.m_vecNormal.z, leftPlane.m_flDist );
 		ALERT ( at_console, "RightPlane: %f %f %f : %f\n", rightPlane.m_vecNormal.x, rightPlane.m_vecNormal.y, rightPlane.m_vecNormal.z, rightPlane.m_flDist );
 		ALERT ( at_console, "BackPlane: %f %f %f : %f\n", backPlane.m_vecNormal.x, backPlane.m_vecNormal.y, backPlane.m_vecNormal.z, backPlane.m_flDist );
 	*/
 
+	/*
+
 	CTalkSquadMonster* pSquadLeader = MySquadLeader();
 	for (int i = 0; i < MAX_SQUAD_MEMBERS; i++)
 	{
@@ -1752,6 +1756,7 @@ BOOL CTalkSquadMonster::NoFriendlyFire(void)
 	}
 
 	return TRUE;
+	*/
 }
 
 //=========================================================

diff --git a/dlls/vector.h b/dlls/vector.h
@@ -62,7 +62,7 @@ class EXPORT Vector						// same data-layout as engine's vec3_t,
 {								//		which is a vec_t[3]
 public:
 	// Construction/destruction
-	inline Vector(void) { x = 0; y = 0; z = 0; }
+	inline Vector(void) : x(0), y(0), z(0) {}
 	inline Vector(float X, float Y, float Z)		{ x = X; y = Y; z = Z;						}
 	inline Vector(const Vector& v)					{ x = v.x; y = v.y; z = v.z;				} 
 	inline Vector(const float rgfl[3])					{ x = rgfl[0]; y = rgfl[1]; z = rgfl[2];	}