Merge branch 'dev' into dev_openAL

Author: sabianroberts

.GENERATE WINDOWS BUILD FILES.BAT .init build files for windows.bat.GENERATE WINDOWS BUILD FILES.BAT renamed to .init build files for windows.bat

@@ -0,0 +1,6 @@
+@echo off
+cls
+title Generating Build Files
+cmake -A Win32 -B build -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+echo Look above in case anything went wrong. Otherwise,
+pause

.refresh win32.bat

@@ -14,6 +14,8 @@
 
 using namespace std::literals::string_literals;
 
+static char s_largeImageKey[64];
+
 namespace discord_integration
 {
 	namespace
@@ -36,15 +38,10 @@ namespace discord_integration
 		// BlueNightHawk : Convert Uppercase Map Names to Lowercase. 2021.
 		void LowerCase(const char* in, char* out, int size) 
 		{
-			for (int i = 0; i < size; i++)
-			{
-				if (!out[i] || out[i] == '\0')
-				{
-					out[i] = in[i];
-					continue;
-				}
-				out[i] = (char)tolower(in[i]);
-			}
+			int i = 0;
+			for (; i < size - 1 && in[i] != '\0'; i++)
+				out[i] = (char)tolower((unsigned char)in[i]);
+			out[i] = '\0';
 		}
 
 
@@ -323,16 +320,16 @@ namespace discord_integration
 
 					// Get the map name and icon.
 					get_map_name(map_name, ARRAYSIZE(map_name));
-					if (map_name[0])
+					if (cur_state != game_state::NOT_PLAYING && map_name[0])
 					{
-						char newmapname[64];
+						// lowercased version into static buffer
+						for (int i = 0; i < (int)sizeof(s_largeImageKey) - 1 && map_name[i]; ++i)
+							s_largeImageKey[i] = (char)tolower((unsigned char)map_name[i]);
+						s_largeImageKey[strlen(map_name)] = '\0';
 
-						LowerCase((const char*)map_name, newmapname, ARRAYSIZE(map_name));
+						// verify the map is in the set
 						if (maps_with_thumbnails.find(map_name) != maps_with_thumbnails.cend())
-							presence.largeImageKey = newmapname;
-
-						if (custom_maps_with_thumbnails.find(map_name) != custom_maps_with_thumbnails.cend())
-							presence.largeImageKey = newmapname;
+							presence.largeImageKey = s_largeImageKey;
 
 						presence.largeImageText = map_name;
 					}
@@ -355,6 +352,9 @@ namespace discord_integration
 
 				presence.state = state.c_str();
 
+				gEngfuncs.Con_Printf("[DiscordRPC] largeImageKey = '%s'\n", presence.largeImageKey);
+				gEngfuncs.Con_Printf("[DiscordRPC] map_name = '%s'\n", map_name);
+
 				Discord_UpdatePresence(&presence);
 			}
 

cl_dll/discord_integration.cpp

@@ -308,11 +308,18 @@ float EV_HLDM_PlayTextureSound( int idx, pmtrace_t *ptr, float *vecSrc, float *v
 		if (iBulletType == BULLET_PLAYER_CROWBAR)
 			return 0.0; // crowbar already makes this sound
 		fvol = 1.0;	fvolbar = 0.2;
-		//rgsz[0] = "weapons/bullet_hit1.wav";
-		//rgsz[1] = "weapons/bullet_hit2.wav";
+#ifndef _HALO
+		rgsz[0] = "player/hitsound01.wav";
+		rgsz[1] = "player/hitsound02.wav";
+		rgsz[2] = "player/hitsound03.wav";
+		rgsz[3] = "player/hitsound04.wav";
+		fattn = 1.0;
+		cnt = 4;
+#else
 		rgsz[0] = "player/hitsound.wav";
 		fattn = 1.0;
 		cnt = 1;
+#endif
 		break;
 	}
 

cl_dll/ev_hldm.cpp

@@ -261,14 +261,6 @@ CMapListPanel::CMapListPanel(Panel* pParent) : Panel(pParent, "MapListPanel")
 	m_pList->SetMultiselectEnabled(false);
 	m_pList->SetSelectIndividualCells(true); // not sure about keeping this
 	m_pList->AddActionSignalTarget(this);
