Permalink
Browse files

Sped up client disconnect.

Compile fixes for alloc tracking mode. 
Possible fix for server getTickCount rounding.
  • Loading branch information...
ccw808 committed Aug 1, 2015
1 parent dd96dfe commit dbb01f50e5b47bf35eb338fe205ae50dbb4c6438
@@ -685,6 +685,10 @@ void CClientStreamer::OnElementEnterSector ( CClientStreamElement * pElement, CC
CClientStreamSector * pPreviousSector = pElement->GetStreamSector ();
if ( pPreviousSector )
{
// Skip if disconnecting
if ( g_pClientGame->IsBeingDeleted () )
return;
// Remove the element from its old sector
pPreviousSector->Remove ( pElement );
}
@@ -173,7 +173,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4996;4482;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<AdditionalOptions>-Zm114 %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>-Zm130 %(AdditionalOptions)</AdditionalOptions>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<ResourceCompile>
@@ -225,6 +225,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4996;4482;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<AdditionalOptions>-Zm130 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -272,7 +273,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<DisableSpecificWarnings>4996;4482;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ShowIncludes>false</ShowIncludes>
<AdditionalOptions>-Zm114 %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>-Zm130 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -320,7 +321,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4996;4482;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ShowIncludes>false</ShowIncludes>
<AdditionalOptions>-Zm114 %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>-Zm130 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -364,7 +365,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4996;4482;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<AdditionalOptions>-Zm114 %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>-Zm130 %(AdditionalOptions)</AdditionalOptions>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -421,6 +422,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4996;4482;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<AdditionalOptions>-Zm130 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -188,7 +188,7 @@ int CLuaFunctionDefs::InterpolateBetween ( lua_State* luaVM )
int CLuaFunctionDefs::GetTickCount_ ( lua_State* luaVM )
{
double dTime = GetSecondCount () * 1000.0;
double dTime = static_cast < double > ( GetTickCount64_() );
lua_pushnumber ( luaVM, dTime );
return 1;
}
@@ -71,6 +71,7 @@
#include <deque>
#include <algorithm>
#include <limits>
#include <memory>
namespace std
{

0 comments on commit dbb01f5

Please sign in to comment.