From dd061a4c4d50490d34286f972f644059c121b141 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Sun, 8 Jan 2017 02:45:57 -0600 Subject: [PATCH 1/3] inaccurate comment - this is set in setGodMode --- engine/server/library/serverGame/src/shared/core/Client.h | 1 - 1 file changed, 1 deletion(-) diff --git a/engine/server/library/serverGame/src/shared/core/Client.h b/engine/server/library/serverGame/src/shared/core/Client.h index e7010311..846c69a9 100755 --- a/engine/server/library/serverGame/src/shared/core/Client.h +++ b/engine/server/library/serverGame/src/shared/core/Client.h @@ -380,7 +380,6 @@ inline bool Client::isGod() const { //----------------------------------------------------------------------- inline int Client::getGodLevel() const { - // isGod will set the god level if it is not already, if the client is a god if (isGod() || ConfigServerGame::getAdminGodToAll()) { return m_godLevel; } else { From 5243bf90b397be31e6887179921db7ea5a9f0a4f Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Sun, 8 Jan 2017 02:46:38 -0600 Subject: [PATCH 2/3] this is redundant --- engine/server/library/serverGame/src/shared/core/Client.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/server/library/serverGame/src/shared/core/Client.h b/engine/server/library/serverGame/src/shared/core/Client.h index 846c69a9..8f2d4806 100755 --- a/engine/server/library/serverGame/src/shared/core/Client.h +++ b/engine/server/library/serverGame/src/shared/core/Client.h @@ -380,7 +380,7 @@ inline bool Client::isGod() const { //----------------------------------------------------------------------- inline int Client::getGodLevel() const { - if (isGod() || ConfigServerGame::getAdminGodToAll()) { + if (isGod()) { return m_godLevel; } else { return -1; From 31a7404d1fa272b7332ede6cac8ea9f7f05a2aa6 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Sun, 8 Jan 2017 02:47:43 -0600 Subject: [PATCH 3/3] i realize this is somewhat paranoid but still... --- engine/server/library/serverGame/src/shared/core/Client.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/server/library/serverGame/src/shared/core/Client.h b/engine/server/library/serverGame/src/shared/core/Client.h index 8f2d4806..e495059b 100755 --- a/engine/server/library/serverGame/src/shared/core/Client.h +++ b/engine/server/library/serverGame/src/shared/core/Client.h @@ -383,7 +383,7 @@ inline int Client::getGodLevel() const { if (isGod()) { return m_godLevel; } else { - return -1; + return -1; // because they may be aliased in the admin table, but don't want to be in gm right now } }