swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-08-01 02:15:54 -04:00
Code Issues Projects Releases Wiki Activity

tidies some things up and removes SOE memory manager overriding

Browse Source
This commit is contained in:
DarthArgus
2016-11-28 17:07:49 +00:00
parent 1867ee7cc9
commit 89cd10fbcc
24 changed files with 39 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/shared/library/sharedUtility/src/shared/CachedFileManager.cpp
-6
View File
@@ -186,10 +186,6 @@ void CachedFileManager::preloadSomeAssets ()
{
unsigned long const startTime = Clock::timeMs ();
#if PRODUCTION == 0
unsigned long const bytesBefore = MemoryManager::getCurrentNumberOfBytesAllocated();
#endif
//-- preloading occurs in one second slices
while (ms_filenamesCurrentPos < ms_filenamesLength && Clock::timeMs () - startTime < 1000)
{
@@ -229,8 +225,6 @@ void CachedFileManager::preloadSomeAssets ()
#if PRODUCTION == 0
unsigned long const stopTime = Clock::timeMs ();
ms_totalTime += stopTime - startTime;
ms_totalAllocatedBytes += MemoryManager::getCurrentNumberOfBytesAllocated() - bytesBefore;
#endif
if (donePreloading ())