abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Increase the maximum observer limit to 32 for the upcoming release, refs #4210.

Browse Source 
This was SVN commit r18719.
This commit is contained in:
elexis 2016-09-11 22:46:00 +00:00
parent 5f67763e97
commit 24a488bacc
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binaries/data/config/default.cfg
View File

@ -363,7 +363,7 @@ enabledmods = "mod public"
[network]
duplicateplayernames = false ; Rename joining player to "User (2)" if "User" is already connected, otherwise prohibit join.
lateobserverjoins = false ; Allow observers to join the game after it started
observerlimit = 6 ; Prevent further observer joins in running games if this limit is reached
observerlimit = 8 ; Prevent further observer joins in running games if this limit is reached
[overlay]
fps = "false" ; Show frames per second in top right corner

2
binaries/data/mods/public/gui/options/options.json
View File

@ -83,7 +83,7 @@
"type": "number",
"label": "Observer Limit",
"tooltip": "Prevent further observer from joining if the limit is reached",
"parameters": { "config": "network.observerlimit", "min": 0, "max": 16 }
"parameters": { "config": "network.observerlimit", "min": 0, "max": 32 }
},
{
"type": "number",

4
source/network/NetServer.cpp
View File

@ -44,9 +44,9 @@
* Number of peers to allocate for the enet host.
* Limited by ENET_PROTOCOL_MAXIMUM_PEER_ID (4096).
*
* At most 8 players, 16 observers and 1 temporary connection to send the "server full" disconnect-reason.
* At most 8 players, 32 observers and 1 temporary connection to send the "server full" disconnect-reason.
*/
#define MAX_CLIENTS 25
#define MAX_CLIENTS 41
#define DEFAULT_SERVER_NAME L"Unnamed Server"
#define DEFAULT_WELCOME_MESSAGE L"Welcome"