Mercurial > mm7

diff Actor.cpp @ 1603:c58916c53d8e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Grumpy7
date Thu, 12 Sep 2013 09:58:07 +0200
parents 11bb463837b1 75fafd8ced59
children ccde94f02b75
line wrap: on
line diff
--- a/Actor.cpp	Thu Sep 12 09:55:20 2013 +0200
+++ b/Actor.cpp	Thu Sep 12 09:58:07 2013 +0200
@@ -32,7 +32,6 @@
 #include "stru298.h"
 #include "Log.h"
 #include "Texts.h"
-#include "Allocator.h"
 
 
 
@@ -5401,8 +5400,7 @@
   monster_id = a1;
   x_ = x;
   v15 = a1;
-  if (uNumActors < 500
-    && ((signed int)pAllocator->uBigBufferSizeAligned >> 10) - ((signed int)pAllocator->uNextFreeOffsetInBigBuffer >> 10) >= 2000 )
+  if (uNumActors < 500)
   {
     v16 = 0;
     if ( uCurrentlyLoadedLevelType == LEVEL_Indoor )