1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-22 17:49:43 +01:00

Make language screen show up once more

Now that two new variants of Spanish have been added, it would be
a shame that many players from Latin-America/Argentina may stay on
Castilian or English because they don't realize the new versions
were added for them. So now, if you've set your language in 2.4.0,
the language screen will show up once more in 2.4.1. This is done by
simply incrementing the lang_set flag to 2 - so that if it's 0 or 1,
your language setting is considered to be possibly outdated.

This shouldn't inconvenience players who don't need to select a new
language - their existing language will still be pre-selected, so they
can just hit ACTION once.

Terry confirms he did the same thing with Dicey Dungeons and says
it's a good idea (and that nobody minds).
This commit is contained in:
Dav999 2024-02-08 03:35:05 +01:00 committed by Misa Elizabeth Kai
parent a301ef7c90
commit fbc3bd4d5a
4 changed files with 5 additions and 4 deletions

View file

@ -1142,7 +1142,7 @@ static void menuactionpress(void)
loc::languagelist_curlang = game.currentmenuoption; loc::languagelist_curlang = game.currentmenuoption;
loc::lang = loc::languagelist[game.currentmenuoption].code; loc::lang = loc::languagelist[game.currentmenuoption].code;
loc::loadtext(false); loc::loadtext(false);
loc::lang_set = true; loc::lang_set = loc::lang_set_current;
graphics.grphx.init_translations(); graphics.grphx.init_translations();
} }

View file

@ -11,7 +11,7 @@
namespace loc namespace loc
{ {
bool lang_set = false; int lang_set = 0;
bool pre_title_lang_menu = false; bool pre_title_lang_menu = false;
std::string lang = "en"; std::string lang = "en";

View file

@ -45,7 +45,8 @@ struct TextboxFormat
unsigned short padtowidth; // pad to X pixels (0 to disable) unsigned short padtowidth; // pad to X pixels (0 to disable)
}; };
extern bool lang_set; extern int lang_set;
static const int lang_set_current = 2;
extern bool pre_title_lang_menu; extern bool pre_title_lang_menu;
extern std::string lang; extern std::string lang;

View file

@ -674,7 +674,7 @@ int main(int argc, char *argv[])
game.gamestate = TITLEMODE; game.gamestate = TITLEMODE;
if (game.slowdown == 0) game.slowdown = 30; if (game.slowdown == 0) game.slowdown = 30;
if (!loc::lang_set && !loc::languagelist.empty()) if (loc::lang_set < loc::lang_set_current && !loc::languagelist.empty())
{ {
loc::pre_title_lang_menu = true; loc::pre_title_lang_menu = true;
game.gamestate = TITLEMODE; game.gamestate = TITLEMODE;