Mercurial > mm7
diff Indoor.cpp @ 190:9b77686e2239
Merge
author | Gloval |
---|---|
date | Sat, 16 Feb 2013 00:44:38 +0400 |
parents | d65528fc3bda |
children | 4a5559c728a5 |
line wrap: on
line diff
--- a/Indoor.cpp Sat Feb 16 00:33:21 2013 +0400 +++ b/Indoor.cpp Sat Feb 16 00:44:38 2013 +0400 @@ -22,6 +22,7 @@ #include "TurnEngine.h" #include "PaletteManager.h" #include "MapInfo.h" +#include "IndoorCamera.h" #include "mm7_data.h" @@ -359,18 +360,18 @@ //----- (00441BD4) -------------------------------------------------------- void IndoorLocation::Draw() { - int v0; // eax@1 + //int v0; // eax@1 IndoorLocation_drawstru _this; // [sp+0h] [bp-4Ch]@5 int v2; // [sp+44h] [bp-8h]@5 int v3; // [sp+48h] [bp-4h]@5 - v0 = 0; - if ( viewparams->field_50_draw_debug_outlines ) - v0 = 1; - if ( viewparams->field_54 ) - LOBYTE(v0) = v0 | 2; + _this.uFlags = 0; + if (viewparams->draw_sw_outlines) + _this.uFlags |= INDOOR_CAMERA_DRAW_SW_OUTLINES; + if (viewparams->draw_d3d_outlines) + _this.uFlags |= INDOOR_CAMERA_DRAW_D3D_OUTLINES; + _this.field_0_timer = pEventTimer->uTotalGameTimeElapsed; - _this.uFlags = v0; _this.vPosition.x = pParty->vPosition.x - ((unsigned __int64)(stru_5C6E00->SinCos(pParty->sRotationY) * (signed __int64)pParty->y_rotation_granularity) >> 16);