Mercurial > mm7

comparison Outdoor.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 d37b03507b3b
children 0b4fc79351b6 710cf848ad24
comparison
equal deleted inserted replaced
824:fe4c8b113548 828:0f56abdcce94
22 #include "Time.h" 22 #include "Time.h"
23 #include "Viewport.h" 23 #include "Viewport.h"
24 #include "Events.h" 24 #include "Events.h"
25 25
26 #include "mm7_data.h" 26 #include "mm7_data.h"
27 //#include "MM7.h" 27 #include "MM7.h"
28 28
29 29
30 30
31 31
32 32
2947 v49 = 0; 2947 v49 = 0;
2948 x = actor->vPosition.x; 2948 x = actor->vPosition.x;
2949 y = actor->vPosition.y; 2949 y = actor->vPosition.y;
2950 if (actor->uAIState == Summoned) 2950 if (actor->uAIState == Summoned)
2951 { 2951 {
2952 if ((actor->uSummonerID & 7) != OBJECT_Actor || 2952 if (PID_TYPE(actor->uSummonerID) != OBJECT_Actor ||
2953 pActors[actor->uSummonerID >> 3].pMonsterInfo.uSpecialAbilityDamageDiceSides != 1 ) 2953 pActors[PID_ID(actor->uSummonerID)].pMonsterInfo.uSpecialAbilityDamageDiceSides != 1 )
2954 { 2954 {
2955 z += floorf(actor->uActorHeight * 0.5f + 0.5f); 2955 z += floorf(actor->uActorHeight * 0.5f + 0.5f);
2956 } 2956 }
2957 else 2957 else
2958 { 2958 {
3113 v28->world_y = y; 3113 v28->world_y = y;
3114 v28->world_z = z; 3114 v28->world_z = z;
3115 HIWORD(v34) = HIWORD(X); 3115 HIWORD(v34) = HIWORD(X);
3116 LOWORD(v34) = 0; 3116 LOWORD(v34) = 0;
3117 v28->dimming_level = 0; 3117 v28->dimming_level = 0;
3118 v28->sZValue = v34 + (8 * i | OBJECT_Actor); 3118 v28->sZValue = v34 + PID(OBJECT_Actor, i);
3119 v28->field_14_actor_id = i; 3119 v28->field_14_actor_id = i;
3120 v35 = pMonsterList->pMonsters; 3120 v35 = pMonsterList->pMonsters;
3121 v36 = actor->pMonsterInfo.uID; 3121 v36 = actor->pMonsterInfo.uID;
3122 v28->field_1E = v62 | 0x200; 3122 v28->field_1E = v62 | 0x200;
3123 v28->pSpriteFrame = v15; 3123 v28->pSpriteFrame = v15;