Skip to content

Commit 48fed36

Browse files
committed
Map buggy weapons to EqUnknown
1 parent 2b848de commit 48fed36

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

common/common.go

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,17 @@ func initEqNameToWeapon() {
7777
eqNameToWeapon["vest"] = EqKevlar
7878
eqNameToWeapon["vesthelm"] = EqHelmet
7979
eqNameToWeapon["defuser"] = EqDefuseKit
80+
81+
// These don't exist and / or used to crash the game with the give command
82+
eqNameToWeapon["scar17"] = EqUnknown
83+
eqNameToWeapon["sensorgrenade"] = EqUnknown
84+
eqNameToWeapon["mp5navy"] = EqUnknown
85+
eqNameToWeapon["p228"] = EqUnknown
86+
eqNameToWeapon["scout"] = EqUnknown
87+
eqNameToWeapon["sg550"] = EqUnknown
88+
eqNameToWeapon["sg552"] = EqUnknown // This one still crashes the game :)
89+
eqNameToWeapon["tmp"] = EqUnknown
90+
eqNameToWeapon["worldspawn"] = EqUnknown
8091
}
8192

8293
func initEqEementToName() {
@@ -138,8 +149,10 @@ func MapEquipment(eqName string) EquipmentElement {
138149
wep = EqKnife
139150
} else {
140151
// If the eqName isn't known it will be EqUnknown as that is the default value for EquipmentElement
141-
wep = eqNameToWeapon[eqName]
142-
// TODO: Return error / warning for EqUnknown?
152+
var ok bool
153+
if wep, ok = eqNameToWeapon[eqName]; !ok {
154+
// TODO: Return error / warning for unmapped weapons
155+
}
143156
}
144157

145158
return wep

0 commit comments

Comments
 (0)