Fix Player.Weapons (#31)

Author: markus-wa

common/structs.go

@@ -51,7 +51,6 @@ type Player struct {
 	RoundStartEquipmentValue    int
 	ActiveWeaponID              int
 	RawWeapons                  map[int]*Equipment
-	Weapons                     []*Equipment
 	AmmoLeft                    [32]int
 	Entity                      *st.Entity
 	AdditionalPlayerInformation *AdditionalPlayerInformation
@@ -77,6 +76,15 @@ func (p *Player) ActiveWeapon() *Equipment {
 	return p.RawWeapons[p.ActiveWeaponID]
 }
 
+// Weapons returns all weapons in the player's possession
+func (p *Player) Weapons() []*Equipment {
+	res := make([]*Equipment, 0, len(p.RawWeapons))
+	for _, w := range p.RawWeapons {
+		res = append(res, w)
+	}
+	return res
+}
+
 // AdditionalPlayerInformation contains mostly scoreboard information.
 type AdditionalPlayerInformation struct {
 	Kills          int

datatables.go

@@ -263,7 +263,7 @@ func (p *Parser) bindNewPlayer(playerEntity *st.Entity) {
 			if entityID != indexMask {
 				if cache[i2] != 0 {
 					// Player already has a weapon in this slot.
-					pl.RawWeapons[cache[i2]] = nil
+					delete(pl.RawWeapons, cache[i2])
 				}
 				cache[i2] = entityID
 
@@ -275,9 +275,10 @@ func (p *Parser) bindNewPlayer(playerEntity *st.Entity) {
 				if cache[i2] != 0 && pl.RawWeapons[cache[i2]] != nil {
 					pl.RawWeapons[cache[i2]].Owner = nil
 				}
-				pl.RawWeapons[cache[i2]] = nil
+				delete(pl.RawWeapons, cache[i2])
+
+				cache[i2] = 0
 			}
-			cache[i2] = 0
 		})
 	}
 

game_events.go

@@ -437,7 +437,7 @@ func (p *Parser) handleGameEvent(ge *msg.CSVCMsg_GameEvent) {
 func getAttackingWeapon(wep *common.Equipment, attacker *common.Player) *common.Equipment {
 	class := wep.Class()
 	isSpecialWeapon := class == common.EqClassGrenade || (class == common.EqClassEquipment && wep.Weapon != common.EqKnife)
-	if !isSpecialWeapon && attacker != nil && len(attacker.Weapons) > 0 {
+	if !isSpecialWeapon && attacker != nil && len(attacker.RawWeapons) > 0 {
 		return attacker.ActiveWeapon()
 	} else {
 		return wep