From 649aed23ac2eb733e2fbb19ddde27a6facef60ac Mon Sep 17 00:00:00 2001 From: Areloch Date: Sun, 28 Jan 2018 15:19:36 -0600 Subject: [PATCH] Fixes server prefs to be force-loaded from defaults first before loading local prefs to avoid bad config files breaking everything. Also added error message in the even of unexpected failure to connect to local servers that normal errors don't catch(and returns to the main menu in this case) --- .../data/clientServer/scripts/server/server.cs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Templates/BaseGame/game/data/clientServer/scripts/server/server.cs b/Templates/BaseGame/game/data/clientServer/scripts/server/server.cs index 4fd007b35..9f30ecf5d 100644 --- a/Templates/BaseGame/game/data/clientServer/scripts/server/server.cs +++ b/Templates/BaseGame/game/data/clientServer/scripts/server/server.cs @@ -25,11 +25,14 @@ function initServer() echo("\n--------- Initializing " @ $appName @ ": Server Scripts ---------"); //load prefs + + //Force-load the defaults just so we don't have any mistakes + exec( "data/clientServer/scripts/server/defaults.cs" ); + + //Then, if the user has saved preferences, we load those over-top the defaults %prefPath = getPrefpath(); if ( isFile( %prefPath @ "/serverPrefs.cs" ) ) exec( %prefPath @ "/serverPrefs.cs" ); - else - exec( "data/clientServer/scripts/server/defaults.cs" ); exec( "data/clientServer/scripts/server/audio.cs" ); exec( "data/clientServer/scripts/server/commands.cs" ); @@ -99,6 +102,11 @@ function createAndConnectToLocalServer( %serverType, %level ) { %conn.delete(); destroyServer(); + + MessageBoxOK("Error starting local server!", "There was an error when trying to connect to the local server."); + + if(isObject(MainMenuGui)) + Canvas.setContent(MainMenuGui); return false; } @@ -201,7 +209,7 @@ function destroyServer() // End any running levels and shut down the physics sim onServerDestroyed(); - physicsDestroy(); + //physicsDestroy(); // Delete all the server objects if (isObject(ServerGroup))