implement Stringer interface for Player and Equipment

Author: markus-wa

README.md

@@ -64,7 +64,7 @@ func main() {
 		if e.PenetratedObjects > 0 {
 			wallBang = " (WB)"
 		}
-		fmt.Printf("%s <%v%s%s> %s\n", e.Killer.Name, e.Weapon.Weapon, hs, wallBang, e.Victim.Name)
+		fmt.Printf("%s <%v%s%s> %s\n", e.Killer, e.Weapon, hs, wallBang, e.Victim)
 	})
 
 	// Parse to end

common/equipment.go

@@ -282,6 +282,12 @@ type Equipment struct {
 	uniqueID int64
 }
 
+// String returns a human readable name for the equipment.
+// E.g. 'AK-47', 'UMP-45', 'Smoke Grenade' etc.
+func (e Equipment) String() string {
+	return e.Weapon.String()
+}
+
 // Class returns the class of the equipment.
 // E.g. pistol, smg, heavy etc.
 func (e Equipment) Class() EquipmentClass {

common/player.go

@@ -44,6 +44,16 @@ type Player struct {
 	HasHelmet                   bool
 }
 
+// String returns the player's name.
+// Implements fmt.Stringer.
+func (p *Player) String() string {
+	if p == nil {
+		return "(nil)"
+	}
+
+	return p.Name
+}
+
 // IsAlive returns true if the Hp of the player are > 0.
 func (p *Player) IsAlive() bool {
 	return p.Hp > 0

examples_test.go

@@ -12,6 +12,7 @@ import (
 /*
 This will print all kills of a demo in the format '[[killer]] <[[weapon]] [(HS)] [(WB)]> [[victim]]'
 */
+//noinspection GoUnhandledErrorResult
 func ExampleParser() {
 	f, err := os.Open("test/cs-demos/default.dem")
 	if err != nil {
@@ -31,7 +32,7 @@ func ExampleParser() {
 		if e.PenetratedObjects > 0 {
 			wallBang = " (WB)"
 		}
-		fmt.Printf("%s <%v%s%s> %s\n", e.Killer.Name, e.Weapon.Weapon, hs, wallBang, e.Victim.Name)
+		fmt.Printf("%s <%v%s%s> %s\n", e.Killer, e.Weapon, hs, wallBang, e.Victim)
 	})
 
 	// Parse to end