From 3369b6c5c13e55fb88d4d7c6b2ec972609ce6417 Mon Sep 17 00:00:00 2001 From: Julie Marchant Date: Thu, 30 May 2019 23:09:10 -0400 Subject: [PATCH] Fixed screen_adjustDimensions, plus updated some more blitTexts. --- src/intermission.c | 20 ++++++++++---------- src/screen.c | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/intermission.c b/src/intermission.c index 60f1ca3..fc6511e 100644 --- a/src/intermission.c +++ b/src/intermission.c @@ -1374,13 +1374,13 @@ int intermission() gfx_createTextObject(TS_INFO_EXIT, "Exit to Title Screen", -1, iconInfoY, FONT_WHITE); sprintf(string, "Stationed At: %s", intermission_planets[game.stationedPlanet].name); - gfx_createTextObject(TS_CURRENT_PLANET, string, 90, screen->h - 120, FONT_WHITE); + gfx_createTextObject(TS_CURRENT_PLANET, string, 90, 0, FONT_WHITE); if (game.destinationPlanet > -1) sprintf(string, "Destination: %s", intermission_planets[game.destinationPlanet].name); else strcpy(string, "Destination: None"); - gfx_createTextObject(TS_DEST_PLANET, string, screen->w - 250, screen->h - 120, FONT_WHITE); + gfx_createTextObject(TS_DEST_PLANET, string, 0, 0, FONT_WHITE); if (game.distanceCovered > 0) section = 0; @@ -1458,9 +1458,9 @@ int intermission() distance = 1; gfx_createTextObject(TS_CURRENT_PLANET, intermission_planets[game.stationedPlanet].name, - 135, screen->h - 120, FONT_WHITE); + 135, 0, FONT_WHITE); gfx_createTextObject(TS_DEST_PLANET, intermission_planets[game.destinationPlanet].name, - screen->w - 165, screen->h - 120, FONT_WHITE); + 85, 0, FONT_WHITE); section = 8; @@ -1488,12 +1488,12 @@ int intermission() if (intermission_showSystem(orbit_pos, 1)) { sprintf(string, "Destination: %s", intermission_planets[game.destinationPlanet].name); - gfx_createTextObject(TS_DEST_PLANET, string, screen->w - 250, screen->h - 120, FONT_WHITE); + gfx_createTextObject(TS_DEST_PLANET, string, 0, 0, FONT_WHITE); } - screen_blitTextInPlace(TS_CURRENT_PLANET); + screen_blitText(TS_CURRENT_PLANET, 0, screen->h - 120); if (game.stationedPlanet != game.destinationPlanet) - screen_blitTextInPlace(TS_DEST_PLANET); + screen_blitText(TS_DEST_PLANET, screen->w - 250, screen->h - 120); break; case 2: @@ -1534,9 +1534,9 @@ int intermission() intermission_showSystem(orbit_pos, 0); screen_blit(intermission_planets[game.stationedPlanet].image, 150, screen->h - 90); - screen_blitTextInPlace(TS_CURRENT_PLANET); + screen_blitText(TS_CURRENT_PLANET, 0, screen->h - 120); screen_blit(intermission_planets[game.destinationPlanet].image, screen->w - 150, screen->h - 90); - screen_blitTextInPlace(TS_DEST_PLANET); + screen_blitText(TS_DEST_PLANET, screen->w - 250, screen->h - 120); game.distanceCovered += distance * (screen->w - 350) / 450.; destRect.w = (int)game.distanceCovered; @@ -1549,7 +1549,7 @@ int intermission() player.shield = player.maxShield; sprintf(string, "Stationed At: %s", intermission_planets[game.stationedPlanet].name); - gfx_createTextObject(TS_CURRENT_PLANET, string, 90, screen->h - 120, FONT_WHITE); + gfx_createTextObject(TS_CURRENT_PLANET, string, 90, 0, FONT_WHITE); section = 1; redrawBackground = 1; save(0); diff --git a/src/screen.c b/src/screen.c index f36b3f2..97f6d91 100644 --- a/src/screen.c +++ b/src/screen.c @@ -169,8 +169,8 @@ void screen_adjustDimensions(int w, int h) else { // Tall screen - w = DEFAULT_SCREEN_WIDTH; h = (DEFAULT_SCREEN_WIDTH * h) / w; + w = DEFAULT_SCREEN_WIDTH; } // Free previous surface (if it exists)