Mercurial > mm7

comparison mm7_3.cpp @ 828:0f56abdcce94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Massive refactors of spells + PID (packed id) macros introduced.
author Nomad
date Wed, 27 Mar 2013 00:27:38 +0200
parents fe4c8b113548
children d5b1870df3ab
comparison
equal deleted inserted replaced
824:fe4c8b113548 828:0f56abdcce94
41 #include "stru176.h" 41 #include "stru176.h"
42 #include "stru159.h" 42 #include "stru159.h"
43 #include "stru298.h" 43 #include "stru298.h"
44 #include "texts.h" 44 #include "texts.h"
45 #include "Log.h" 45 #include "Log.h"
46
47 #include "MM7.h"
46 #include "mm7_data.h" 48 #include "mm7_data.h"
47 49
48 //----- (0046E44E) -------------------------------------------------------- 50 //----- (0046E44E) --------------------------------------------------------
49 int __thiscall _46E44E_collide_against_faces_and_portals(unsigned int b1) 51 int __thiscall _46E44E_collide_against_faces_and_portals(unsigned int b1)
50 { 52 {
13601 v10 = pMapStats->GetMapInfo(pCurrentMapName); 13603 v10 = pMapStats->GetMapInfo(pCurrentMapName);
13602 if ( v10 ) 13604 if ( v10 )
13603 { 13605 {
13604 v11 = uNumActors; 13606 v11 = uNumActors;
13605 SpawnEncounter((MapInfo *)&pMapStats->pInfos[v10], &v16, 0, count, 0); 13607 SpawnEncounter((MapInfo *)&pMapStats->pInfos[v10], &v16, 0, count, 0);
13606 memcpy(&v15, Actor::GetDirectionInfo(8 * v11 | AI_OBJECT_ACTOR, 4u, &a3, 1), sizeof(v15)); 13608 memcpy(&v15, Actor::GetDirectionInfo(PID(OBJECT_Actor, v11), 4u, &a3, 1), sizeof(v15));
13607 v12 = v11; 13609 v12 = v11;
13608 if ( (signed int)v11 < (signed int)uNumActors ) 13610 if ( (signed int)v11 < (signed int)uNumActors )
13609 { 13611 {
13610 for ( pActor = &pActors[v11]; v12 < (signed int)uNumActors; ++pActor ) 13612 for ( pActor = &pActors[v11]; v12 < (signed int)uNumActors; ++pActor )
13611 { 13613 {