hackerbots
/
server
1
0
Fork 0
Code Issues 2 Pull Requests Activity

projectiles should have their own ID

This commit is contained in:
Fraser Graham 2013-11-06 20:32:56 -08:00
parent bad900997f
commit 545b68d1d7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
player.go
View File

@ -215,7 +215,7 @@ func (p *player) fire(projectiles map[*Projectile]bool, turn int) *Projectile {
p.Robot.LastFired = turn p.Robot.LastFired = turn
return &Projectile{ return &Projectile{
Id: p.Robot.Id, Id: idg.Hash(),
Position: p.Robot.Position, Position: p.Robot.Position,
MoveTo: *p.Robot.FireAt, MoveTo: *p.Robot.FireAt,
Damage: 10, Damage: 10,

4
projectile.go
View File

@ -8,7 +8,7 @@ type Projectile struct {
Id string `json:"id"` Id string `json:"id"`
Position v.Point2d `json:"position"` Position v.Point2d `json:"position"`
MoveTo v.Point2d `json:"-"` MoveTo v.Point2d `json:"-"`
Radius int `json:"radius"` Radius int `json:"-"`
Speed float32 `json:"-"` Speed float32 `json:"-"`
Damage int `json:"-"` Damage int `json:"-"`
Owner *player `json:"-"` Owner *player `json:"-"`
@ -22,7 +22,7 @@ func (p *Projectile) Tick(g *game) {
hit_player := false hit_player := false
for player := range g.players { for player := range g.players {
if player.Robot.Id == p.Id { if player == p.Owner {
continue continue
} }
dist := v.Distance(player.Robot.Position, p.Position) dist := v.Distance(player.Robot.Position, p.Position)