From 6a8538e2511a0794a5e9d2d2caccdff4f320a580 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Sat, 16 Apr 2016 19:58:39 +0000 Subject: [PATCH] remove superfluous if statement --- .../serverGame/src/shared/object/ServerObject.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/engine/server/library/serverGame/src/shared/object/ServerObject.cpp b/engine/server/library/serverGame/src/shared/object/ServerObject.cpp index c4903557..08367a64 100755 --- a/engine/server/library/serverGame/src/shared/object/ServerObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/ServerObject.cpp @@ -3276,12 +3276,9 @@ void ServerObject::removeTriggerVolume(const std::string & name) void ServerObject::sendControllerMessageToAuthServer(enum GameControllerMessage cm, MessageQueue::Data * msg, float value) { #ifdef _DEBUG - // debug stuff done this way so it is easy to break on - if (!isInitialized() || isInEndBaselines()) - { - WARNING(isInEndBaselines(), ("sendControllerMessageToAuthServer while ending baselines: message id=(%d) from object id=[%s], template=[%s], on server id=[%d]", static_cast(cm), getNetworkId().getValueString().c_str(), getObjectTemplateName(), static_cast(GameServer::getInstance().getProcessId()))); - WARNING(!isInitialized(), ("sendControllerMessageToAuthServer while uninitialized: message id=(%d) from object id=[%s], template=[%s], on server id=[%d]", static_cast(cm), getNetworkId().getValueString().c_str(), getObjectTemplateName(), static_cast(GameServer::getInstance().getProcessId()))); - } + WARNING(isInEndBaselines(), ("sendControllerMessageToAuthServer while ending baselines: message id=(%d) from object id=[%s], template=[%s], on server id=[%d]", static_cast(cm), getNetworkId().getValueString().c_str(), getObjectTemplateName(), static_cast(GameServer::getInstance().getProcessId()))); + + WARNING(!isInitialized(), ("sendControllerMessageToAuthServer while uninitialized: message id=(%d) from object id=[%s], template=[%s], on server id=[%d]", static_cast(cm), getNetworkId().getValueString().c_str(), getObjectTemplateName(), static_cast(GameServer::getInstance().getProcessId()))); #endif Controller * controller = getController();