Mercurial > mm7

comparison 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
comparison
equal deleted inserted replaced
1602:96a1f5e0b6cd 1603:c58916c53d8e
30 #include "MM7.h" 30 #include "MM7.h"
31 #include "SpriteObject.h" 31 #include "SpriteObject.h"
32 #include "stru298.h" 32 #include "stru298.h"
33 #include "Log.h" 33 #include "Log.h"
34 #include "Texts.h" 34 #include "Texts.h"
35 #include "Allocator.h"
36 35
37 36
38 37
39 38
40 39
5399 5398
5400 v4 = uNumActors; 5399 v4 = uNumActors;
5401 monster_id = a1; 5400 monster_id = a1;
5402 x_ = x; 5401 x_ = x;
5403 v15 = a1; 5402 v15 = a1;
5404 if (uNumActors < 500 5403 if (uNumActors < 500)
5405 && ((signed int)pAllocator->uBigBufferSizeAligned >> 10) - ((signed int)pAllocator->uNextFreeOffsetInBigBuffer >> 10) >= 2000 )
5406 { 5404 {
5407 v16 = 0; 5405 v16 = 0;
5408 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor ) 5406 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor )
5409 { 5407 {
5410 v6 = pIndoor->GetSector(x, y, z); 5408 v6 = pIndoor->GetSector(x, y, z);