use ubuntu-20.04 for builds to improve compatibility

sjrc6 · Jan 29, 2025 · ab54f3f · ab54f3f
1 parent 68546d4
commit ab54f3f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/fast-build.yml b/.github/workflows/fast-build.yml
@@ -13,9 +13,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macOS-latest, windows-latest]
+        os: [ubuntu-20.04, macOS-latest, windows-latest]
         include:
-        - os: ubuntu-latest
+        - os: ubuntu-20.04
           cmake-args: -G Ninja -DCMAKE_BUILD_TYPE=Release -DDISCORD=ON -DDISCORD_DYNAMIC=ON -DWEBSOCKETS=OFF -DPREFER_BUNDLED_LIBS=ON
           cmake-init-env: CXXFLAGS= 
           package-file: "*-linux_x86_64.tar.xz"

diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
@@ -1796,10 +1796,10 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 			sha256_update(&Sha256Ctxt, pUuid, sizeof(*pUuid));
 			SHA256_DIGEST Sha256 = sha256_finish(&Sha256Ctxt);
 
-			CMsgPacker Msg(NETMSG_TATER_CHECKSUM_RESPONSE, true);
-			Msg.AddRaw(pUuid, sizeof(*pUuid));
-			Msg.AddRaw(&Sha256, sizeof(Sha256));
-			SendMsg(Conn, &Msg, MSGFLAG_VITAL);
+			CMsgPacker CSMsg(NETMSG_TATER_CHECKSUM_RESPONSE, true);
+			CSMsg.AddRaw(pUuid, sizeof(*pUuid));
+			CSMsg.AddRaw(&Sha256, sizeof(Sha256));
+			SendMsg(Conn, &CSMsg, MSGFLAG_VITAL);
 		}
 		else if(Msg == NETMSG_RECONNECT)
 		{

diff --git a/src/game/client/components/tclient/tater.cpp b/src/game/client/components/tclient/tater.cpp
@@ -198,10 +198,10 @@ void CTater::OnMessage(int MsgType, void *pRawMsg)
 			bool SpecVote = str_startswith(aDescription, "Pause ") != 0 ? true : false;
 			bool SettingVote = !KickVote && !SpecVote;
 			bool RandomMapVote = SettingVote && str_find_nocase(aDescription, "random");
-			bool MapCoolDown = SettingVote && str_find_nocase(aDescription, "change map") || str_find_nocase(aDescription, "no not change map");
-			bool CategoryVote = SettingVote && str_find_nocase(aDescription, "☐") || str_find_nocase(aDescription, "☒");
+			bool MapCoolDown = SettingVote && (str_find_nocase(aDescription, "change map") || str_find_nocase(aDescription, "no not change map"));
+			bool CategoryVote = SettingVote && (str_find_nocase(aDescription, "☐") || str_find_nocase(aDescription, "☒"));
 			bool FunVote = SettingVote && str_find_nocase(aDescription, "funvote");
-			bool MapVote = SettingVote && !RandomMapVote && !MapCoolDown && !CategoryVote && !FunVote && str_find_nocase(aDescription, "Map:") || str_find_nocase(aDescription, "★") || str_find_nocase(aDescription, "✰");
+			bool MapVote = SettingVote && !RandomMapVote && !MapCoolDown && !CategoryVote && !FunVote && (str_find_nocase(aDescription, "Map:") || str_find_nocase(aDescription, "★") || str_find_nocase(aDescription, "✰"));
 
 			if(g_Config.m_ClAutoVoteWhenFar && (MapVote || RandomMapVote))
 			{