From 22f49db7b81eb20f26f4b80f1b93daab2ab4c1cf Mon Sep 17 00:00:00 2001 From: TerryCavanagh Date: Thu, 1 Feb 2024 20:02:06 +0100 Subject: [PATCH] don't apply linegap to certain special textboxes level complete, game complete and "You have rescued a crew member!" --- desktop_version/src/Game.cpp | 3 +++ desktop_version/src/Graphics.cpp | 6 ++++++ desktop_version/src/Graphics.h | 1 + 3 files changed, 10 insertions(+) diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp index ab08d0b2..0014ad91 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -698,6 +698,7 @@ void Game::levelcomplete_textbox(void) graphics.textboxprintflags(PR_FONT_8X8); graphics.textboxcenterx(); graphics.setimage(TEXTIMAGE_LEVELCOMPLETE); + graphics.setlinegap(0); } void Game::crewmate_textbox(const int color) @@ -727,6 +728,7 @@ void Game::crewmate_textbox(const int color) graphics.textboxpad(SDL_ceilf(5/spaces_per_8), SDL_ceilf(2/spaces_per_8)); graphics.textboxcenterx(); graphics.addsprite(14, 12 + extra_cjk_height/2, 0, color); + graphics.setlinegap(0); } void Game::remaining_textbox(void) @@ -2897,6 +2899,7 @@ void Game::updatestate(void) graphics.textboxprintflags(PR_FONT_8X8); graphics.textboxcenterx(); graphics.setimage(TEXTIMAGE_GAMECOMPLETE); + graphics.setlinegap(0); break; case 3502: { diff --git a/desktop_version/src/Graphics.cpp b/desktop_version/src/Graphics.cpp index 4d734798..721886c3 100644 --- a/desktop_version/src/Graphics.cpp +++ b/desktop_version/src/Graphics.cpp @@ -1506,6 +1506,12 @@ void Graphics::textboxadjust(void) textboxes[m].adjust(); } +void Graphics::setlinegap(int customvalue) +{ + textboxes[m].linegap = customvalue; + textboxes[m].resize(); +} + int Graphics::getlinegap(void) { // Don't use linegaps in custom levels, for now anyway diff --git a/desktop_version/src/Graphics.h b/desktop_version/src/Graphics.h index c47a9f63..7d02e9d8 100644 --- a/desktop_version/src/Graphics.h +++ b/desktop_version/src/Graphics.h @@ -65,6 +65,7 @@ public: void drawfade(void); + void setlinegap(int); int getlinegap(void); void createtextboxreal( const std::string& t,