Mercurial > might-and-magic-trilogy
comparison mm7_4.cpp @ 109:62772029b56d
Слияние
author | Ritor1 |
---|---|
date | Tue, 06 Nov 2012 10:07:35 +0600 |
parents | ccc0cf95706a 3b5267621a5b |
children | 918dca162239 |
comparison
equal
deleted
inserted
replaced
108:d543bd89a31e | 109:62772029b56d |
---|---|
3355 double v2; // st7@3 | 3355 double v2; // st7@3 |
3356 Player **v3; // esi@3 | 3356 Player **v3; // esi@3 |
3357 | 3357 |
3358 v1 = uHoursToSleep; | 3358 v1 = uHoursToSleep; |
3359 if ( uHoursToSleep > 240 ) | 3359 if ( uHoursToSleep > 240 ) |
3360 UpdateActors(); | 3360 InitializeActors(); |
3361 v2 = (double)(7680 * v1) * 0.033333335; | 3361 v2 = (double)(7680 * v1) * 0.033333335; |
3362 pParty->uTimePlayed += (signed __int64)v2; | 3362 pParty->uTimePlayed += (signed __int64)v2; |
3363 v3 = &pPlayers[1]; | 3363 v3 = &pPlayers[1]; |
3364 do | 3364 do |
3365 { | 3365 { |
5385 int uColorTeal; // [sp+158h] [bp-18h]@1 | 5385 int uColorTeal; // [sp+158h] [bp-18h]@1 |
5386 int uColorWhite; // [sp+15Ch] [bp-14h]@1 | 5386 int uColorWhite; // [sp+15Ch] [bp-14h]@1 |
5387 int uX; // [sp+160h] [bp-10h]@18 | 5387 int uX; // [sp+160h] [bp-10h]@18 |
5388 unsigned int v133; // [sp+164h] [bp-Ch]@25 | 5388 unsigned int v133; // [sp+164h] [bp-Ch]@25 |
5389 int v134; // [sp+168h] [bp-8h]@14 | 5389 int v134; // [sp+168h] [bp-8h]@14 |
5390 char *Str; // [sp+16Ch] [bp-4h]@18 | |
5390 Player *pPlayer; | 5391 Player *pPlayer; |
5391 const char *pSkillName; | 5392 const char *pSkillName; |
5392 | 5393 |
5393 uColor1 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xD1u, 0xBBu, 0x61u); | 5394 uColor1 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xD1u, 0xBBu, 0x61u); |
5394 uColorTeal = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xF7u, 0xF7u); | 5395 uColorTeal = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xF7u, 0xF7u); |
5472 v129 = 493; | 5473 v129 = 493; |
5473 pPlayer = pParty->pPlayers; | 5474 pPlayer = pParty->pPlayers; |
5474 v119 = 6 * v6 + 169; | 5475 v119 = 6 * v6 + 169; |
5475 do | 5476 do |
5476 { | 5477 { |
5478 Str = pPlayer->pName; | |
5479 | |
5477 pGUIWindow_CurrentMenu->DrawText( | 5480 pGUIWindow_CurrentMenu->DrawText( |
5478 pFontCreate, | 5481 pFontCreate, |
5479 v134 + 73, | 5482 v134 + 73, |
5480 100, | 5483 100, |
5481 0, | 5484 0, |