hipstercat/GiantsTools
1
0
Fork 0
mirror of https://github.com/ncblakely/GiantsTools synced 2024-11-01 13:15:38 +01:00
Code Issues Releases Wiki Activity

Compare commits

base: hipstercat:b85a31a57208da268d560e098aa8c69288538890
Branches Tags
hipstercat:main
hipstercat:users/tos/modeselection
hipstercat:releases/1.5.1.x
hipstercat:releases/1.5.0.x
..
compare: hipstercat:4a449e12a6337eff650e86aa22436e2864d397c5
Branches Tags
hipstercat:main
hipstercat:users/tos/modeselection
hipstercat:releases/1.5.1.x
hipstercat:releases/1.5.0.x

No commits in common. "b85a31a57208da268d560e098aa8c69288538890" and "4a449e12a6337eff650e86aa22436e2864d397c5" have entirely different histories.
b85a31a572 ... 4a449e12a6

4 changed files with 2 additions and 16 deletions
Show Stats Expand all files Collapse all files

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

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

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

@ -791,9 +791,6 @@ namespace Giants.WebApi.Clients
[Newtonsoft.Json.JsonProperty("numPlayers", Required = Newtonsoft.Json.Required.Always)] [Newtonsoft.Json.JsonProperty("numPlayers", Required = Newtonsoft.Json.Required.Always)]
public int NumPlayers { get; set; } 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)] [Newtonsoft.Json.JsonProperty("gameState", Required = Newtonsoft.Json.Required.Always)]
[System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)] [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)]
[System.ComponentModel.DataAnnotations.StringLength(100)] [System.ComponentModel.DataAnnotations.StringLength(100)]

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

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

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

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