From c5edc9bbb480b7ab109b050c8b629faec13850f9 Mon Sep 17 00:00:00 2001
From: Charlie Gunyon <charles.gunyon@gmail.com>
Date: Sun, 15 May 2016 18:40:07 +0000
Subject: [PATCH] Some functional updates to serve.sh and increase MAX_PEER_LAG
to 4 seconds
---
serve.sh | 10 ++++++----
src/n_main.c | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/serve.sh b/serve.sh
index a73e61b..5b9a3ab 100755
--- a/serve.sh
+++ b/serve.sh
@@ -6,14 +6,16 @@ WAD="-file heights2.wad"
WAD=""
WAD="-iwad freedm.wad"
WAD="-file dwango5.wad"
-WAD="-file judas23_.wad"
WAD="-file king1.wad"
WAD="-file sunder.wad"
+WAD="-file judas23_.wad"
+
CMD="cbuild/d2k $WAD -skill 5 -warp 1 -nomonsters -serve"
CMD="cbuild/d2k $WAD -skill 5 -warp 1 -deathmatch -frags 5 -serve"
CMD="cbuild/d2k $WAD -skill 4 -warp 1 -serve"
-CMD="cbuild/d2k $WAD -skill 5 -warp 1 -nomonsters -altdeath -frags 1 -log /home/charlie/.d2k/log.txt -serve -nodaemon"
CMD="cbuild/d2k $WAD -skill 5 -warp 2 -log /home/charlie/.d2k/log.txt -serve -nodaemon"
+CMD="cbuild/d2k $WAD -skill 5 -warp 1 -nomonsters -altdeath -frags 1 -log /home/charlie/.d2k/log.txt -serve -nodaemon"
+CMD="cbuild/d2k $WAD -skill 5 -warp 23 -nomonsters -altdeath -frags 1 -log /home/charlie/.d2k/log.txt -serve -nodaemon"
mkdir -p ~/.d2k/scripts
@@ -21,9 +23,9 @@ cp "${BASE_DIR}/d2k_config_schema.json" ~/.d2k/
cp "${BASE_DIR}/scripts/"* ~/.d2k/scripts/
# gdb -ex 'source gdbserver.txt' --args $CMD
-gdb -ex run --args $CMD
+# gdb -ex run --args $CMD
# gdb --args $CMD
# CPUPROFILE=cpu.prof $CMD
# valgrind --leak-check=full --show-leak-kinds=all $CMD
-# $CMD
+$CMD
diff --git a/src/n_main.c b/src/n_main.c
index 2035b49..e259b19 100644
--- a/src/n_main.c
+++ b/src/n_main.c
@@ -67,7 +67,7 @@
#define SERVER_NO_PEER_SLEEP_TIMEOUT 20
#define SERVER_SLEEP_TIMEOUT 1
-#define SERVER_MAX_PEER_LAG 70
+#define SERVER_MAX_PEER_LAG (TICRATE * 4)
#define MAX_SETUP_REQUEST_ATTEMPTS 5
static int run_tics(int tic_count) {