Mercurial > mm7
comparison Viewport.cpp @ 2139:f9b55be70c1b
Слияние
author | Ritor1 |
---|---|
date | Thu, 02 Jan 2014 09:11:28 +0600 |
parents | 85e9766d6124 |
children | 92511cd8fcdb |
comparison
equal
deleted
inserted
replaced
2138:7cc14d9d966d | 2139:f9b55be70c1b |
---|---|
52 this->uScreen_BR_X = br_x; | 52 this->uScreen_BR_X = br_x; |
53 this->uScreen_BR_Y = br_y; | 53 this->uScreen_BR_Y = br_y; |
54 this->uScreenWidth = br_x - tl_x + 1; | 54 this->uScreenWidth = br_x - tl_x + 1; |
55 this->uScreenHeight = br_y - tl_y + 1; | 55 this->uScreenHeight = br_y - tl_y + 1; |
56 this->uScreenCenterX = (signed int)(br_x + tl_x) /2; | 56 this->uScreenCenterX = (signed int)(br_x + tl_x) /2; |
57 if ( pRenderer->pRenderD3D == 0 ) | 57 //if ( pRenderer->pRenderD3D == 0 ) |
58 this->uScreenCenterY = this->uScreen_BR_Y - fixpoint_mul(field_30, uScreenHeight); | 58 // this->uScreenCenterY = this->uScreen_BR_Y - fixpoint_mul(field_30, uScreenHeight); |
59 else | 59 //else |
60 this->uScreenCenterY = (br_y + tl_y)/2; | 60 this->uScreenCenterY = (br_y + tl_y)/2; |
61 SetViewport(this->uScreen_TL_X, this->uScreen_TL_Y, this->uScreen_BR_X, this->uScreen_BR_Y); | 61 SetViewport(this->uScreen_TL_X, this->uScreen_TL_Y, this->uScreen_BR_X, this->uScreen_BR_Y); |
62 } | 62 } |
63 | 63 |
64 //----- (004C02F8) -------------------------------------------------------- | 64 //----- (004C02F8) -------------------------------------------------------- |
193 | 193 |
194 //----- (00443343) -------------------------------------------------------- | 194 //----- (00443343) -------------------------------------------------------- |
195 void ViewingParams::InitGrayPalette() | 195 void ViewingParams::InitGrayPalette() |
196 { | 196 { |
197 for (unsigned short i=0; i<256; ++i) | 197 for (unsigned short i=0; i<256; ++i) |
198 pPalette[i]=TargetColor(i, i, i); | 198 pPalette[i]=Color16(i, i, i); |
199 } | 199 } |
200 | 200 |
201 //----- (00443365) -------------------------------------------------------- | 201 //----- (00443365) -------------------------------------------------------- |
202 void ViewingParams::_443365() | 202 void ViewingParams::_443365() |
203 { | 203 { |
485 if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->turn_stage == 3 ) | 485 if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->turn_stage == 3 ) |
486 { | 486 { |
487 pParty->uFlags |= PARTY_FLAGS_1_FALLING; | 487 pParty->uFlags |= PARTY_FLAGS_1_FALLING; |
488 return; | 488 return; |
489 } | 489 } |
490 if ( uActiveCharacter && sub_427769_spell(pPlayers[uActiveCharacter]->uQuickSpell)) | 490 if ( uActiveCharacter && sub_427769_isSpellQuickCastableOnShiftClick(pPlayers[uActiveCharacter]->uQuickSpell)) |
491 pMessageQueue_50CBD0->AddMessage(UIMSG_CastQuickSpell, 0, 0); | 491 pMessageQueue_50CBD0->AddMessage(UIMSG_CastQuickSpell, 0, 0); |
492 } | 492 } |
493 return; | 493 return; |
494 } | 494 } |
495 if ( PID_TYPE(v0) == OBJECT_Decoration) | 495 if ( PID_TYPE(v0) == OBJECT_Decoration) |