@@ -17,7 +17,7 @@ type Publisher struct {
17
17
}
18
18
19
19
type RefMessage struct {
20
- referee refproto.Referee
20
+ referee * refproto.Referee
21
21
send func ()
22
22
}
23
23
@@ -39,9 +39,9 @@ func NewPublisher(address string) (publisher Publisher, err error) {
39
39
log .Println ("Publishing to" , address )
40
40
41
41
publisher .conn = conn
42
- publisher .message = RefMessage {send : publisher .send }
42
+ publisher .message = RefMessage {send : publisher .send , referee : new (refproto. Referee ) }
43
43
44
- initRefereeMessage (& publisher .message .referee )
44
+ initRefereeMessage (publisher .message .referee )
45
45
46
46
return
47
47
}
@@ -89,7 +89,7 @@ func (p *Publisher) send() {
89
89
return
90
90
}
91
91
92
- bytes , err := proto .Marshal (& p .message .referee )
92
+ bytes , err := proto .Marshal (p .message .referee )
93
93
if err != nil {
94
94
log .Printf ("Could not marshal referee message: %v\n Error: %v" , p .message , err )
95
95
return
@@ -101,17 +101,15 @@ func (p *Publisher) send() {
101
101
}
102
102
103
103
func (p * RefMessage ) setState (state * State ) (republish bool ) {
104
- r := & p .referee
104
+ p .referee .GameEvents = mapGameEvents (state .GameEvents )
105
+ p .referee .DesignatedPosition = mapLocation (state .PlacementPos )
105
106
106
- r .GameEvents = mapGameEvents (state .GameEvents )
107
- r .DesignatedPosition = mapLocation (state .PlacementPos )
108
-
109
- * r .PacketTimestamp = uint64 (time .Now ().UnixNano () / 1000 )
110
- * r .Stage = mapStage (state .Stage )
111
- * r .StageTimeLeft = int32 (state .StageTimeLeft .Nanoseconds () / 1000 )
112
- * r .BlueTeamOnPositiveHalf = state .TeamState [TeamBlue ].OnPositiveHalf
113
- updateTeam (r .Yellow , state .TeamState [TeamYellow ])
114
- updateTeam (r .Blue , state .TeamState [TeamBlue ])
107
+ * p .referee .PacketTimestamp = uint64 (time .Now ().UnixNano () / 1000 )
108
+ * p .referee .Stage = mapStage (state .Stage )
109
+ * p .referee .StageTimeLeft = int32 (state .StageTimeLeft .Nanoseconds () / 1000 )
110
+ * p .referee .BlueTeamOnPositiveHalf = state .TeamState [TeamBlue ].OnPositiveHalf
111
+ updateTeam (p .referee .Yellow , state .TeamState [TeamYellow ])
112
+ updateTeam (p .referee .Blue , state .TeamState [TeamBlue ])
115
113
return
116
114
}
117
115
0 commit comments