diff --git a/engine/server/library/serverNetworkMessages/src/shared/TaskConnectionIdMessage.h b/engine/server/library/serverNetworkMessages/src/shared/TaskConnectionIdMessage.h index ce5e5735..75bc9295 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/TaskConnectionIdMessage.h +++ b/engine/server/library/serverNetworkMessages/src/shared/TaskConnectionIdMessage.h @@ -42,7 +42,7 @@ private: Archive::AutoVariable serverType; Archive::AutoVariable commandLine; Archive::AutoVariable clusterName; - Archive::AutoVariable currentEpochTime; + Archive::AutoVariable currentEpochTime; }; //----------------------------------------------------------------------- diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsCombat.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsCombat.cpp index fdb842bc..f8700fc5 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsCombat.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsCombat.cpp @@ -1680,7 +1680,7 @@ jboolean JNICALL ScriptMethodsCombatNamespace::doCombatResults(JNIEnv *env, jobj if (!ClientCombatManagerSupport::doesCombatActionNameExist(TemporaryCrcString(animationString.c_str(), true))) { - WARNING(true, ("doCombatResults(): caller passed in unsupported combat action name [%s]! Continuing to send combat action. Call stack follows in stdout.", animationString.c_str())); + DEBUG_WARNING(true, ("doCombatResults(): caller passed in unsupported combat action name [%s]! Continuing to send combat action. Call stack follows in stdout.", animationString.c_str())); // @todo make this go to the log rather than stdout; otherwise, we're going to have to do a lot more work to see this info. JavaLibrary::printJavaStack(); } diff --git a/engine/server/library/serverUtility/src/shared/SystemAssignedProcessId.h b/engine/server/library/serverUtility/src/shared/SystemAssignedProcessId.h index 2ecbf8b0..63047124 100755 --- a/engine/server/library/serverUtility/src/shared/SystemAssignedProcessId.h +++ b/engine/server/library/serverUtility/src/shared/SystemAssignedProcessId.h @@ -24,7 +24,7 @@ private: SystemAssignedProcessId & operator = (const SystemAssignedProcessId & rhs); SystemAssignedProcessId(const SystemAssignedProcessId & source); - Archive::AutoVariable m_id; + Archive::AutoVariable m_id; }; //----------------------------------------------------------------------- diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GalaxyLoopTimesResponse.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GalaxyLoopTimesResponse.h index 56d447c5..b1c47ddf 100755 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GalaxyLoopTimesResponse.h +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GalaxyLoopTimesResponse.h @@ -25,8 +25,8 @@ private: GalaxyLoopTimesResponse & operator = (const GalaxyLoopTimesResponse & rhs); GalaxyLoopTimesResponse(const GalaxyLoopTimesResponse & source); - Archive::AutoVariable currentFrameMilliseconds; - Archive::AutoVariable lastFrameMilliseconds; + Archive::AutoVariable currentFrameMilliseconds; + Archive::AutoVariable lastFrameMilliseconds; }; //----------------------------------------------------------------------- diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SlowDownEffectMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SlowDownEffectMessage.h index effac2e7..035e081e 100755 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SlowDownEffectMessage.h +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SlowDownEffectMessage.h @@ -45,7 +45,7 @@ private: Archive::AutoVariable m_coneLength; Archive::AutoVariable m_coneAngle; Archive::AutoVariable m_slopeAngle; - Archive::AutoVariable m_expireTime; + Archive::AutoVariable m_expireTime; }; //----------------------------------------------------------------------- diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/FrameEndMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/common/FrameEndMessage.h index d65192e6..7fb4a4bc 100755 --- a/engine/shared/library/sharedNetworkMessages/src/shared/common/FrameEndMessage.h +++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/FrameEndMessage.h @@ -28,7 +28,7 @@ public: private: Archive::AutoVariable m_processId; - Archive::AutoVariable m_frameTime; + Archive::AutoVariable m_frameTime; Archive::AutoVariable m_profilerData; FrameEndMessage(); diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/GameNetworkMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/common/GameNetworkMessage.h index 3e8f93b4..cac84466 100755 --- a/engine/shared/library/sharedNetworkMessages/src/shared/common/GameNetworkMessage.h +++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/GameNetworkMessage.h @@ -43,7 +43,7 @@ public: private: GameNetworkMessage(); - Archive::AutoVariable cmd; + Archive::AutoVariable cmd; }; // ======================================================================