From 62158f9280235b9803304cf5b8234c40567c3fbf Mon Sep 17 00:00:00 2001 From: Fernando-A-Rocha Date: Wed, 16 Oct 2024 00:24:43 +0100 Subject: [PATCH 1/5] fix purple dildo and silver vibrator names --- Client/mods/deathmatch/logic/CWeaponNames.cpp | 4 ++-- Server/mods/deathmatch/logic/CWeaponNames.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Client/mods/deathmatch/logic/CWeaponNames.cpp b/Client/mods/deathmatch/logic/CWeaponNames.cpp index 0905f3901ff..6a44f588dc4 100644 --- a/Client/mods/deathmatch/logic/CWeaponNames.cpp +++ b/Client/mods/deathmatch/logic/CWeaponNames.cpp @@ -33,10 +33,10 @@ static const SWeaponName _WeaponNames[] = {{"Fist"}, {"Poolstick"}, {"Katana"}, {"Chainsaw"}, + {"Purple Dildo"}, {"Dildo"}, - {"Dildo"}, - {"Vibrator"}, {"Vibrator"}, + {"Silver Vibrator"}, {"Flower"}, {"Cane"}, {"Grenade"}, diff --git a/Server/mods/deathmatch/logic/CWeaponNames.cpp b/Server/mods/deathmatch/logic/CWeaponNames.cpp index 7bf50a56318..0299736e1e3 100644 --- a/Server/mods/deathmatch/logic/CWeaponNames.cpp +++ b/Server/mods/deathmatch/logic/CWeaponNames.cpp @@ -34,10 +34,10 @@ SWeaponName WeaponNames[] = {{"Fist"}, {"Poolstick"}, {"Katana"}, {"Chainsaw"}, + {"Purple Dildo"}, {"Dildo"}, - {"Dildo"}, - {"Vibrator"}, {"Vibrator"}, + {"Silver Vibrator"}, {"Flower"}, {"Cane"}, {"Grenade"}, From c35c77999464aaf116c86d895dfe460a6f7fcc5c Mon Sep 17 00:00:00 2001 From: Fernando Rocha <34967844+Fernando-A-Rocha@users.noreply.github.com> Date: Wed, 4 Jun 2025 12:52:01 +0100 Subject: [PATCH 2/5] Fix isValidWeaponID: don't ignore ID 13 - CPickupManager.cpp --- Server/mods/deathmatch/logic/CPickupManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/mods/deathmatch/logic/CPickupManager.cpp b/Server/mods/deathmatch/logic/CPickupManager.cpp index 827cf40f767..445827f6bcf 100644 --- a/Server/mods/deathmatch/logic/CPickupManager.cpp +++ b/Server/mods/deathmatch/logic/CPickupManager.cpp @@ -65,7 +65,7 @@ bool CPickupManager::Exists(CPickup* pPickup) bool CPickupManager::IsValidWeaponID(unsigned int uiWeaponID) { - return (uiWeaponID > 0 && uiWeaponID != 13 && uiWeaponID != 19 && uiWeaponID != 20 && uiWeaponID != 21 && uiWeaponID <= 46); + return (uiWeaponID > 0 && uiWeaponID != 19 && uiWeaponID != 20 && uiWeaponID != 21 && uiWeaponID <= 46); } unsigned short CPickupManager::GetWeaponModel(unsigned int uiWeaponID) From 82e85c024a00dfb9d1089a239922f3cbdfb65355 Mon Sep 17 00:00:00 2001 From: Fernando Rocha <34967844+Fernando-A-Rocha@users.noreply.github.com> Date: Wed, 4 Jun 2025 12:52:44 +0100 Subject: [PATCH 3/5] Fix isValidWeaponID: don't ignore ID 13 - CClientPickupManager.cpp --- Client/mods/deathmatch/logic/CClientPickupManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Client/mods/deathmatch/logic/CClientPickupManager.cpp b/Client/mods/deathmatch/logic/CClientPickupManager.cpp index 0e96acbe5ae..4579a416e11 100644 --- a/Client/mods/deathmatch/logic/CClientPickupManager.cpp +++ b/Client/mods/deathmatch/logic/CClientPickupManager.cpp @@ -92,7 +92,7 @@ bool CClientPickupManager::IsValidPickupID(unsigned short usPickupID) bool CClientPickupManager::IsValidWeaponID(unsigned short usWeaponID) { - return (usWeaponID > 0 && usWeaponID != 13 && usWeaponID != 19 && usWeaponID != 20 && usWeaponID != 21 && usWeaponID <= 46); + return (usWeaponID > 0 && usWeaponID != 19 && usWeaponID != 20 && usWeaponID != 21 && usWeaponID <= 46); } bool CClientPickupManager::IsPickupLimitReached() From 1f554719d040af6f639aa52a3439476cc4c46ea1 Mon Sep 17 00:00:00 2001 From: Fernando Rocha <34967844+Fernando-A-Rocha@users.noreply.github.com> Date: Wed, 4 Jun 2025 14:52:24 +0100 Subject: [PATCH 4/5] Add missing weapon object 324 for weap id 13 - CClientPickupManager.cpp --- Client/mods/deathmatch/logic/CClientPickupManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Client/mods/deathmatch/logic/CClientPickupManager.cpp b/Client/mods/deathmatch/logic/CClientPickupManager.cpp index 4579a416e11..9e3d3445fb3 100644 --- a/Client/mods/deathmatch/logic/CClientPickupManager.cpp +++ b/Client/mods/deathmatch/logic/CClientPickupManager.cpp @@ -15,7 +15,7 @@ using std::list; static const SFixedArray g_usWeaponModels = {{ 0, 331, 333, 334, 335, 336, 337, 338, 339, 341, // 9 - 321, 322, 323, 0, 325, 326, 342, 343, 344, 0, // 19 + 321, 322, 323, 324, 325, 326, 342, 343, 344, 0, // 19 0, 0, 346, 347, 348, 349, 350, 351, 352, 353, // 29 355, 356, 372, 357, 358, 359, 360, 361, 362, 363, // 39 364, 365, 366, 367, 368, 369, 371 // 46 From 93471cd819e5c530bc331dbcacc836b438186f32 Mon Sep 17 00:00:00 2001 From: Fernando Rocha <34967844+Fernando-A-Rocha@users.noreply.github.com> Date: Wed, 4 Jun 2025 14:53:08 +0100 Subject: [PATCH 5/5] Add missing weapon object 324 for weap id 13 - CPickupManager.cpp --- Server/mods/deathmatch/logic/CPickupManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/mods/deathmatch/logic/CPickupManager.cpp b/Server/mods/deathmatch/logic/CPickupManager.cpp index 445827f6bcf..3641a530c04 100644 --- a/Server/mods/deathmatch/logic/CPickupManager.cpp +++ b/Server/mods/deathmatch/logic/CPickupManager.cpp @@ -15,7 +15,7 @@ static SFixedArray g_usWeaponModels = {{ 0, 331, 333, 334, 335, 336, 337, 338, 339, 341, // 9 - 321, 322, 323, 0, 325, 326, 342, 343, 344, 0, // 19 + 321, 322, 323, 324, 325, 326, 342, 343, 344, 0, // 19 0, 0, 346, 347, 348, 349, 350, 351, 352, 353, // 29 355, 356, 372, 357, 358, 359, 360, 361, 362, 363, // 39 364, 365, 366, 367, 368, 369, 371 // 46