Skip to content

Fix Purple Dildo and Silver Vibrator weapon names #3801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jul 31, 2025
Merged

Fix Purple Dildo and Silver Vibrator weapon names #3801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
62158f9
fix purple dildo and silver vibrator names
Fernando-A-Rocha Oct 15, 2024
4c954ad
Merge branch 'multitheftauto:master' into fix-dildo-vibrator-names
Fernando-A-Rocha Mar 7, 2025
8072af9
Merge branch 'master' into fix-dildo-vibrator-names
tederis May 31, 2025
c35c779
Fix isValidWeaponID: don't ignore ID 13 - CPickupManager.cpp
Fernando-A-Rocha Jun 4, 2025
82e85c0
Fix isValidWeaponID: don't ignore ID 13 - CClientPickupManager.cpp
Fernando-A-Rocha Jun 4, 2025
d7d3ff9
Merge branch 'master' into fix-dildo-vibrator-names
Fernando-A-Rocha Jun 4, 2025
1f55471
Add missing weapon object 324 for weap id 13 - CClientPickupManager.cpp
Fernando-A-Rocha Jun 4, 2025
93471cd
Add missing weapon object 324 for weap id 13 - CPickupManager.cpp
Fernando-A-Rocha Jun 4, 2025
accee96
Merge branch 'master' into fix-dildo-vibrator-names
Fernando-A-Rocha Jul 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Client/mods/deathmatch/logic/CClientPickupManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ using std::list;

static const SFixedArray<unsigned short, 47> 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
Expand Down Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions Client/mods/deathmatch/logic/CWeaponNames.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ static const SWeaponName _WeaponNames[] = {{"Fist"},
{"Poolstick"},
{"Katana"},
{"Chainsaw"},
{"Purple Dildo"},
{"Dildo"},
{"Dildo"},
{"Vibrator"},
{"Vibrator"},
{"Silver Vibrator"},
{"Flower"},
{"Cane"},
{"Grenade"},
Expand Down
4 changes: 2 additions & 2 deletions Server/mods/deathmatch/logic/CPickupManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

static SFixedArray<unsigned short, 47> 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
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions Server/mods/deathmatch/logic/CWeaponNames.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ SWeaponName WeaponNames[] = {{"Fist"},
{"Poolstick"},
{"Katana"},
{"Chainsaw"},
{"Purple Dildo"},
{"Dildo"},
{"Dildo"},
{"Vibrator"},
{"Vibrator"},
{"Silver Vibrator"},
{"Flower"},
{"Cane"},
{"Grenade"},
Expand Down
Loading