comparison Render.cpp @ 860:8fc2f035abc0

* AI function renames * more PID replaces
author zipi
date Sun, 31 Mar 2013 12:39:29 +0100
parents e3609dd06c15
children f4394e320312
comparison
equal deleted inserted replaced
859:48c230c37d74 860:8fc2f035abc0
21 #include "Actor.h" 21 #include "Actor.h"
22 #include "Log.h" 22 #include "Log.h"
23 #include "TileFrameTable.h" 23 #include "TileFrameTable.h"
24 #include "texts.h" 24 #include "texts.h"
25 #include "mm7_data.h" 25 #include "mm7_data.h"
26 #include "MM7.h"
26 27
27 #pragma comment(lib, "lib\\legacy_dx\\lib\\ddraw.lib") 28 #pragma comment(lib, "lib\\legacy_dx\\lib\\ddraw.lib")
28 #pragma comment(lib, "lib\\legacy_dx\\lib\\dxguid.lib") 29 #pragma comment(lib, "lib\\legacy_dx\\lib\\dxguid.lib")
29 30
30 struct IDirectDrawClipper *pDDrawClipper; 31 struct IDirectDrawClipper *pDDrawClipper;
3180 v3->uScreenSpaceX = v35; 3181 v3->uScreenSpaceX = v35;
3181 v3->uScreenSpaceY = v32; 3182 v3->uScreenSpaceY = v32;
3182 HIWORD(v26) = HIWORD(v42); 3183 HIWORD(v26) = HIWORD(v42);
3183 LOWORD(v26) = 0; 3184 LOWORD(v26) = 0;
3184 v27 = (object->uAttributes & 0x20) == 0; 3185 v27 = (object->uAttributes & 0x20) == 0;
3185 v3->sZValue = v26 + (8 * i | OBJECT_Item); 3186 v3->sZValue = v26 + (PID(i,OBJECT_Item));
3186 v3->dimming_level = 0; 3187 v3->dimming_level = 0;
3187 v3->uTintColor = 0; 3188 v3->uTintColor = 0;
3188 if ( !v27 ) 3189 if ( !v27 )
3189 { 3190 {
3190 if ( !pRenderer->pRenderD3D ) 3191 if ( !pRenderer->pRenderD3D )
3680 v27->world_x = decor->vPosition.x; 3681 v27->world_x = decor->vPosition.x;
3681 v27->world_y = decor->vPosition.y; 3682 v27->world_y = decor->vPosition.y;
3682 v27->world_z = decor->vPosition.z; 3683 v27->world_z = decor->vPosition.z;
3683 v27->uScreenSpaceY = v40; 3684 v27->uScreenSpaceY = v40;
3684 HIWORD(v30) = HIWORD(v39); 3685 HIWORD(v30) = HIWORD(v39);
3685 v31 = 8 * i | OBJECT_Decoration; 3686 v31 = PID(i,OBJECT_Decoration);
3686 LOWORD(v30) = 0; 3687 LOWORD(v30) = 0;
3687 v27->uIndoorSectorID = 0; 3688 v27->uIndoorSectorID = 0;
3688 v27->sZValue = v30 + v31; 3689 v27->sZValue = v30 + v31;
3689 v27->dimming_level = 0; 3690 v27->dimming_level = 0;
3690 v27->pSpriteFrame = v8; 3691 v27->pSpriteFrame = v8;