Mercurial > mm7
comparison UI/Books/UIMapBook.cpp @ 1483:223605b325b3
Слияние
author | Ritor1 |
---|---|
date | Thu, 29 Aug 2013 12:04:55 +0600 |
parents | 7ef4b64f6329 |
children | a27cdb3d753e |
comparison
equal
deleted
inserted
replaced
1482:cfd99b6177a3 | 1483:223605b325b3 |
---|---|
76 } | 76 } |
77 TownPortalWindow.DrawTitleText(pBook2Font, 0, 22, 0, pGlobalTXT_LocalizationStrings[10], 3); | 77 TownPortalWindow.DrawTitleText(pBook2Font, 0, 22, 0, pGlobalTXT_LocalizationStrings[10], 3); |
78 } | 78 } |
79 | 79 |
80 //----- (00410DEC) -------------------------------------------------------- | 80 //----- (00410DEC) -------------------------------------------------------- |
81 unsigned int __cdecl DrawLloydBeaconsScreen() | 81 unsigned int DrawLloydBeaconsScreen() |
82 { | 82 { |
83 Player *pPlayer; // esi@1 | 83 Player *pPlayer; // esi@1 |
84 char *pText; // eax@1 | 84 char *pText; // eax@1 |
85 int pTextHeight; // eax@14 | 85 int pTextHeight; // eax@14 |
86 int RemainingTime; // kr08_8@14 | 86 int RemainingTime; // kr08_8@14 |
253 map_window.uFrameHeight = game_viewport_height; | 253 map_window.uFrameHeight = game_viewport_height; |
254 map_window.uFrameX = game_viewport_x; | 254 map_window.uFrameX = game_viewport_x; |
255 map_window.uFrameY = game_viewport_y; | 255 map_window.uFrameY = game_viewport_y; |
256 map_window.uFrameZ = game_viewport_z; | 256 map_window.uFrameZ = game_viewport_z; |
257 map_window.uFrameW = game_viewport_w; | 257 map_window.uFrameW = game_viewport_w; |
258 map_id = pMapStats->GetMapInfo(pCurrentMapName.data()); | 258 map_id = pMapStats->GetMapInfo(pCurrentMapName); |
259 if ( map_id ) | 259 if ( map_id ) |
260 map_window.DrawTitleText(pBook2Font, -14, 12, ui_book_map_title_color, pMapStats->pInfos[map_id].pName, 3); | 260 map_window.DrawTitleText(pBook2Font, -14, 12, ui_book_map_title_color, pMapStats->pInfos[map_id].pName, 3); |
261 | 261 |
262 map_window.uFrameX = 0; | 262 map_window.uFrameX = 0; |
263 sprintf(party_coord, pGlobalTXT_LocalizationStrings[659], pParty->vPosition.x, pParty->vPosition.y); //"x: %d y: %d" | 263 sprintf(party_coord, pGlobalTXT_LocalizationStrings[659], pParty->vPosition.x, pParty->vPosition.y); //"x: %d y: %d" |