diff --git a/Client/mods/deathmatch/logic/CClientPickupManager.cpp b/Client/mods/deathmatch/logic/CClientPickupManager.cpp index 0e96acbe5a..9e3d3445fb 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 @@ -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() diff --git a/Client/mods/deathmatch/logic/CWeaponNames.cpp b/Client/mods/deathmatch/logic/CWeaponNames.cpp index 0905f3901f..6a44f588dc 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/CPickupManager.cpp b/Server/mods/deathmatch/logic/CPickupManager.cpp index 827cf40f76..3641a530c0 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 @@ -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) diff --git a/Server/mods/deathmatch/logic/CWeaponNames.cpp b/Server/mods/deathmatch/logic/CWeaponNames.cpp index f1c8164237..6668071e16 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"},