Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit e124208

Browse files
committed
use references
1 parent 7d7f7c8 commit e124208

File tree

7 files changed

+25
-27
lines changed

7 files changed

+25
-27
lines changed

‎http/gateway/coordinate_change.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func CoordinateChangeEventCallback(c *WebSocketConnection, d *AnyMessage) {
4444
p.AntiCheatFlags += utils.Penalize(utils.ActionCoordinateDrift, int(yDrift))
4545
}
4646

47-
kicked := c.HandleAntiCheatFlags(&r, p.AntiCheatFlags)
47+
kicked := c.HandleAntiCheatFlags(r, p.AntiCheatFlags)
4848
if kicked {
4949
return
5050
}

‎http/gateway/handler.go‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func Handle(c *websocket.Conn) {
3939
err := c.ReadJSON(&msg)
4040
if err != nil {
4141
fmt.Println(err)
42-
handleClose(&ws)
42+
//handleClose(&ws)
4343
break
4444
}
4545

@@ -51,7 +51,7 @@ func Handle(c *websocket.Conn) {
5151
case OpEvent:
5252
handleEvent(&ws, &msg)
5353
case OpClose:
54-
handleClose(&ws)
54+
//handleClose(&ws)
5555
break
5656
}
5757
}
@@ -64,23 +64,20 @@ func handleHello(c *WebSocketConnection, d *AnyMessage) {
6464
}
6565
sessionID, ok := d.Data["session"].(string)
6666

67-
fmt.Println("event data", d.Data)
68-
6967
r, ok := room.Rooms[roomID]
7068
if !ok {
7169
return
7270
}
73-
fmt.Println("room", r)
7471

7572
if len(r.Players) >= room.PlayerLimit {
76-
c.Kick(&r, RoomFullKick, "Too many players online")
73+
c.Kick(r, RoomFullKick, "Too many players online")
7774
return
7875
}
7976

8077
if r.Mode == room.EliminationMode &&
8178
r.State != room.CountdownState &&
8279
r.State != room.WaitingState {
83-
c.Kick(&r, RoomIngameKick, "Room is already in-game")
80+
c.Kick(r, RoomIngameKick, "Room is already in-game")
8481
return
8582
}
8683

@@ -112,11 +109,12 @@ func handleHello(c *WebSocketConnection, d *AnyMessage) {
112109
return
113110
}
114111

115-
r.Players = append(r.Players, p)
112+
r.Players = append(r.Players, &p)
116113

117114
// TODO: check if room is elimination room and if it meets requirements for room start
118115

119116
// TODO: send room data to client
117+
fmt.Println(r)
120118
}
121119

122120
func handleHeartbeat(c *WebSocketConnection, d *AnyMessage) {

‎http/gateway/item_collect.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func ItemCollectEventCallback(c *WebSocketConnection, d *AnyMessage) {
3030

3131
var targetItem *item.Item
3232
for i := range r.Items {
33-
currentItem := &r.Items[i]
33+
currentItem := r.Items[i]
3434
if currentItem.ID == itemID &&
3535
p.X < (currentItem.X+item.ItemWidth) &&
3636
p.X > (currentItem.X-item.ItemWidth) &&

‎http/gateway/nom_key.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func NomKeyEventCallback(c *WebSocketConnection, d *AnyMessage) {
3030
}
3131

3232
for i := range r.Players {
33-
target := &r.Players[i]
33+
target := r.Players[i]
3434

3535
if (p.X > (target.X+player.Height) || p.X < (target.X-player.Height)) || (p.Y > (target.Y+player.Height) || p.Y < (target.Y-player.Height)) {
3636
return

‎http/gateway/player_kick.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func PlayerKickEventCallback(c *WebSocketConnection, d *AnyMessage) {
3838
}
3939

4040
if p.Role != user.AdminRole {
41-
c.Kick(&r, ClientModKick, "Insufficient permissions")
41+
c.Kick(r, ClientModKick, "Insufficient permissions")
4242
return
4343
}
4444

@@ -51,5 +51,5 @@ func PlayerKickEventCallback(c *WebSocketConnection, d *AnyMessage) {
5151
if !ok {
5252
return
5353
}
54-
conn.Kick(&r, ModKick, reason)
54+
conn.Kick(r, ModKick, reason)
5555
}

‎main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func main() {
4646
}
4747

4848
// Create rooms
49-
room.Rooms = make(map[string]room.Room)
49+
room.Rooms = make(map[string]*room.Room)
5050
for i := 0; i < 3; i++ {
5151
room.New(room.FFAMode)
5252
room.New(room.EliminationMode)

‎models/room/room.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,19 @@ const (
3636

3737
type Room struct {
3838
// Base
39-
Map gamemap.GameMap `json:"map"`
40-
ID string `json:"id"`
41-
Players []player.Player `json:"players"`
42-
Items []item.Item `json:"items"`
43-
Mode uint8 `json:"mode"`
44-
State uint8 `json:"state"`
45-
CreatedAt int64 `json:"createdAt"`
39+
Map gamemap.GameMap `json:"map"`
40+
ID string `json:"id"`
41+
Players []*player.Player `json:"players"`
42+
Items []*item.Item `json:"items"`
43+
Mode uint8 `json:"mode"`
44+
State uint8 `json:"state"`
45+
CreatedAt int64 `json:"createdAt"`
4646

4747
// Elimination room
4848
CountdownStarted int64 `json:"countdownStarted,omitempty"`
4949
}
5050

51-
var Rooms map[string]Room
51+
var Rooms map[string]*Room
5252

5353
func New(mode uint8) *Room {
5454
r := Room{
@@ -59,10 +59,10 @@ func New(mode uint8) *Room {
5959

6060
// TODO: custom maps?
6161
r.Map = gamemap.GameMaps["default"]
62-
r.Players = make([]player.Player, 0)
63-
r.Items = make([]item.Item, 0)
62+
r.Players = make([]*player.Player, 0)
63+
r.Items = make([]*item.Item, 0)
6464

65-
Rooms[r.ID] = r
65+
Rooms[r.ID] = &r
6666

6767
return &r
6868
}
@@ -103,7 +103,7 @@ func (r *Room) GenerateGuestName() string {
103103
func (r *Room) GetPlayerByUsername(username string) *player.Player {
104104
for i, p := range r.Players {
105105
if p.Username == username {
106-
return &r.Players[i]
106+
return r.Players[i]
107107
}
108108
}
109109
return nil
@@ -112,7 +112,7 @@ func (r *Room) GetPlayerByUsername(username string) *player.Player {
112112
func (r *Room) GetPlayerByWebSocketID(id string) *player.Player {
113113
for i, p := range r.Players {
114114
if p.ID == id {
115-
return &r.Players[i]
115+
return r.Players[i]
116116
}
117117
}
118118
return nil

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /