Set default parameters for multiplayer games and send to lobby

Author: Swan

multiplayer/game.go

@@ -16,17 +16,19 @@ type Game struct {
 // NewGame Creates a new multiplayer game from a game
 func NewGame(gameData *objects.MultiplayerGame) (*Game, error) {
 	game := Game{Data: gameData}
+	game.Data.GameId = utils.GenerateRandomString(32)
 
 	if game.Data.CreationPassword != "" {
 		game.Data.HasPassword = true
 		game.Password = game.Data.CreationPassword
 		game.Data.CreationPassword = ""
 	}
 
+	game.Data.SetDefaults()
 	game.ValidateSettings()
 
 	var err error
-	game.Data.Id, err = db.InsertMultiplayerGame(game.Data.Name)
+	game.Data.Id, err = db.InsertMultiplayerGame(game.Data.Name, game.Data.GameId)
 
 	if err != nil {
 		return nil, err

multiplayer/lobby.go

@@ -1,6 +1,7 @@
 package multiplayer
 
 import (
+	"example.com/Quaver/Z/packets"
 	"example.com/Quaver/Z/sessions"
 	"log"
 	"sync"
@@ -33,6 +34,10 @@ func AddUserToLobby(user *sessions.User) {
 	defer lobby.mutex.Unlock()
 
 	lobby.users[user.Info.Id] = user
+
+	for _, game := range lobby.games {
+		sendLobbyUsersGameInfoPacket(game, false)
+	}
 }
 
 // RemoveUserFromLobby Removes a user from the multiplayer lobby
@@ -51,6 +56,8 @@ func AddGameToLobby(game *Game) {
 	defer lobby.mutex.Unlock()
 
 	lobby.games[game.Data.Id] = game
+	sendLobbyUsersGameInfoPacket(game, false)
+
 	log.Printf("Multiplayer Game `%v (#%v)` was created.\n", game.Data.Name, game.Data.Id)
 }
 
@@ -63,3 +70,18 @@ func RemoveGameFromLobby(game *Game) {
 	delete(lobby.games, game.Data.Id)
 	log.Printf("Multiplayer game `%v (%v)` was disbanded.\n", game.Data.Name, game.Data.Id)
 }
+
+// SendLobbyUsersGameInfoPacket Sends all the users in the lobby a packet with game information
+// Be careful of deadlocks when calling this. Make sure not to call the mutex twice.
+func sendLobbyUsersGameInfoPacket(game *Game, lock bool) {
+	if lock {
+		lobby.mutex.Lock()
+		defer lobby.mutex.Unlock()
+	}
+
+	packet := packets.NewServerMultiplayerGameInfo(game.Data)
+
+	for _, user := range lobby.users {
+		sessions.SendPacketToUser(packet, user)
+	}
+}

objects/multiplayer_game.go

@@ -4,6 +4,7 @@ import "example.com/Quaver/Z/common"
 
 type MultiplayerGame struct {
 	Id                        int                         `json:"gid"`   // The id of the game in the database
+	GameId                    string                      `json:"id"`    // A unique identifier for the game
 	Name                      string                      `json:"n"`     // The name of the game
 	CreationPassword          string                      `json:"pw"`    // The password of the game during creation
 	HasPassword               bool                        `json:"hp"`    // If the game has a password on it
@@ -45,3 +46,19 @@ type MultiplayerGame struct {
 	FilterMaxLongNotePercent  int                         `json:"lnmax"` // The maximum long note percentage for the map
 	FilterMinAudioRate        float64                     `json:"mr"`    // The minimum audio rate allowed for free mod
 }
+
+func (mg *MultiplayerGame) SetDefaults() {
+	mg.PlayerIds = []int{}
+	mg.PlayersWithoutMap = []int{}
+	mg.PlayersReady = []int{}
+	mg.PlayerModifiers = []MultiplayerGamePlayerMods{}
+	mg.PlayersRedTeam = []int{}
+	mg.PlayersBlueTeam = []int{}
+	mg.PlayerWins = []MultiplayerGamePlayerWins{}
+	mg.FilterAllowedGameModes = []common.Mode{}
+
+	mg.FilterMaxDifficultyRating = 999999999
+	mg.FilterMaxSongLength = 999999999
+	mg.FilterMaxLongNotePercent = 100
+	mg.FilterMinAudioRate = 0.5
+}

packets/ServerMultiplayerGameInfo.go

@@ -0,0 +1,15 @@
+package packets
+
+import "example.com/Quaver/Z/objects"
+
+type ServerMultiplayerGameInfo struct {
+	Packet
+	Game *objects.MultiplayerGame `json:"m"`
+}
+
+func NewServerMultiplayerGameInfo(game *objects.MultiplayerGame) *ServerMultiplayerGameInfo {
+	return &ServerMultiplayerGameInfo{
+		Packet: Packet{Id: PacketIdServerMultiplayerGameInfo},
+		Game:   game,
+	}
+}