Merge pull request #157 from markus-wa/issue/156-Kill.Killer-mayBeNil-Weapon-shouldBeEqWorld

Kill.Killer may be nil, "worldspawn" Equipment should be EqWorld

Author: markus-wa

common/equipment.go

@@ -194,7 +194,7 @@ func initEqNameToWeapon() {
 	eqNameToWeapon["sg550"] = EqUnknown
 	eqNameToWeapon["sg552"] = EqUnknown // This one still crashes the game :)
 	eqNameToWeapon["tmp"] = EqUnknown
-	eqNameToWeapon["worldspawn"] = EqUnknown
+	eqNameToWeapon["worldspawn"] = EqWorld
 }
 
 func initEqElementToName() {

events/events.go

@@ -140,7 +140,7 @@ type PlayerJump struct {
 type Kill struct {
 	Weapon            *common.Equipment
 	Victim            *common.Player
-	Killer            *common.Player
+	Killer            *common.Player // May be nil for world damage (EqWorld) or if the demo is partially corrupt (see #156)
 	Assister          *common.Player
 	PenetratedObjects int
 	IsHeadshot        bool
@@ -153,7 +153,7 @@ type BotTakenOver struct {
 
 // WeaponFire signals that a weapon has been fired.
 type WeaponFire struct {
-	Shooter *common.Player
+	Shooter *common.Player // May be nil if the demo is partially corrupt (see #156)
 	Weapon  *common.Equipment
 }