Skip to content

standardise reservedslots variable #2533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dgibbs64 merged 4 commits into from
Oct 6, 2019
+4 −4
Merged

standardise reservedslots variable #2533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0dab05c
Merge pull request #1 from GameServerManagers/develop
Frisasky Sep 21, 2019
6fe0916
Merge pull request #2 from GameServerManagers/develop
Frisasky Oct 3, 2019
c45f01a
standardise reservedslots variable
Frisasky Oct 5, 2019
e150966
standardise reservedslots variable
Frisasky Oct 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lgsm/config-default/config-lgsm/pstbsserver/_default.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ queryport="10037"
#servername="LinuxGSM Server"
# If your server is not meeting the minimal server requirement, do not host the server for 80 players, decrease that number.
maxplayers="40"
numreservedslots="2"
reservedslots="2"

## Server Start Command | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
fn_parms(){
parms="MULTIHOME=${ip}?RANDOM=${randommap}?Port=${port}?QueryPort=${queryport}?MaxPlayers=${maxplayers}?NumReservedSlots=${numreservedslots}"
parms="MULTIHOME=${ip}?RANDOM=${randommap}?Port=${port}?QueryPort=${queryport}?MaxPlayers=${maxplayers}?NumReservedSlots=${reservedslots}"
}

#### LinuxGSM Settings ####
Expand Down
4 changes: 2 additions & 2 deletions lgsm/functions/info_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,11 +391,11 @@ fn_info_config_pstbs(){
if [ ! -f "${servercfgfullpath}" ]; then
servername="${unavailable}"
maxplayers="${unavailable}"
numreservedslots="${unavailable}"
reservedslots="${unavailable}"
else
servername="$(grep "ServerName=" "${servercfgfullpath}" | sed -e 's/^[ \t]//g' -e '/^#/d' -e 's/ServerName//g' | tr -d '=";,:' | sed -e 's/^[ \t]//' -e 's/[ \t]*$//')"
maxplayers="$(grep "MaxPlayers=" "${servercfgfullpath}" | tr -cd '[:digit:]')"
numreservedslots="$(grep "NumReservedSlots=" "${servercfgfullpath}" | tr -cd '[:digit:]')"
reservedslots="$(grep "NumReservedSlots=" "${servercfgfullpath}" | tr -cd '[:digit:]')"
fi

if [ ! -f "${servercfgdir}/Rcon.cfg" ]; then
Expand Down