-
-	m_pThumbnail = new ImagePanel(this, "MapThumbnail");
-	m_pThumbnail->SetBounds(0, 410, 250, 150);
-	m_pThumbnail->SetImage("ui/gfx/vgui/nomap.tga"); // fallback
-	m_pThumbnail->SetShouldScaleImage(true);
-	m_pThumbnail->SetShouldCenterImage(true);
-	m_pThumbnail->SetScaleAmount(1.0f);
-	m_pThumbnail->SetPos(4, 4);
 }
 
 void CMapListPanel::SetMapThumbnail(const char* mapName)
@@ -488,31 +480,6 @@ CComposerOptionsPanel::CComposerOptionsPanel(Panel* pParent) : Panel(pParent, "C
 	m_pMaxplayers->SetText("12");
 	y += 30;
 
-	// CHECK BUTTONS
-	m_pLAN = new CheckButton(this, "LAN", "Local server");
-	m_pLAN->SetBounds(5, y, 200, 20); y += 25;
-
-	m_pRealisticFall = new CheckButton(this, "Fall", "Realistic fall damage");
-	m_pRealisticFall->SetBounds(5, y, 200, 20); y += 25;
-
-	m_pAutoGamemode = new CheckButton(this, "AutoGM", "Auto gamemode switch for CTF maps");
-	m_pAutoGamemode->SetBounds(5, y, 250, 20); y += 25;
-
-	m_pFlashlight = new CheckButton(this, "Flash", "Enable Flashlight");
-	m_pFlashlight->SetBounds(5, y, 250, 20); y += 25;
-
-	m_pFriendlyFire = new CheckButton(this, "FF", "Friendly Fire");
-	m_pFriendlyFire->SetBounds(5, y, 200, 20); y += 25;
-
-	m_pWeaponsStay = new CheckButton(this, "WS", "Weapons Stay");
-	m_pWeaponsStay->SetBounds(5, y, 200, 20); y += 25;
-
-	m_pForceRespawn = new CheckButton(this, "FR", "Force Respawn");
-	m_pForceRespawn->SetBounds(5, y, 200, 20); y += 25;
-
-	m_pAllowCheats = new CheckButton(this, "Cheats", "Allow Cheats");
-	m_pAllowCheats->SetBounds(5, y, 200, 20); y += 25;
-
 	// SPAWN SYSTEM
 	m_lSpawnSystem = new Label(this, "SpawnLabel", "Spawn System");
 	m_lSpawnSystem->R_BOUNDARY;
@@ -563,6 +530,32 @@ CComposerOptionsPanel::CComposerOptionsPanel(Panel* pParent) : Panel(pParent, "C
 	m_pTimeLimit = new TextEntry(this, "TimeLimit");
 	m_pTimeLimit->SetBounds(10, y, 200, 20);
 	m_pTimeLimit->SetText("15"); y += 30;
+
+	// CHECK BUTTONS
+	m_pLAN = new CheckButton(this, "LAN", "Local server");
+	m_pLAN->SetBounds(5, y, 200, 20); y += 25;
+
+	m_pRealisticFall = new CheckButton(this, "Fall", "Realistic fall damage");
+	m_pRealisticFall->SetBounds(5, y, 200, 20); y += 25;
+
+	m_pAutoGamemode = new CheckButton(this, "AutoGM", "Auto gamemode switch for CTF maps");
+	m_pAutoGamemode->SetBounds(5, y, 250, 20); y += 25;
+
+	m_pFlashlight = new CheckButton(this, "Flash", "Enable Flashlight");
+	m_pFlashlight->SetBounds(5, y, 250, 20); y += 25;
+
+	m_pFriendlyFire = new CheckButton(this, "FF", "Friendly Fire");
+	m_pFriendlyFire->SetBounds(5, y, 200, 20); y += 25;
+
+	m_pWeaponsStay = new CheckButton(this, "WS", "Weapons Stay");
+	m_pWeaponsStay->SetBounds(5, y, 200, 20); y += 25;
+
+	m_pForceRespawn = new CheckButton(this, "FR", "Force Respawn");
+	m_pForceRespawn->SetBounds(5, y, 200, 20); y += 25;
+
+	m_pAllowCheats = new CheckButton(this, "Cheats", "Allow Cheats");
+	m_pAllowCheats->SetBounds(5, y, 200, 20); y += 25;
+
 }
 
 void CComposerOptionsPanel::LoadMapcycles()