Mercurial > mm7
comparison UI/Books/UIMapBook.cpp @ 1477:7ef4b64f6329
* LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Added support for most of mm6 resources, placeholders for mm8 resources.
Fixed few C4258
author | Nomad |
---|---|
date | Wed, 28 Aug 2013 18:43:07 +0200 |
parents | 934074e7fcc1 |
children | a27cdb3d753e |
comparison
equal
deleted
inserted
replaced
1475:d7720c1f1d3b | 1477:7ef4b64f6329 |
---|---|
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" |