hipstercat
/
GiantsTools
mirror of https://github.com/ncblakely/GiantsTools
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1 from jeantoulza/master 

Added MaxPlayers to API
This commit is contained in:
ncblakely 2020-09-23 14:58:49 -07:00 committed by GitHub
parent 4a449e12a6 f4a4449243
commit b85a31a572
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Giants.DataContract/Contracts/V1/ServerInfo.cs
View File

@ -32,6 +32,9 @@
[Required]
public int NumPlayers { get; set; }
[Required]
public int MaxPlayers { get; set; }
[Required]
[StringLength(100)]
public string GameState { get; set; }
@ -61,6 +64,7 @@
this.MapName == info.MapName &&
this.GameType == info.GameType &&
this.NumPlayers == info.NumPlayers &&
this.MaxPlayers == info.MaxPlayers &&
this.GameState == info.GameState &&
this.TimeLimit == info.TimeLimit &&
this.FragLimit == info.FragLimit &&
@ -79,6 +83,7 @@
hash.Add(this.MapName);
hash.Add(this.GameType);
hash.Add(this.NumPlayers);
hash.Add(this.MaxPlayers);
hash.Add(this.GameState);
hash.Add(this.TimeLimit);
hash.Add(this.FragLimit);

5
Giants.WebApi.Clients/Clients.cs
View File

@ -790,6 +790,9 @@ namespace Giants.WebApi.Clients
[Newtonsoft.Json.JsonProperty("numPlayers", Required = Newtonsoft.Json.Required.Always)]
public int NumPlayers { get; set; }
[Newtonsoft.Json.JsonProperty("maxPlayers", Required = Newtonsoft.Json.Required.Always)]
public int MaxPlayers { get; set; }
[Newtonsoft.Json.JsonProperty("gameState", Required = Newtonsoft.Json.Required.Always)]
[System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)]
@ -927,4 +930,4 @@ namespace Giants.WebApi.Clients
#pragma warning restore 1573
#pragma warning restore 472
#pragma warning restore 114
#pragma warning restore 108
#pragma warning restore 108

6
Giants.WebApi.Clients/swagger.json
View File

@ -192,6 +192,10 @@
"type": "integer",
"format": "int32"
},
"maxPlayers": {
"type": "integer",
"format": "int32"
},
"gameState": {
"type": "string",
"maxLength": 100,
@ -320,4 +324,4 @@
}
}
}
}
}

2
Sdk/Include/MasterServer/ServerInfoResponse.h
View File

@ -22,6 +22,7 @@ struct ServerInfoResponse
mapName = serverInfoResponse["mapName"];
gameType = serverInfoResponse["gameType"];
numPlayers = serverInfoResponse["numPlayers"];
maxPlayers = serverInfoResponse["maxPlayers"];
gameState = serverInfoResponse["gameState"];
timeLimit = serverInfoResponse["timeLimit"];
fragLimit = serverInfoResponse["fragLimit"];
@ -42,6 +43,7 @@ struct ServerInfoResponse
std::string mapName;
std::string gameType;
int numPlayers = 0;
int maxPlayers = 0;
std::string gameState;
int timeLimit = 0;
int fragLimit = 0;