From 34734c8879b4e70dc305fedad0f94b122033b49a Mon Sep 17 00:00:00 2001 From: CodeCodon Date: Fri, 24 Jul 2015 15:44:23 -0500 Subject: [PATCH] quiet some annoying warnings; make godmode behave as it did originally --- engine/server/library/serverGame/src/shared/core/Client.cpp | 5 ++++- .../library/serverGame/src/shared/core/ConfigServerGame.cpp | 2 +- .../library/soePlatform/CSAssist/utils/Base/linux/Types.h | 3 +++ .../library/soePlatform/CTServiceGameAPI/Base/linux/Types.h | 3 +++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/engine/server/library/serverGame/src/shared/core/Client.cpp b/engine/server/library/serverGame/src/shared/core/Client.cpp index 9a343956..038a790a 100644 --- a/engine/server/library/serverGame/src/shared/core/Client.cpp +++ b/engine/server/library/serverGame/src/shared/core/Client.cpp @@ -242,7 +242,10 @@ Client::Client(ConnectionServerConnection & connection, const NetworkId & charac connectToEmitter(connection, "ConnectionServerConnectionDestroyed"); // Check god permissions - if (AdminAccountManager::isAdminAccount(Unicode::toLower(accountName), m_godLevel)) + if ( ConfigServerGame::getAdminGodToAll() + || ( (!ConfigServerGame::getUseSecureLoginForGodAccess() || m_isSecure) + && AdminAccountManager::isAdminAccount(Unicode::toLower(accountName), m_godLevel) + && (!ConfigServerGame::getUseIPForGodAccess() || AdminAccountManager::isInternalIp(ipAddr)))) { m_godValidated = true; if (ConfigServerGame::getAdminGodToAll()) diff --git a/engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp b/engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp index 58c9fc17..65e5a0c0 100644 --- a/engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp +++ b/engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp @@ -67,7 +67,7 @@ void ConfigServerGame::install(void) KEY_BOOL (profileScripts, false); KEY_BOOL (crashOnScriptError, false); KEY_BOOL (compileScripts, true); - KEY_BOOL (trapScriptCrashes, false); + KEY_BOOL (trapScriptCrashes, true); KEY_INT (scriptWatcherWarnTime, 5000); KEY_INT (scriptWatcherInterruptTime, 5000); KEY_INT (scriptStackErrorLimit, 35); diff --git a/external/3rd/library/soePlatform/CSAssist/utils/Base/linux/Types.h b/external/3rd/library/soePlatform/CSAssist/utils/Base/linux/Types.h index bc869bac..69419a0f 100644 --- a/external/3rd/library/soePlatform/CSAssist/utils/Base/linux/Types.h +++ b/external/3rd/library/soePlatform/CSAssist/utils/Base/linux/Types.h @@ -21,9 +21,12 @@ namespace NAMESPACE namespace Base { + +#ifndef INT32_MAX #define INT32_MAX 0x7FFFFFFF #define INT32_MIN 0x80000000 #define UINT32_MAX 0xFFFFFFFF +#endif typedef signed char int8; typedef unsigned char uint8; diff --git a/external/3rd/library/soePlatform/CTServiceGameAPI/Base/linux/Types.h b/external/3rd/library/soePlatform/CTServiceGameAPI/Base/linux/Types.h index bc869bac..69419a0f 100644 --- a/external/3rd/library/soePlatform/CTServiceGameAPI/Base/linux/Types.h +++ b/external/3rd/library/soePlatform/CTServiceGameAPI/Base/linux/Types.h @@ -21,9 +21,12 @@ namespace NAMESPACE namespace Base { + +#ifndef INT32_MAX #define INT32_MAX 0x7FFFFFFF #define INT32_MIN 0x80000000 #define UINT32_MAX 0xFFFFFFFF +#endif typedef signed char int8; typedef unsigned char uint8;