Skip to content

Commit 2c38196

Browse files
committed
Merge pull request OpenXcom#620 from redv/interface6_hidden_movement
UI improvements: fix for wide screens
2 parents 3474e0e + 45176e5 commit 2c38196

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

‎src/Battlescape/BattlescapeMessage.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ namespace OpenXcom
3333
*/
3434
BattlescapeMessage::BattlescapeMessage(int width, int height, int x, int y) : Surface(width, height, x, y)
3535
{
36-
_window = new Window(0, width, height, 0, 0, POPUP_NONE);
36+
_window = new Window(0, width, height, x, y, POPUP_NONE);
3737
_window->setColor(Palette::blockOffset(0));
3838
_window->setHighContrast(true);
3939

40-
_text = new Text(width, height, 0, 0);
40+
_text = new Text(width, height, x, y);
4141
_text->setColor(Palette::blockOffset(0));
4242
_text->setAlign(ALIGN_CENTER);
4343
_text->setVerticalAlign(ALIGN_MIDDLE);

‎src/Battlescape/Map.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Map::Map(Game *game, int width, int height, int x, int y, int visibleMapHeight)
8686
_spriteWidth = _res->getSurfaceSet("BLANKS.PCK")->getFrame(0)->getWidth();
8787
_spriteHeight = _res->getSurfaceSet("BLANKS.PCK")->getFrame(0)->getHeight();
8888
_save = _game->getSavedGame()->getSavedBattle();
89-
_message = new BattlescapeMessage(width, visibleMapHeight, 0, 0);
89+
_message = new BattlescapeMessage(320, visibleMapHeight, Screen::getDX(), Screen::getDY());
9090
_camera = new Camera(_spriteWidth, _spriteHeight, _save->getMapSizeX(), _save->getMapSizeY(), _save->getMapSizeZ(), this, visibleMapHeight);
9191
_scrollMouseTimer = new Timer(SCROLL_INTERVAL);
9292
_scrollMouseTimer->onTimer((SurfaceHandler)&Map::scrollMouse);

‎src/Menu/SavedGameState.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ SavedGameState::SavedGameState(Game *game, bool geo, bool showMsg) : State(game)
163163
{
164164
if (_showMsg)
165165
{
166-
_txtStatus = new Text(320, 16, 0, 92);
166+
_txtStatus = new Text(320, 16, Screen::getDX(), 92 + Screen::getDY());
167167
add(_txtStatus);
168168

169169
_txtStatus->setBig();

0 commit comments

Comments
 (0)