Implement hole and player orders mostly correctly.

Player order is still wrong because we are not tracking OB/etc.
pangbox · Jul 4, 2023 · ab59b2f · ab59b2f
1 parent 7dd0b6d
commit ab59b2f
Show file tree

Hide file tree

Showing 3 changed files with 251 additions and 142 deletions.
diff --git a/game/model/room.go b/game/model/room.go
@@ -121,7 +121,7 @@ type RoomState struct {
 
 	GamePhase    GamePhase
 	ShotSync     *ShotSyncData
-	HoleInfo     *HoleInfo
+	Holes        []RoomHole
 	ActiveConnID uint32
 }
 
@@ -170,10 +170,14 @@ type ShotSyncData struct {
 	Unknown2     [11]byte
 }
 
-type HoleInfo struct {
-	Par  uint8
-	TeeX float32
-	TeeZ float32
-	PinX float32
-	PinZ float32
+type RoomHole struct {
+	Course  byte
+	HoleNum uint8
+	HoleID  uint32
+	Pin     uint8
+	Par     uint8
+	TeeX    float32
+	TeeZ    float32
+	PinX    float32
+	PinZ    float32
 }
diff --git a/game/packet/server.go b/game/packet/server.go
@@ -499,10 +499,10 @@ type Server004E struct {
 }
 
 type HoleInfo struct {
-	HoleID uint32
-	Pin    uint8
-	Course uint8
-	Num    uint8
+	HoleID  uint32
+	Pin     uint8
+	Course  uint8
+	HoleNum uint8
 }
 
 type ServerRoomGameData struct {