mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-11-05 10:49:41 +01:00
Code Issues Releases Wiki Activity
VVVVVV/desktop_version/src/Render.cpp

3094 lines
120 KiB
C++
Raw Normal View History

Separate pressing Enter to open map from pressing Enter to interact This is a lot of copy-pasted code, but a little bit of copy-pasting never hurt anyone... The keybind to interact with activity zones and teleporters is now separate from the keybind to open the map, or return to the editor from in-editor playtesting, or restart a time trial. The keybind is now E, and the default controller bind is X. No controller button prompts, but the game didn't have controller button prompts anyways, so whatever. Doing this now because if people's muscle memory are going to be broken by not being able to spam the map keybind anymore, at least we can help a bit by changing the keybind so they can keep spamming it - their muscle memory is going to be broken anyways. This option has to be enabled by going to the speedrunner menu options and selecting "interact button". It is disabled by default. All prompt text needs to be string-interpolated every time they are drawn, because it is possible for people to change which interact button they use in the middle of gameplay, via the in-game options. Closes #736.
2021-04-19 08:23:44 +02:00
#include <SDL.h>
Add support for button glyph display This adds a function that converts an action (such as interacting in-game) to the corresponding button text ("ENTER", "E") or button glyph (PlayStation triangle, Steam Deck Y, etc). This function currently only gives the existing ENTERs or Es, because I don't know how best to detect controller usage, or whether the game is running on a Steam Deck, or what buttons need to be displayed there. Still, it should now be really easy to adapt the rendering of keyboard keys to consoles, controllers, or rebound keys. To identify the actions that currently need to be displayed, this commit also adds the initial enums for action sets as described by Ethan in a comment in #834 (Jan 18, 2022).
2023-03-18 22:30:16 +01:00
#include "ActionSets.h"
Replace ACTION in texts by {button} placeholders Gamepads and the Steam Deck need "ACTION" to be replaced by a controller glyph, so that's now possible.
2023-03-18 22:32:26 +01:00
#include "ButtonGlyphs.h"
Replace hardcoded temp buffer sizes with a named constant Constants.h will house constants like the screen size and others. But basically only the screen size for now. Now we don't have to type that "4 bytes per 40 chars (whole screen)" comment everywhere...
2021-09-13 06:39:07 +02:00
#include "Constants.h"
Separate includes into sections and alphabetize them Okay, so basically here's the include layout that this game now consistently uses: [The "main" header file, if any (e.g. Graphics.h for Graphics.cpp)] [blank line] [All system includes, such as tinyxml2/physfs/utfcpp/SDL] [blank line] [All project includes, such as Game.h/Entity.h/etc.] And if applicable, another blank line, and then some special-case include screwy stuff (take a look at editor.cpp or FileSystemUtils.cpp, for example, they have ifdefs and defines with their includes).
2020-07-19 21:43:29 +02:00
#include "Credits.h"
Rename editor.h to CustomLevels.h This accompanies the editor.cpp -> CustomLevels.cpp change; I'll be splitting out the editor functions in the next commit. The name of the include guard has been changed as well, but not anything else.
2021-02-20 08:19:09 +01:00
#include "CustomLevels.h"
Move all editor-specific attributes to a new editorclass This is a pretty hefty commit! But essentially, I made a new editorclass object, and moved all functions and variables that only get used in the in-game level editor to that class. This cleanly demarcates which things are in the editor and which things are just general custom level stuff. Then I fixed up all the callers. I also fixed up some NO_CUSTOM_LEVELS and NO_EDITOR ifdefs, too, in several places.
2021-02-21 00:40:11 +01:00
#include "Editor.h"
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
#include "Entity.h"
Separate includes into sections and alphabetize them Okay, so basically here's the include layout that this game now consistently uses: [The "main" header file, if any (e.g. Graphics.h for Graphics.cpp)] [blank line] [All system includes, such as tinyxml2/physfs/utfcpp/SDL] [blank line] [All project includes, such as Game.h/Entity.h/etc.] And if applicable, another blank line, and then some special-case include screwy stuff (take a look at editor.cpp or FileSystemUtils.cpp, for example, they have ifdefs and defines with their includes).
2020-07-19 21:43:29 +02:00
#include "FileSystemUtils.h"
Implement first font::print function, fix most fading of colored glyphs There has always been a mess of different print functions that all had slightly different specifics and called each other: Print(x, y, text, r, g, b, cen) nothing special here, just does what the arguments say PrintAlpha(x, y, text, r, g, b, a, cen) just Print but with an alpha argument PrintWrap(x, y, text, r, g, b, cen, linespacing, maxwidth) added for wordwrapping, heavily used now bprint(x, y, text, r, g, b, cen) prints an outline, then just PrintAlpha bprintalpha(x, y, text, r, g, b, a, cen) just bprint but with an alpha argument bigprint(x, y, text, r, g, b, cen, sc) nothing special here, just does what the arguments say bigbprint(x, y, text, r, g, b, cen, sc) prints an outline, then just bigprint bigrprint(x, y, text, r, g, b, cen, sc) right-aligns text, unless cen is given in which case it just centers text like other functions already do? bigbrprint(x, y, text, r, g, b, cen, sc) prints an outline, then just bigrprint We need even more specifics with the new font system: we need to be able to specify whether CJK characters should be vertically centered or stick out on the top/bottom, and we sometimes need to pass in brightness variables for colored glyphs. And text printing functions now fit better in Font.cpp anyway. So there's now a big overhaul of print functions: all these functions will be replaced by font::print and font::print_wrap (the former of which now exists). These take flags as their first argument, which can be 0 for a basic left-aligned print, PR_CEN for centered text (set X to -1!!!) PR_BOR for a border (instead of functions like bprint and bigbprint), PR_2X, PR_3X etc for scaling, and these can be combined with |. Some text, for example [Press ESC to return to editor], fades in/out using the alpha value, which is passed to the print function. In some other places (like Press ENTER to teleport, textboxes, trophy text...) text can fade in or out by direct changes to the RGB values. This means regular color-adjusted white text can change color, but colored button glyphs can't, since there's no way to know in the print system what the maximum RGB values of a specific textbox are supposed to be, so the only thing it can do is draw the button glyphs at full brightness, which looks bad. Therefore, you can now also pass in the brightness value via the flags, with PR_COLORGLYPH_BRI(255).
2023-01-06 04:43:21 +01:00
#include "Font.h"
Split glitchrunner mode into multiple versions Previously, turning glitchrunner mode on essentially locked you to emulating 2.0, and turning it off just meant normal 2.3 behavior. But what if you wanted 2.2 behavior instead? Well, that's what I had to ask when a TAS of mine would desync in 2.3 because of the two-frame delay fix (glitchrunner off), but would also desync because of 2.0 warp lines (glitchrunner on). What I've done is made it so there are three states to glitchrunner mode now: 2.0 (previously just the "on" state), 2.2 (previously a state you couldn't use), and "off". Furthermore, I made it an enum, so in case future versions of the game patch out more glitches, we can add them to the enum (and the only other thing we have to update is a lookup table in GlitchrunnerMode.c). Also, 2.2 glitches exist in 2.0, so you'll want to use GlitchrunnerMode_less_than_or_equal() to check glitchrunner version.
2021-08-05 02:09:49 +02:00
#include "GlitchrunnerMode.h"
Separate includes into sections and alphabetize them Okay, so basically here's the include layout that this game now consistently uses: [The "main" header file, if any (e.g. Graphics.h for Graphics.cpp)] [blank line] [All system includes, such as tinyxml2/physfs/utfcpp/SDL] [blank line] [All project includes, such as Game.h/Entity.h/etc.] And if applicable, another blank line, and then some special-case include screwy stuff (take a look at editor.cpp or FileSystemUtils.cpp, for example, they have ifdefs and defines with their includes).
2020-07-19 21:43:29 +02:00
#include "Graphics.h"
Outline text outline text and draw backing In order to help players spot the difference between outlined text and non-outlined text, we now outline the text outline text itself (if text outline is enabled, of course). But drawing the outline alone doesn't stand out enough, so we have to draw a solid backing against the text as well, in order to properly show the contrast.
2021-06-13 00:19:15 +02:00
#include "GraphicsUtil.h"
Optimize recompilation from changing commit hash This reworks how the commit hash and date are compiled so that if they're changed (and they're changed often), only one source file needs to be recompiled in order to update it everywhere in the game, no matter how many source files use the hash or date. The commit hash and date are now declared in InterimVersion.h (and they need `extern "C"` guards because otherwise it results in a link fail on MSVC because MSVC is stupid). To do this, what now happens is that upon every rebuild, InterimVersion.in.c is processed to create InterimVersion.out.c, then InterimVersion.out.c is compiled into its own static library that is then linked with VVVVVV. (Why didn't I just simply add it to the list of VVVVVV source files? Well, doing it _now_ does nothing because at that point the horse is already out of the barn, and the VVVVVV executable has already been declared, so I can't modify its sources. And I can't do it before either, because we depend on the VVVVVV executable existing to do the interim version logic. I could probably work around this by cleverly moving around lines, but that'd separate related logic from each other.) And yes, the naming convention has changed. Not only did I rename Version to InterimVersion (to clearly differentiate it from ReleaseVersion, which I'll be adding later), I also named the files InterimVersion.in.c and InterimVersion.out.c instead of InterimVersion.c.in and InterimVersion.c.out. I needed to put the file extension on the end because otherwise CMake wouldn't recognize what kind of language it is, and I mean like yeah duh of course it doesn't, my text editor doesn't recognize it either.
2022-08-23 06:21:23 +02:00
#include "InterimVersion.h"
Remove duplicate game.controllerSensitivity proxy It wasn't a direct duplicate of key.sensitivity, but it was still basically the same thing. Although to be fair, at least the case-switch conversion didn't get duplicated everywhere unlike game.slowdown. So now key.sensitivity functions the same as game.controllerSensitivity, and it only gets converted to its actual value whenever a joystick input happens in key.Poll(), unlike previously where it got converted every single frame on the title screen (there was even a comment that said "TODO bit wasteful doing this every poll").
2020-11-13 02:16:18 +01:00
#include "KeyPoll.h"
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
#include "Localization.h"
#include "LocalizationStorage.h"
Separate includes into sections and alphabetize them Okay, so basically here's the include layout that this game now consistently uses: [The "main" header file, if any (e.g. Graphics.h for Graphics.cpp)] [blank line] [All system includes, such as tinyxml2/physfs/utfcpp/SDL] [blank line] [All project includes, such as Game.h/Entity.h/etc.] And if applicable, another blank line, and then some special-case include screwy stuff (take a look at editor.cpp or FileSystemUtils.cpp, for example, they have ifdefs and defines with their includes).
2020-07-19 21:43:29 +02:00
#include "MakeAndPlay.h"
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
#include "Map.h"
Separate includes into sections and alphabetize them Okay, so basically here's the include layout that this game now consistently uses: [The "main" header file, if any (e.g. Graphics.h for Graphics.cpp)] [blank line] [All system includes, such as tinyxml2/physfs/utfcpp/SDL] [blank line] [All project includes, such as Game.h/Entity.h/etc.] And if applicable, another blank line, and then some special-case include screwy stuff (take a look at editor.cpp or FileSystemUtils.cpp, for example, they have ifdefs and defines with their includes).
2020-07-19 21:43:29 +02:00
#include "Maths.h"
Remove unnecessary includes from header files Including a header file inside another header file means a bunch of files are going to be unnecessarily recompiled whenever that inner header file is changed. So I minimized the amount of header files included in a header file, and only included the ones that were necessary (system includes don't count, I'm only talking about includes from within this project). Then the includes are only in the .cpp files themselves. This also minimizes problems such as a NO_CUSTOM_LEVELS build failing because some file depended on an include that got included in editor.h, which is another benefit of removing unnecessary includes from header files.
2020-07-19 21:05:41 +02:00
#include "Music.h"
De-duplicate release version I'm fine with putting the release version in a header file, thus necessitating the need to recompile every file that includes it if it's changed, simply because it's not supposed to be changed that often. The SDL_arraysize is necessary because sometimes we'll have subreleases (e.g. 2.4.1, 2.4.2, 2.4.3), and who knows, maybe we'll get to 2.10 someday.
2022-08-23 06:22:57 +02:00
#include "ReleaseVersion.h"
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
#include "RoomnameTranslator.h"
Extern `gameScreen`, remove `screenbuffer` I know earlier I removed the gameScreen extern in favor of using screenbuffer, but that was only to be consistent. After further consideration, I have found that it's actually really stupid. There's no reason to be accessing it through screenbuffer, and it's probably an artifact of 2.0-2.2 passing stack-allocated otherwise-global classes everywhere through function arguments. Also, it leads to stupid bugs where screenbuffer could potentially be NULL, which has already resulted in various annoying crashes in the past. Although those could be fixed by simply initializing screenbuffer at the very top of main(), but, why not just scrap the whole thing anyway? So that's what I'm doing. As a nice side effect, I've removed the transitive include of Screen.h from Graphics.h. This could've been done already since it only includes it for the pointer anyway, but it's still good to do it now.
2021-12-25 08:56:47 +01:00
#include "Screen.h"
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
#include "Script.h"
Separate includes into sections and alphabetize them Okay, so basically here's the include layout that this game now consistently uses: [The "main" header file, if any (e.g. Graphics.h for Graphics.cpp)] [blank line] [All system includes, such as tinyxml2/physfs/utfcpp/SDL] [blank line] [All project includes, such as Game.h/Entity.h/etc.] And if applicable, another blank line, and then some special-case include screwy stuff (take a look at editor.cpp or FileSystemUtils.cpp, for example, they have ifdefs and defines with their includes).
2020-07-19 21:43:29 +02:00
#include "UtilityClass.h"
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
#include "VFormat.h"
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Clean up unnecessary exports and add static keywords This patch cleans up unnecessary exports from header files (there were only a few), as well as adds the static keyword to all symbols that aren't exported and are specific to a file. This helps the linker out in not doing any unnecessary work, speeding it up and avoiding silent symbol conflicts (otherwise two symbols with the same name (and type/signature in C++) would quietly resolve as okay by the linker).
2021-01-10 18:14:37 +01:00
static int tr;
static int tg;
static int tb;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Apply suggestions from code review Co-authored-by: Misa Elizabeth Kai <infoteddy@infoteddy.info>
2022-11-30 19:31:36 +01:00
struct MapRenderData
{
Deduplicate map render data calcuations
2022-11-30 17:37:41 +01:00
int zoom;
int xoff;
int yoff;
int legendxoff;
int legendyoff;
};
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
static inline void drawslowdowntext(const int y)
Remove game.gameframerate as duplicate of game.slowdown game.gameframerate seems to exist for converting the value of game.slowdown into an actual timestep value, when really the timestep value should just use game.slowdown directly with a fast lookup table. Otherwise, there's a bunch of duplicated game.slowdown case-switches everywhere, which adds up to a large, annoying pile should the values be changed in the future. But now the duplicate variable has been removed, and with it, all the copy-pasted case-switches. Also, the game speed text rendering in Menu::accessibility and Menu::setslowdown has been factored out to a function and de-duplicated as well.
2020-11-13 02:05:18 +01:00
{
switch (game.slowdown)
{
case 30:
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, y, loc::gettext("Game speed is normal."), tr/2, tg/2, tb/2);
Remove game.gameframerate as duplicate of game.slowdown game.gameframerate seems to exist for converting the value of game.slowdown into an actual timestep value, when really the timestep value should just use game.slowdown directly with a fast lookup table. Otherwise, there's a bunch of duplicated game.slowdown case-switches everywhere, which adds up to a large, annoying pile should the values be changed in the future. But now the duplicate variable has been removed, and with it, all the copy-pasted case-switches. Also, the game speed text rendering in Menu::accessibility and Menu::setslowdown has been factored out to a function and de-duplicated as well.
2020-11-13 02:05:18 +01:00
break;
case 24:
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, y, loc::gettext("Game speed is at 80%"), tr, tg, tb);
Remove game.gameframerate as duplicate of game.slowdown game.gameframerate seems to exist for converting the value of game.slowdown into an actual timestep value, when really the timestep value should just use game.slowdown directly with a fast lookup table. Otherwise, there's a bunch of duplicated game.slowdown case-switches everywhere, which adds up to a large, annoying pile should the values be changed in the future. But now the duplicate variable has been removed, and with it, all the copy-pasted case-switches. Also, the game speed text rendering in Menu::accessibility and Menu::setslowdown has been factored out to a function and de-duplicated as well.
2020-11-13 02:05:18 +01:00
break;
case 18:
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, y, loc::gettext("Game speed is at 60%"), tr, tg, tb);
Remove game.gameframerate as duplicate of game.slowdown game.gameframerate seems to exist for converting the value of game.slowdown into an actual timestep value, when really the timestep value should just use game.slowdown directly with a fast lookup table. Otherwise, there's a bunch of duplicated game.slowdown case-switches everywhere, which adds up to a large, annoying pile should the values be changed in the future. But now the duplicate variable has been removed, and with it, all the copy-pasted case-switches. Also, the game speed text rendering in Menu::accessibility and Menu::setslowdown has been factored out to a function and de-duplicated as well.
2020-11-13 02:05:18 +01:00
break;
case 12:
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, y, loc::gettext("Game speed is at 40%"), tr, tg, tb);
Remove game.gameframerate as duplicate of game.slowdown game.gameframerate seems to exist for converting the value of game.slowdown into an actual timestep value, when really the timestep value should just use game.slowdown directly with a fast lookup table. Otherwise, there's a bunch of duplicated game.slowdown case-switches everywhere, which adds up to a large, annoying pile should the values be changed in the future. But now the duplicate variable has been removed, and with it, all the copy-pasted case-switches. Also, the game speed text rendering in Menu::accessibility and Menu::setslowdown has been factored out to a function and de-duplicated as well.
2020-11-13 02:05:18 +01:00
break;
}
}
Migrate more prints and graphics.len calls to font:: I especially focused on graphics.len and the print calls around them, because graphics.len calls appear a bit less often, might be overlooked when migrating print calls (thus possibly using different fonts by accident) and are often used for some kind of right-alignment or centering which can be changed into PR_RIGHT or PR_CEN with a different X anyway. Notably, I also added a new function to generate these kinds of sliders: ....[]............ Different languages means that the slider for analogue stick sensitivity needs to be longer to fit possibly long words for Low/Medium/High, and then different font sizes means that the longer slider won't fit onscreen in a language that needs a 12-wide font. So slider_get() can take a "target width", which dynamically changes the number of characters depending on the width of them in the interface font. I kinda forgot that I could force the 8x8 font instead of adapting the characters in the slider to the font, and other ideas (like using different characters or a more graphical progress bar) have been brought up on Discord, so this might all change again sooner or later.
2023-01-16 21:29:50 +01:00
static void slider_get(char* buffer, size_t buffer_len, int position, int n_positions, int target_width)
Implement music and sound volume sliders This adds music and volume sliders to the audio options. To use the sliders, you navigate to the given option, then press ACTION, and your selection will be transferred to the slider. Pressing left or right will move the slider accordingly. Then you can press ACTION to confirm the volume is what you want and deselect it, or you can press Esc to cancel the volume change, and it will revert to the previous volume; both actions will write your settings to disk. Most of this commit is just adding infrastructure to support having sliders in menus (without copy-pasting code), which is a totally completely new user interface that has never been used before in this game. If we're going to be adding something new, I want to make sure that it at least is done the RIGHT way. Closes #706.
2021-04-12 02:43:17 +02:00
{
Migrate more prints and graphics.len calls to font:: I especially focused on graphics.len and the print calls around them, because graphics.len calls appear a bit less often, might be overlooked when migrating print calls (thus possibly using different fonts by accident) and are often used for some kind of right-alignment or centering which can be changed into PR_RIGHT or PR_CEN with a different X anyway. Notably, I also added a new function to generate these kinds of sliders: ....[]............ Different languages means that the slider for analogue stick sensitivity needs to be longer to fit possibly long words for Low/Medium/High, and then different font sizes means that the longer slider won't fit onscreen in a language that needs a 12-wide font. So slider_get() can take a "target width", which dynamically changes the number of characters depending on the width of them in the interface font. I kinda forgot that I could force the 8x8 font instead of adapting the characters in the slider to the font, and other ideas (like using different characters or a more graphical progress bar) have been brought up on Discord, so this might all change again sooner or later.
2023-01-16 21:29:50 +01:00
/* Print a slider to the buffer for target_width in pixels.
*
* <--target w-->
* []............
* ......[]......
* ............[]
* ^^^^^^ dots_per_position=6
* ^^^^^^^^^^^^^^ max_chars=14
*/
if (n_positions < 2 || position < 0 || position >= n_positions)
{
buffer[0] = '\0';
return;
}
Implement music and sound volume sliders This adds music and volume sliders to the audio options. To use the sliders, you navigate to the given option, then press ACTION, and your selection will be transferred to the slider. Pressing left or right will move the slider accordingly. Then you can press ACTION to confirm the volume is what you want and deselect it, or you can press Esc to cancel the volume change, and it will revert to the previous volume; both actions will write your settings to disk. Most of this commit is just adding infrastructure to support having sliders in menus (without copy-pasting code), which is a totally completely new user interface that has never been used before in this game. If we're going to be adding something new, I want to make sure that it at least is done the RIGHT way. Closes #706.
2021-04-12 02:43:17 +02:00
Migrate more prints and graphics.len calls to font:: I especially focused on graphics.len and the print calls around them, because graphics.len calls appear a bit less often, might be overlooked when migrating print calls (thus possibly using different fonts by accident) and are often used for some kind of right-alignment or centering which can be changed into PR_RIGHT or PR_CEN with a different X anyway. Notably, I also added a new function to generate these kinds of sliders: ....[]............ Different languages means that the slider for analogue stick sensitivity needs to be longer to fit possibly long words for Low/Medium/High, and then different font sizes means that the longer slider won't fit onscreen in a language that needs a 12-wide font. So slider_get() can take a "target width", which dynamically changes the number of characters depending on the width of them in the interface font. I kinda forgot that I could force the 8x8 font instead of adapting the characters in the slider to the font, and other ideas (like using different characters or a more graphical progress bar) have been brought up on Discord, so this might all change again sooner or later.
2023-01-16 21:29:50 +01:00
int max_chars = ((target_width - font::len(0, "[]")) / font::len(0, ".")) + 2;
max_chars = SDL_min(max_chars, buffer_len-1);
Implement music and sound volume sliders This adds music and volume sliders to the audio options. To use the sliders, you navigate to the given option, then press ACTION, and your selection will be transferred to the slider. Pressing left or right will move the slider accordingly. Then you can press ACTION to confirm the volume is what you want and deselect it, or you can press Esc to cancel the volume change, and it will revert to the previous volume; both actions will write your settings to disk. Most of this commit is just adding infrastructure to support having sliders in menus (without copy-pasting code), which is a totally completely new user interface that has never been used before in this game. If we're going to be adding something new, I want to make sure that it at least is done the RIGHT way. Closes #706.
2021-04-12 02:43:17 +02:00
Migrate more prints and graphics.len calls to font:: I especially focused on graphics.len and the print calls around them, because graphics.len calls appear a bit less often, might be overlooked when migrating print calls (thus possibly using different fonts by accident) and are often used for some kind of right-alignment or centering which can be changed into PR_RIGHT or PR_CEN with a different X anyway. Notably, I also added a new function to generate these kinds of sliders: ....[]............ Different languages means that the slider for analogue stick sensitivity needs to be longer to fit possibly long words for Low/Medium/High, and then different font sizes means that the longer slider won't fit onscreen in a language that needs a 12-wide font. So slider_get() can take a "target width", which dynamically changes the number of characters depending on the width of them in the interface font. I kinda forgot that I could force the 8x8 font instead of adapting the characters in the slider to the font, and other ideas (like using different characters or a more graphical progress bar) have been brought up on Discord, so this might all change again sooner or later.
2023-01-16 21:29:50 +01:00
int dots_per_position = (max_chars-2) / (n_positions-1);
max_chars = dots_per_position * (n_positions-1) + 2;
Implement music and sound volume sliders This adds music and volume sliders to the audio options. To use the sliders, you navigate to the given option, then press ACTION, and your selection will be transferred to the slider. Pressing left or right will move the slider accordingly. Then you can press ACTION to confirm the volume is what you want and deselect it, or you can press Esc to cancel the volume change, and it will revert to the previous volume; both actions will write your settings to disk. Most of this commit is just adding infrastructure to support having sliders in menus (without copy-pasting code), which is a totally completely new user interface that has never been used before in this game. If we're going to be adding something new, I want to make sure that it at least is done the RIGHT way. Closes #706.
2021-04-12 02:43:17 +02:00
Migrate more prints and graphics.len calls to font:: I especially focused on graphics.len and the print calls around them, because graphics.len calls appear a bit less often, might be overlooked when migrating print calls (thus possibly using different fonts by accident) and are often used for some kind of right-alignment or centering which can be changed into PR_RIGHT or PR_CEN with a different X anyway. Notably, I also added a new function to generate these kinds of sliders: ....[]............ Different languages means that the slider for analogue stick sensitivity needs to be longer to fit possibly long words for Low/Medium/High, and then different font sizes means that the longer slider won't fit onscreen in a language that needs a 12-wide font. So slider_get() can take a "target width", which dynamically changes the number of characters depending on the width of them in the interface font. I kinda forgot that I could force the 8x8 font instead of adapting the characters in the slider to the font, and other ideas (like using different characters or a more graphical progress bar) have been brought up on Discord, so this might all change again sooner or later.
2023-01-16 21:29:50 +01:00
VVV_fillstring(buffer, max_chars+1, '.');
if (dots_per_position<1)
{
return;
}
Implement music and sound volume sliders This adds music and volume sliders to the audio options. To use the sliders, you navigate to the given option, then press ACTION, and your selection will be transferred to the slider. Pressing left or right will move the slider accordingly. Then you can press ACTION to confirm the volume is what you want and deselect it, or you can press Esc to cancel the volume change, and it will revert to the previous volume; both actions will write your settings to disk. Most of this commit is just adding infrastructure to support having sliders in menus (without copy-pasting code), which is a totally completely new user interface that has never been used before in this game. If we're going to be adding something new, I want to make sure that it at least is done the RIGHT way. Closes #706.
2021-04-12 02:43:17 +02:00
Migrate more prints and graphics.len calls to font:: I especially focused on graphics.len and the print calls around them, because graphics.len calls appear a bit less often, might be overlooked when migrating print calls (thus possibly using different fonts by accident) and are often used for some kind of right-alignment or centering which can be changed into PR_RIGHT or PR_CEN with a different X anyway. Notably, I also added a new function to generate these kinds of sliders: ....[]............ Different languages means that the slider for analogue stick sensitivity needs to be longer to fit possibly long words for Low/Medium/High, and then different font sizes means that the longer slider won't fit onscreen in a language that needs a 12-wide font. So slider_get() can take a "target width", which dynamically changes the number of characters depending on the width of them in the interface font. I kinda forgot that I could force the 8x8 font instead of adapting the characters in the slider to the font, and other ideas (like using different characters or a more graphical progress bar) have been brought up on Discord, so this might all change again sooner or later.
2023-01-16 21:29:50 +01:00
int handle_idx = position*dots_per_position;
buffer[handle_idx] = '[';
buffer[handle_idx+1] = ']';
}
static void volumesliderrender(void)
{
int volume_max_position = USER_VOLUME_MAX / USER_VOLUME_STEP;
Implement music and sound volume sliders This adds music and volume sliders to the audio options. To use the sliders, you navigate to the given option, then press ACTION, and your selection will be transferred to the slider. Pressing left or right will move the slider accordingly. Then you can press ACTION to confirm the volume is what you want and deselect it, or you can press Esc to cancel the volume change, and it will revert to the previous volume; both actions will write your settings to disk. Most of this commit is just adding infrastructure to support having sliders in menus (without copy-pasting code), which is a totally completely new user interface that has never been used before in this game. If we're going to be adding something new, I want to make sure that it at least is done the RIGHT way. Closes #706.
2021-04-12 02:43:17 +02:00
Migrate more prints and graphics.len calls to font:: I especially focused on graphics.len and the print calls around them, because graphics.len calls appear a bit less often, might be overlooked when migrating print calls (thus possibly using different fonts by accident) and are often used for some kind of right-alignment or centering which can be changed into PR_RIGHT or PR_CEN with a different X anyway. Notably, I also added a new function to generate these kinds of sliders: ....[]............ Different languages means that the slider for analogue stick sensitivity needs to be longer to fit possibly long words for Low/Medium/High, and then different font sizes means that the longer slider won't fit onscreen in a language that needs a 12-wide font. So slider_get() can take a "target width", which dynamically changes the number of characters depending on the width of them in the interface font. I kinda forgot that I could force the 8x8 font instead of adapting the characters in the slider to the font, and other ideas (like using different characters or a more graphical progress bar) have been brought up on Discord, so this might all change again sooner or later.
2023-01-16 21:29:50 +01:00
int volume;
Implement music and sound volume sliders This adds music and volume sliders to the audio options. To use the sliders, you navigate to the given option, then press ACTION, and your selection will be transferred to the slider. Pressing left or right will move the slider accordingly. Then you can press ACTION to confirm the volume is what you want and deselect it, or you can press Esc to cancel the volume change, and it will revert to the previous volume; both actions will write your settings to disk. Most of this commit is just adding infrastructure to support having sliders in menus (without copy-pasting code), which is a totally completely new user interface that has never been used before in this game. If we're going to be adding something new, I want to make sure that it at least is done the RIGHT way. Closes #706.
2021-04-12 02:43:17 +02:00
switch (game.currentmenuoption)
{
case 0:
Migrate more prints and graphics.len calls to font:: I especially focused on graphics.len and the print calls around them, because graphics.len calls appear a bit less often, might be overlooked when migrating print calls (thus possibly using different fonts by accident) and are often used for some kind of right-alignment or centering which can be changed into PR_RIGHT or PR_CEN with a different X anyway. Notably, I also added a new function to generate these kinds of sliders: ....[]............ Different languages means that the slider for analogue stick sensitivity needs to be longer to fit possibly long words for Low/Medium/High, and then different font sizes means that the longer slider won't fit onscreen in a language that needs a 12-wide font. So slider_get() can take a "target width", which dynamically changes the number of characters depending on the width of them in the interface font. I kinda forgot that I could force the 8x8 font instead of adapting the characters in the slider to the font, and other ideas (like using different characters or a more graphical progress bar) have been brought up on Discord, so this might all change again sooner or later.
2023-01-16 21:29:50 +01:00
volume = music.user_music_volume;
Implement music and sound volume sliders This adds music and volume sliders to the audio options. To use the sliders, you navigate to the given option, then press ACTION, and your selection will be transferred to the slider. Pressing left or right will move the slider accordingly. Then you can press ACTION to confirm the volume is what you want and deselect it, or you can press Esc to cancel the volume change, and it will revert to the previous volume; both actions will write your settings to disk. Most of this commit is just adding infrastructure to support having sliders in menus (without copy-pasting code), which is a totally completely new user interface that has never been used before in this game. If we're going to be adding something new, I want to make sure that it at least is done the RIGHT way. Closes #706.
2021-04-12 02:43:17 +02:00
break;
case 1:
Migrate more prints and graphics.len calls to font:: I especially focused on graphics.len and the print calls around them, because graphics.len calls appear a bit less often, might be overlooked when migrating print calls (thus possibly using different fonts by accident) and are often used for some kind of right-alignment or centering which can be changed into PR_RIGHT or PR_CEN with a different X anyway. Notably, I also added a new function to generate these kinds of sliders: ....[]............ Different languages means that the slider for analogue stick sensitivity needs to be longer to fit possibly long words for Low/Medium/High, and then different font sizes means that the longer slider won't fit onscreen in a language that needs a 12-wide font. So slider_get() can take a "target width", which dynamically changes the number of characters depending on the width of them in the interface font. I kinda forgot that I could force the 8x8 font instead of adapting the characters in the slider to the font, and other ideas (like using different characters or a more graphical progress bar) have been brought up on Discord, so this might all change again sooner or later.
2023-01-16 21:29:50 +01:00
volume = music.user_sound_volume;
Implement music and sound volume sliders This adds music and volume sliders to the audio options. To use the sliders, you navigate to the given option, then press ACTION, and your selection will be transferred to the slider. Pressing left or right will move the slider accordingly. Then you can press ACTION to confirm the volume is what you want and deselect it, or you can press Esc to cancel the volume change, and it will revert to the previous volume; both actions will write your settings to disk. Most of this commit is just adding infrastructure to support having sliders in menus (without copy-pasting code), which is a totally completely new user interface that has never been used before in this game. If we're going to be adding something new, I want to make sure that it at least is done the RIGHT way. Closes #706.
2021-04-12 02:43:17 +02:00
break;
default:
SDL_assert(0 && "Unhandled volume slider menu option!");
return;
}
Migrate more prints and graphics.len calls to font:: I especially focused on graphics.len and the print calls around them, because graphics.len calls appear a bit less often, might be overlooked when migrating print calls (thus possibly using different fonts by accident) and are often used for some kind of right-alignment or centering which can be changed into PR_RIGHT or PR_CEN with a different X anyway. Notably, I also added a new function to generate these kinds of sliders: ....[]............ Different languages means that the slider for analogue stick sensitivity needs to be longer to fit possibly long words for Low/Medium/High, and then different font sizes means that the longer slider won't fit onscreen in a language that needs a 12-wide font. So slider_get() can take a "target width", which dynamically changes the number of characters depending on the width of them in the interface font. I kinda forgot that I could force the 8x8 font instead of adapting the characters in the slider to the font, and other ideas (like using different characters or a more graphical progress bar) have been brought up on Discord, so this might all change again sooner or later.
2023-01-16 21:29:50 +01:00
char slider[40 + 1];
slider_get(slider, sizeof(slider), volume_max_position*volume/USER_VOLUME_MAX, volume_max_position+1, 240);
Implement music and sound volume sliders This adds music and volume sliders to the audio options. To use the sliders, you navigate to the given option, then press ACTION, and your selection will be transferred to the slider. Pressing left or right will move the slider accordingly. Then you can press ACTION to confirm the volume is what you want and deselect it, or you can press Esc to cancel the volume change, and it will revert to the previous volume; both actions will write your settings to disk. Most of this commit is just adding infrastructure to support having sliders in menus (without copy-pasting code), which is a totally completely new user interface that has never been used before in this game. If we're going to be adding something new, I want to make sure that it at least is done the RIGHT way. Closes #706.
2021-04-12 02:43:17 +02:00
Migrate more prints and graphics.len calls to font:: I especially focused on graphics.len and the print calls around them, because graphics.len calls appear a bit less often, might be overlooked when migrating print calls (thus possibly using different fonts by accident) and are often used for some kind of right-alignment or centering which can be changed into PR_RIGHT or PR_CEN with a different X anyway. Notably, I also added a new function to generate these kinds of sliders: ....[]............ Different languages means that the slider for analogue stick sensitivity needs to be longer to fit possibly long words for Low/Medium/High, and then different font sizes means that the longer slider won't fit onscreen in a language that needs a 12-wide font. So slider_get() can take a "target width", which dynamically changes the number of characters depending on the width of them in the interface font. I kinda forgot that I could force the 8x8 font instead of adapting the characters in the slider to the font, and other ideas (like using different characters or a more graphical progress bar) have been brought up on Discord, so this might all change again sooner or later.
2023-01-16 21:29:50 +01:00
char buffer[SCREEN_WIDTH_CHARS + 1];
Implement music and sound volume sliders This adds music and volume sliders to the audio options. To use the sliders, you navigate to the given option, then press ACTION, and your selection will be transferred to the slider. Pressing left or right will move the slider accordingly. Then you can press ACTION to confirm the volume is what you want and deselect it, or you can press Esc to cancel the volume change, and it will revert to the previous volume; both actions will write your settings to disk. Most of this commit is just adding infrastructure to support having sliders in menus (without copy-pasting code), which is a totally completely new user interface that has never been used before in this game. If we're going to be adding something new, I want to make sure that it at least is done the RIGHT way. Closes #706.
2021-04-12 02:43:17 +02:00
if (game.slidermode == SLIDER_NONE)
{
SDL_strlcpy(buffer, slider, sizeof(buffer));
}
else
{
/* Draw selection brackets. */
Render.cpp: make remaining strings translatable This mainly adds loc::gettext calls. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-31 02:04:35 +01:00
vformat_buf(buffer, sizeof(buffer), loc::get_langmeta()->menu_select.c_str(), "label:str", slider);
Implement music and sound volume sliders This adds music and volume sliders to the audio options. To use the sliders, you navigate to the given option, then press ACTION, and your selection will be transferred to the slider. Pressing left or right will move the slider accordingly. Then you can press ACTION to confirm the volume is what you want and deselect it, or you can press Esc to cancel the volume change, and it will revert to the previous volume; both actions will write your settings to disk. Most of this commit is just adding infrastructure to support having sliders in menus (without copy-pasting code), which is a totally completely new user interface that has never been used before in this game. If we're going to be adding something new, I want to make sure that it at least is done the RIGHT way. Closes #706.
2021-04-12 02:43:17 +02:00
}
Migrate more prints and graphics.len calls to font:: I especially focused on graphics.len and the print calls around them, because graphics.len calls appear a bit less often, might be overlooked when migrating print calls (thus possibly using different fonts by accident) and are often used for some kind of right-alignment or centering which can be changed into PR_RIGHT or PR_CEN with a different X anyway. Notably, I also added a new function to generate these kinds of sliders: ....[]............ Different languages means that the slider for analogue stick sensitivity needs to be longer to fit possibly long words for Low/Medium/High, and then different font sizes means that the longer slider won't fit onscreen in a language that needs a 12-wide font. So slider_get() can take a "target width", which dynamically changes the number of characters depending on the width of them in the interface font. I kinda forgot that I could force the 8x8 font instead of adapting the characters in the slider to the font, and other ideas (like using different characters or a more graphical progress bar) have been brought up on Discord, so this might all change again sooner or later.
2023-01-16 21:29:50 +01:00
font::print(PR_CEN, -1, 95, buffer, tr, tg, tb);
Implement music and sound volume sliders This adds music and volume sliders to the audio options. To use the sliders, you navigate to the given option, then press ACTION, and your selection will be transferred to the slider. Pressing left or right will move the slider accordingly. Then you can press ACTION to confirm the volume is what you want and deselect it, or you can press Esc to cancel the volume change, and it will revert to the previous volume; both actions will write your settings to disk. Most of this commit is just adding infrastructure to support having sliders in menus (without copy-pasting code), which is a totally completely new user interface that has never been used before in this game. If we're going to be adding something new, I want to make sure that it at least is done the RIGHT way. Closes #706.
2021-04-12 02:43:17 +02:00
}
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
static void inline drawglitchrunnertext(const int y)
Split glitchrunner mode into multiple versions Previously, turning glitchrunner mode on essentially locked you to emulating 2.0, and turning it off just meant normal 2.3 behavior. But what if you wanted 2.2 behavior instead? Well, that's what I had to ask when a TAS of mine would desync in 2.3 because of the two-frame delay fix (glitchrunner off), but would also desync because of 2.0 warp lines (glitchrunner on). What I've done is made it so there are three states to glitchrunner mode now: 2.0 (previously just the "on" state), 2.2 (previously a state you couldn't use), and "off". Furthermore, I made it an enum, so in case future versions of the game patch out more glitches, we can add them to the enum (and the only other thing we have to update is a lookup table in GlitchrunnerMode.c). Also, 2.2 glitches exist in 2.0, so you'll want to use GlitchrunnerMode_less_than_or_equal() to check glitchrunner version.
2021-08-05 02:09:49 +02:00
{
int tempr = tr;
int tempg = tg;
int tempb = tb;
Replace hardcoded temp buffer sizes with a named constant Constants.h will house constants like the screen size and others. But basically only the screen size for now. Now we don't have to type that "4 bytes per 40 chars (whole screen)" comment everywhere...
2021-09-13 06:39:07 +02:00
char buffer[SCREEN_WIDTH_CHARS + 1];
Split glitchrunner mode into multiple versions Previously, turning glitchrunner mode on essentially locked you to emulating 2.0, and turning it off just meant normal 2.3 behavior. But what if you wanted 2.2 behavior instead? Well, that's what I had to ask when a TAS of mine would desync in 2.3 because of the two-frame delay fix (glitchrunner off), but would also desync because of 2.0 warp lines (glitchrunner on). What I've done is made it so there are three states to glitchrunner mode now: 2.0 (previously just the "on" state), 2.2 (previously a state you couldn't use), and "off". Furthermore, I made it an enum, so in case future versions of the game patch out more glitches, we can add them to the enum (and the only other thing we have to update is a lookup table in GlitchrunnerMode.c). Also, 2.2 glitches exist in 2.0, so you'll want to use GlitchrunnerMode_less_than_or_equal() to check glitchrunner version.
2021-08-05 02:09:49 +02:00
const enum GlitchrunnerMode mode = GlitchrunnerMode_get();
if (mode == GlitchrunnerNone)
{
tempr /= 2;
tempg /= 2;
tempb /= 2;
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
SDL_strlcpy(buffer, loc::gettext("Glitchrunner mode is OFF"), sizeof(buffer));
Split glitchrunner mode into multiple versions Previously, turning glitchrunner mode on essentially locked you to emulating 2.0, and turning it off just meant normal 2.3 behavior. But what if you wanted 2.2 behavior instead? Well, that's what I had to ask when a TAS of mine would desync in 2.3 because of the two-frame delay fix (glitchrunner off), but would also desync because of 2.0 warp lines (glitchrunner on). What I've done is made it so there are three states to glitchrunner mode now: 2.0 (previously just the "on" state), 2.2 (previously a state you couldn't use), and "off". Furthermore, I made it an enum, so in case future versions of the game patch out more glitches, we can add them to the enum (and the only other thing we have to update is a lookup table in GlitchrunnerMode.c). Also, 2.2 glitches exist in 2.0, so you'll want to use GlitchrunnerMode_less_than_or_equal() to check glitchrunner version.
2021-08-05 02:09:49 +02:00
}
else
{
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
const char* mode_string = loc::gettext(GlitchrunnerMode_enum_to_string(mode));
vformat_buf(buffer, sizeof(buffer), loc::gettext("Glitchrunner mode is {version}"), "version:str", mode_string);
Split glitchrunner mode into multiple versions Previously, turning glitchrunner mode on essentially locked you to emulating 2.0, and turning it off just meant normal 2.3 behavior. But what if you wanted 2.2 behavior instead? Well, that's what I had to ask when a TAS of mine would desync in 2.3 because of the two-frame delay fix (glitchrunner off), but would also desync because of 2.0 warp lines (glitchrunner on). What I've done is made it so there are three states to glitchrunner mode now: 2.0 (previously just the "on" state), 2.2 (previously a state you couldn't use), and "off". Furthermore, I made it an enum, so in case future versions of the game patch out more glitches, we can add them to the enum (and the only other thing we have to update is a lookup table in GlitchrunnerMode.c). Also, 2.2 glitches exist in 2.0, so you'll want to use GlitchrunnerMode_less_than_or_equal() to check glitchrunner version.
2021-08-05 02:09:49 +02:00
}
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, y, buffer, tempr, tempg, tempb);
Split glitchrunner mode into multiple versions Previously, turning glitchrunner mode on essentially locked you to emulating 2.0, and turning it off just meant normal 2.3 behavior. But what if you wanted 2.2 behavior instead? Well, that's what I had to ask when a TAS of mine would desync in 2.3 because of the two-frame delay fix (glitchrunner off), but would also desync because of 2.0 warp lines (glitchrunner on). What I've done is made it so there are three states to glitchrunner mode now: 2.0 (previously just the "on" state), 2.2 (previously a state you couldn't use), and "off". Furthermore, I made it an enum, so in case future versions of the game patch out more glitches, we can add them to the enum (and the only other thing we have to update is a lookup table in GlitchrunnerMode.c). Also, 2.2 glitches exist in 2.0, so you'll want to use GlitchrunnerMode_less_than_or_equal() to check glitchrunner version.
2021-08-05 02:09:49 +02:00
}
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 23:23:59 +01:00
static void menurender(void)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
switch (game.currentmenuname)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
case Menu::mainmenu:
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
{
Fix up temporary variables being in topmost scope and bad style This makes it so temporary variables have their scopes reduced (if possible). I also didn't hesitate to fix style issues, such as their names ("temp" is such a bad name), making them const if possible, and any code it touched too.
2022-12-30 07:23:48 +01:00
const int temp = 50;
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.draw_sprite((160 - 96) + 0 * 32, temp, 23, tr, tg, tb);
graphics.draw_sprite((160 - 96) + 1 * 32, temp, 23, tr, tg, tb);
graphics.draw_sprite((160 - 96) + 2 * 32, temp, 23, tr, tg, tb);
graphics.draw_sprite((160 - 96) + 3 * 32, temp, 23, tr, tg, tb);
graphics.draw_sprite((160 - 96) + 4 * 32, temp, 23, tr, tg, tb);
graphics.draw_sprite((160 - 96) + 5 * 32, temp, 23, tr, tg, tb);
Fix mixed indentation in titlerender.cpp There's a lot, looks like mainly because of the person who added MMMMMM and M&P.
2020-04-02 23:19:15 +02:00
#if defined(MAKEANDPLAY)
Migrate more prints and graphics.len calls to font:: I especially focused on graphics.len and the print calls around them, because graphics.len calls appear a bit less often, might be overlooked when migrating print calls (thus possibly using different fonts by accident) and are often used for some kind of right-alignment or centering which can be changed into PR_RIGHT or PR_CEN with a different X anyway. Notably, I also added a new function to generate these kinds of sliders: ....[]............ Different languages means that the slider for analogue stick sensitivity needs to be longer to fit possibly long words for Low/Medium/High, and then different font sizes means that the longer slider won't fit onscreen in a language that needs a 12-wide font. So slider_get() can take a "target width", which dynamically changes the number of characters depending on the width of them in the interface font. I kinda forgot that I could force the 8x8 font instead of adapting the characters in the slider to the font, and other ideas (like using different characters or a more graphical progress bar) have been brought up on Discord, so this might all change again sooner or later.
2023-01-16 21:29:50 +01:00
font::print(PR_RIGHT, 264, temp+35, loc::gettext("MAKE AND PLAY EDITION"), tr, tg, tb);
Add commit hash and date to title screen The commit hash and date are now shown above the version number in the bottom-right of the title screen. They both automatically go away when compiled in release mode. https://cdn.discordapp.com/attachments/717089363896434719/779525976689213480/vvvvvv_with_interim_commit_and_date.png This is useful to easily figure out which commit someone is on whenever they report an issue, without having to ask them to do `git show` or whatever.
2020-11-21 02:58:28 +01:00
#endif
Optimize recompilation from changing commit hash This reworks how the commit hash and date are compiled so that if they're changed (and they're changed often), only one source file needs to be recompiled in order to update it everywhere in the game, no matter how many source files use the hash or date. The commit hash and date are now declared in InterimVersion.h (and they need `extern "C"` guards because otherwise it results in a link fail on MSVC because MSVC is stupid). To do this, what now happens is that upon every rebuild, InterimVersion.in.c is processed to create InterimVersion.out.c, then InterimVersion.out.c is compiled into its own static library that is then linked with VVVVVV. (Why didn't I just simply add it to the list of VVVVVV source files? Well, doing it _now_ does nothing because at that point the horse is already out of the barn, and the VVVVVV executable has already been declared, so I can't modify its sources. And I can't do it before either, because we depend on the VVVVVV executable existing to do the interim version logic. I could probably work around this by cleverly moving around lines, but that'd separate related logic from each other.) And yes, the naming convention has changed. Not only did I rename Version to InterimVersion (to clearly differentiate it from ReleaseVersion, which I'll be adding later), I also named the files InterimVersion.in.c and InterimVersion.out.c instead of InterimVersion.c.in and InterimVersion.c.out. I needed to put the file extension on the end because otherwise CMake wouldn't recognize what kind of language it is, and I mean like yeah duh of course it doesn't, my text editor doesn't recognize it either.
2022-08-23 06:21:23 +02:00
#ifdef INTERIM_VERSION_EXISTS
Use PR_RIGHT for interim version info in main menu This used some constants counting numbers of characters (LEN_INTERIM_COMMIT and LEN_BRANCH_NAME) and even an SDL_arraysize, all multiplied by 8, to get the length of the displayed text. Now it just uses the new PR_RIGHT flag of font::print. I did also force the 8x8 font for all the interim information, since the date kinda overlapped with the menu options... And all of these lines only show up in interim versions anyway, except for the version number - which is left in the interface font for consistency with the rest of the menu in non-interim versions. The inconsistency in interim versions doesn't really matter all that much I think, it's just some technical/debug info.
2023-01-17 04:47:17 +01:00
font::print(PR_RIGHT | PR_FONT_8X8, 310, 200, COMMIT_DATE, tr/2, tg/2, tb/2);
font::print(PR_RIGHT | PR_FONT_8X8, 310, 210, INTERIM_COMMIT, tr/2, tg/2, tb/2);
font::print(PR_RIGHT | PR_FONT_8X8, 310, 220, BRANCH_NAME, tr/2, tg/2, tb/2);
Fix mixed indentation in titlerender.cpp There's a lot, looks like mainly because of the person who added MMMMMM and M&P.
2020-04-02 23:19:15 +02:00
#endif
Use PR_RIGHT for interim version info in main menu This used some constants counting numbers of characters (LEN_INTERIM_COMMIT and LEN_BRANCH_NAME) and even an SDL_arraysize, all multiplied by 8, to get the length of the displayed text. Now it just uses the new PR_RIGHT flag of font::print. I did also force the 8x8 font for all the interim information, since the date kinda overlapped with the menu options... And all of these lines only show up in interim versions anyway, except for the version number - which is left in the interface font for consistency with the rest of the menu in non-interim versions. The inconsistency in interim versions doesn't really matter all that much I think, it's just some technical/debug info.
2023-01-17 04:47:17 +01:00
font::print(PR_RIGHT, 310, 230, RELEASE_VERSION, tr/2, tg/2, tb/2);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
if(music.mmmmmm){
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(0, 10, 230, loc::gettext("[MMMMMM Mod Installed]"), tr/2, tg/2, tb/2);
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
}
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
#if !defined(NO_CUSTOM_LEVELS)
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
case Menu::levellist:
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Fix indentation style of case Menu::levellist in menurender This is one of the few places still using 2-space indentation instead of 4 spaces, and it makes it very annoying to work with when your tab key inserts four spaces - so I could either just mimic it for the time being, or I could just fix it while I was at it.
2023-01-20 20:50:11 +01:00
if (cl.ListOfMetaData.size()==0)
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 90, loc::gettext("ERROR: No levels found."), tr, tg, tb);
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
}
Fix indentation style of case Menu::levellist in menurender This is one of the few places still using 2-space indentation instead of 4 spaces, and it makes it very annoying to work with when your tab key inserts four spaces - so I could either just mimic it for the time being, or I could just fix it while I was at it.
2023-01-20 20:50:11 +01:00
int tmp=game.currentmenuoption+(game.levelpage*8);
if (INBOUNDS_VEC(tmp, cl.ListOfMetaData))
{
const bool nextlastoptions = cl.ListOfMetaData.size() > 8;
//Don't show next/previous page or return to menu options here!
if (nextlastoptions && game.menuoptions.size() - game.currentmenuoption<=3)
{
}
else
{
uint32_t level_flags = PR_FONT_IDX(cl.ListOfMetaData[tmp].level_main_font_idx);
uint32_t title_flags = cl.ListOfMetaData[tmp].title_is_gettext ? PR_FONT_INTERFACE : level_flags;
uint32_t creator_flags = cl.ListOfMetaData[tmp].creator_is_gettext ? PR_FONT_INTERFACE : level_flags;
font::print(title_flags | PR_2X | PR_CEN, -1, 15, cl.ListOfMetaData[tmp].title, tr, tg, tb);
int sp = SDL_max(10, font::height(level_flags));
Replace "by" for level authors with happy face "by {author}" is a string that will cause a lot of localization-related problems, which then become much worse when different languages and levels can also need different fonts: - If the author name is set to something in English instead of a name, then it'll come out a bit weird if your VVVVVV is set to a different language: "de various people", "por various people", etc. It's the same problem with Discord bots completing "playing" or "watching" in their statuses. - Translators can't always fit "by" in two letters, and level creators have understandably always assumed, and will continue to assume, that "by" is two letters. So if you have your VVVVVV set to a language that translates "by" as something long, then: | by Various People and Others | ...may suddenly show up as something like: |thorer Various People and Othe| - "by" and author may need mutually incompatible fonts. For example, a Japanese level in a Korean VVVVVV needs to be displayed with "by" in Korean characters and the author name with Japanese characters, which would need some very special code since languages may want to add text both before and after the name. - It's very possible that some languages can't translate "by" without knowing the gender of the name, and I know some languages even inflect names in really interesting ways (adding and even replacing letters in first names, surnames, and anything in between, depending on gender and what else is in the sentence). So to solve all of this, the "by" is now replaced by a 10x10 face from sprites.png, like a :viridian: emote. See it as a kind of avatar next to a username, to clarify and assert that this line is for the author's name. It should be a fairly obvious/recognizable icon, it fixes all the above problems, and it's a bonus that we now have more happy faces in VVVVVV.
2023-01-31 00:41:46 +01:00
graphics.print_level_creator(creator_flags, 40, cl.ListOfMetaData[tmp].creator, tr, tg, tb);
Fix indentation style of case Menu::levellist in menurender This is one of the few places still using 2-space indentation instead of 4 spaces, and it makes it very annoying to work with when your tab key inserts four spaces - so I could either just mimic it for the time being, or I could just fix it while I was at it.
2023-01-20 20:50:11 +01:00
font::print(level_flags | PR_CEN, -1, 40+sp, cl.ListOfMetaData[tmp].website, tr, tg, tb);
font::print(level_flags | PR_CEN, -1, 40+sp*3, cl.ListOfMetaData[tmp].Desc1, tr, tg, tb);
font::print(level_flags | PR_CEN, -1, 40+sp*4, cl.ListOfMetaData[tmp].Desc2, tr, tg, tb);
if (sp <= 10)
{
font::print(level_flags | PR_CEN, -1, 40+sp*5, cl.ListOfMetaData[tmp].Desc3, tr, tg, tb);
}
}
}
break;
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
}
Fix mixed indentation in titlerender.cpp There's a lot, looks like mainly because of the person who added MMMMMM and M&P.
2020-04-02 23:19:15 +02:00
#endif
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
case Menu::errornostart:
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("ERROR: This level has no start point!"), tr, tg, tb);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
break;
case Menu::gameplayoptions:
{
int gameplayoptionsoffset = 0;
Clean up of options menus for v2.3 (fixes #696)
2021-04-09 12:09:12 +02:00
#if !defined(MAKEANDPLAY)
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
if (game.ingame_titlemode && game.unlock[18])
Clean up of options menus for v2.3 (fixes #696)
2021-04-09 12:09:12 +02:00
#endif
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
{
gameplayoptionsoffset = 1;
if (game.currentmenuoption == 0) {
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Flip Mode"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Flip the entire game vertically."), tr, tg, tb);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
if (graphics.setflipmode)
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Currently ENABLED!"), tr, tg, tb);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
}
else
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Currently Disabled."), tr/2, tg/2, tb/2);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
}
}
}
if (game.currentmenuoption == gameplayoptionsoffset + 0)
{
//Toggle FPS
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Toggle 30+ FPS"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Change whether the game runs at 30 or over 30 FPS."), tr, tg, tb);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
if (!game.over30mode)
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Current mode: 30 FPS"), tr/2, tg/2, tb/2);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
}
else
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Current mode: Over 30 FPS"), tr, tg, tb);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
}
break;
}
else if (game.currentmenuoption == gameplayoptionsoffset + 1)
{
//Speedrunner options
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Speedrunner Options"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("Access some advanced settings that might be of interest to speedrunners."), tr, tg, tb);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
}
else if (game.currentmenuoption == gameplayoptionsoffset + 2)
{
//Advanced options
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Advanced Options"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("All other gameplay settings."), tr, tg, tb);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
}
else if (game.currentmenuoption == gameplayoptionsoffset + 3)
{
//Clear Data
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Clear Data"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("Delete your main game save data and unlocked play modes."), tr, tg, tb);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
}
Add option to delete all custom level save data To match the option to nuke all main game save data, there is also now an option to nuke all custom level save data separately (which is just all custom level quicksaves, along with stars for level completion). It has its own confirmation menu too. It does not delete any levels from the levels folder.
2021-08-12 05:54:02 +02:00
else if (game.currentmenuoption == gameplayoptionsoffset + 4)
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Clear Data"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("Delete your custom level save data and completion stars."), tr, tg, tb);
Add option to delete all custom level save data To match the option to nuke all main game save data, there is also now an option to nuke all custom level save data separately (which is just all custom level quicksaves, along with stars for level completion). It has its own confirmation menu too. It does not delete any levels from the levels folder.
2021-08-12 05:54:02 +02:00
}
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
break;
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
case Menu::options:
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
switch (game.currentmenuoption)
{
case 0:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Gameplay Options"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("Adjust various gameplay settings."), tr, tg, tb);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
break;
case 1:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Graphics Options"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("Adjust screen settings."), tr, tg, tb);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
break;
case 2:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Audio Options"), tr, tg, tb);
Add audio category to options menu The audio category contains the MMMMMM soundtrack option, as well as stubs for the soon-to-be-implemented volume slider options.
2021-04-12 00:18:35 +02:00
if (music.mmmmmm)
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("Adjust volume settings and soundtrack."), tr, tg, tb);
Add audio category to options menu The audio category contains the MMMMMM soundtrack option, as well as stubs for the soon-to-be-implemented volume slider options.
2021-04-12 00:18:35 +02:00
}
Standardize punctuation and style for the new options menu
2021-08-20 02:17:36 +02:00
else
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("Adjust volume settings."), tr, tg, tb);
Standardize punctuation and style for the new options menu
2021-08-20 02:17:36 +02:00
}
Add audio category to options menu The audio category contains the MMMMMM soundtrack option, as well as stubs for the soon-to-be-implemented volume slider options.
2021-04-12 00:18:35 +02:00
break;
case 3:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Game Pad Options"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("Rebind your controller's buttons and adjust sensitivity."), tr, tg, tb);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
break;
Add audio category to options menu The audio category contains the MMMMMM soundtrack option, as well as stubs for the soon-to-be-implemented volume slider options.
2021-04-12 00:18:35 +02:00
case 4:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Accessibility"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("Disable screen effects, enable slowdown modes or invincibility."), tr, tg, tb);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
break;
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
case 5:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Language"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("Change the language."), tr, tg, tb);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
}
break;
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
case Menu::graphicoptions:
Add forced fullscreen mode This is mainly to make sure the game is definitely set to fullscreen in Big Picture and on the Steam Deck, and to also remove windowed options that wouldn't make sense if you're not on a desktop (toggling fullscreen, resize to nearest). Those options would also be removed on console and mobile too. There's a bit of an annoying bug where if you launch the game in forced fullscreen mode, but then exit and relaunch in normal mode, your game will have fullscreen window sizes but it won't be fullscreen. This is because forced fullscreen mode tries to preserve your non-forced fullscreen setting, but due to the way window sizes are stored and queried, it can't preserve the non-forced window size. This is a bit difficult to work around, so I'm just putting in a FIXME here because we can fix it later and I'd rather have a slightly buggy forced fullscreen mode than not have one at all. Closes #849.
2021-12-26 07:55:55 +01:00
{
int offset = 0;
if (game.currentmenuoption == offset + 0 && !gameScreen.isForcedFullscreen())
Fix indentation of "graphicoptions" in Render.cpp There was one level that was indented with 2 spaces instead of 4, which made everything else look weird. Then some lines were randomly indented further for no reason. Doing this before the next commit is done so as to not make the next commit noisier.
2020-04-16 04:52:49 +02:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Toggle Fullscreen"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Change to fullscreen/windowed mode."), tr, tg, tb);
Fix indentation of "graphicoptions" in Render.cpp There was one level that was indented with 2 spaces instead of 4, which made everything else look weird. Then some lines were randomly indented further for no reason. Doing this before the next commit is done so as to not make the next commit noisier.
2020-04-16 04:52:49 +02:00
Extern `gameScreen`, remove `screenbuffer` I know earlier I removed the gameScreen extern in favor of using screenbuffer, but that was only to be consistent. After further consideration, I have found that it's actually really stupid. There's no reason to be accessing it through screenbuffer, and it's probably an artifact of 2.0-2.2 passing stack-allocated otherwise-global classes everywhere through function arguments. Also, it leads to stupid bugs where screenbuffer could potentially be NULL, which has already resulted in various annoying crashes in the past. Although those could be fixed by simply initializing screenbuffer at the very top of main(), but, why not just scrap the whole thing anyway? So that's what I'm doing. As a nice side effect, I've removed the transitive include of Screen.h from Graphics.h. This could've been done already since it only includes it for the pointer anyway, but it's still good to do it now.
2021-12-25 08:56:47 +01:00
if (gameScreen.isWindowed)
Remove duplicate screen configuration variables There were some duplicate Screen configuration variables that were on Game, when there didn't need to be. - game.fullScreenEffect_badSignal is a duplicate of graphics.screenbuffer->badSignalEffect - game.fullscreen is a duplicate of !graphics.screenbuffer->isWindowed - game.stretchMode is a duplicate of graphics.screenbuffer->stretchMode - game.useLinearFilter is a duplicate of graphics.screenbuffer->isFiltered These duplicate variables have been removed now. I put indentation when handling the ScreenSettings struct in main() so the local doesn't live for the entirety of main() (which is the entirety of the program).
2020-11-13 01:45:51 +01:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Current mode: WINDOWED"), tr, tg, tb);
Remove duplicate screen configuration variables There were some duplicate Screen configuration variables that were on Game, when there didn't need to be. - game.fullScreenEffect_badSignal is a duplicate of graphics.screenbuffer->badSignalEffect - game.fullscreen is a duplicate of !graphics.screenbuffer->isWindowed - game.stretchMode is a duplicate of graphics.screenbuffer->stretchMode - game.useLinearFilter is a duplicate of graphics.screenbuffer->isFiltered These duplicate variables have been removed now. I put indentation when handling the ScreenSettings struct in main() so the local doesn't live for the entirety of main() (which is the entirety of the program).
2020-11-13 01:45:51 +01:00
}
else
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Current mode: FULLSCREEN"), tr, tg, tb);
Fix mixed indentation in titlerender.cpp There's a lot, looks like mainly because of the person who added MMMMMM and M&P.
2020-04-02 23:19:15 +02:00
}
Add forced fullscreen mode This is mainly to make sure the game is definitely set to fullscreen in Big Picture and on the Steam Deck, and to also remove windowed options that wouldn't make sense if you're not on a desktop (toggling fullscreen, resize to nearest). Those options would also be removed on console and mobile too. There's a bit of an annoying bug where if you launch the game in forced fullscreen mode, but then exit and relaunch in normal mode, your game will have fullscreen window sizes but it won't be fullscreen. This is because forced fullscreen mode tries to preserve your non-forced fullscreen setting, but due to the way window sizes are stored and queried, it can't preserve the non-forced window size. This is a bit difficult to work around, so I'm just putting in a FIXME here because we can fix it later and I'd rather have a slightly buggy forced fullscreen mode than not have one at all. Closes #849.
2021-12-26 07:55:55 +01:00
}
Fix indentation of "graphicoptions" in Render.cpp There was one level that was indented with 2 spaces instead of 4, which made everything else look weird. Then some lines were randomly indented further for no reason. Doing this before the next commit is done so as to not make the next commit noisier.
2020-04-16 04:52:49 +02:00
Add forced fullscreen mode This is mainly to make sure the game is definitely set to fullscreen in Big Picture and on the Steam Deck, and to also remove windowed options that wouldn't make sense if you're not on a desktop (toggling fullscreen, resize to nearest). Those options would also be removed on console and mobile too. There's a bit of an annoying bug where if you launch the game in forced fullscreen mode, but then exit and relaunch in normal mode, your game will have fullscreen window sizes but it won't be fullscreen. This is because forced fullscreen mode tries to preserve your non-forced fullscreen setting, but due to the way window sizes are stored and queried, it can't preserve the non-forced window size. This is a bit difficult to work around, so I'm just putting in a FIXME here because we can fix it later and I'd rather have a slightly buggy forced fullscreen mode than not have one at all. Closes #849.
2021-12-26 07:55:55 +01:00
if (gameScreen.isForcedFullscreen())
{
--offset;
}
if (game.currentmenuoption == offset + 1)
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Scaling Mode"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Choose letterbox/stretch/integer mode."), tr, tg, tb);
Fix indentation of "graphicoptions" in Render.cpp There was one level that was indented with 2 spaces instead of 4, which made everything else look weird. Then some lines were randomly indented further for no reason. Doing this before the next commit is done so as to not make the next commit noisier.
2020-04-16 04:52:49 +02:00
Extern `gameScreen`, remove `screenbuffer` I know earlier I removed the gameScreen extern in favor of using screenbuffer, but that was only to be consistent. After further consideration, I have found that it's actually really stupid. There's no reason to be accessing it through screenbuffer, and it's probably an artifact of 2.0-2.2 passing stack-allocated otherwise-global classes everywhere through function arguments. Also, it leads to stupid bugs where screenbuffer could potentially be NULL, which has already resulted in various annoying crashes in the past. Although those could be fixed by simply initializing screenbuffer at the very top of main(), but, why not just scrap the whole thing anyway? So that's what I'm doing. As a nice side effect, I've removed the transitive include of Screen.h from Graphics.h. This could've been done already since it only includes it for the pointer anyway, but it's still good to do it now.
2021-12-25 08:56:47 +01:00
switch (gameScreen.scalingMode)
Remove duplicate screen configuration variables There were some duplicate Screen configuration variables that were on Game, when there didn't need to be. - game.fullScreenEffect_badSignal is a duplicate of graphics.screenbuffer->badSignalEffect - game.fullscreen is a duplicate of !graphics.screenbuffer->isWindowed - game.stretchMode is a duplicate of graphics.screenbuffer->stretchMode - game.useLinearFilter is a duplicate of graphics.screenbuffer->isFiltered These duplicate variables have been removed now. I put indentation when handling the ScreenSettings struct in main() so the local doesn't live for the entirety of main() (which is the entirety of the program).
2020-11-13 01:45:51 +01:00
{
Add and use scaling mode enum This enum is to just make each mode be readable, instead of mysterious 0/1/2 values. It's not a strictly-typed enum because we still have to serialize it as ints in the XML, but it's better than just leaving them as ints. This also adds a NUM_SCALING_MODES enum, so we don't have to hardcode that 3 when cycling scaling modes anymore.
2021-12-26 08:05:14 +01:00
case SCALING_INTEGER:
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Current mode: INTEGER"), tr, tg, tb);
Remove duplicate screen configuration variables There were some duplicate Screen configuration variables that were on Game, when there didn't need to be. - game.fullScreenEffect_badSignal is a duplicate of graphics.screenbuffer->badSignalEffect - game.fullscreen is a duplicate of !graphics.screenbuffer->isWindowed - game.stretchMode is a duplicate of graphics.screenbuffer->stretchMode - game.useLinearFilter is a duplicate of graphics.screenbuffer->isFiltered These duplicate variables have been removed now. I put indentation when handling the ScreenSettings struct in main() so the local doesn't live for the entirety of main() (which is the entirety of the program).
2020-11-13 01:45:51 +01:00
break;
Add and use scaling mode enum This enum is to just make each mode be readable, instead of mysterious 0/1/2 values. It's not a strictly-typed enum because we still have to serialize it as ints in the XML, but it's better than just leaving them as ints. This also adds a NUM_SCALING_MODES enum, so we don't have to hardcode that 3 when cycling scaling modes anymore.
2021-12-26 08:05:14 +01:00
case SCALING_STRETCH:
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Current mode: STRETCH"), tr, tg, tb);
Remove duplicate screen configuration variables There were some duplicate Screen configuration variables that were on Game, when there didn't need to be. - game.fullScreenEffect_badSignal is a duplicate of graphics.screenbuffer->badSignalEffect - game.fullscreen is a duplicate of !graphics.screenbuffer->isWindowed - game.stretchMode is a duplicate of graphics.screenbuffer->stretchMode - game.useLinearFilter is a duplicate of graphics.screenbuffer->isFiltered These duplicate variables have been removed now. I put indentation when handling the ScreenSettings struct in main() so the local doesn't live for the entirety of main() (which is the entirety of the program).
2020-11-13 01:45:51 +01:00
break;
Add and use scaling mode enum This enum is to just make each mode be readable, instead of mysterious 0/1/2 values. It's not a strictly-typed enum because we still have to serialize it as ints in the XML, but it's better than just leaving them as ints. This also adds a NUM_SCALING_MODES enum, so we don't have to hardcode that 3 when cycling scaling modes anymore.
2021-12-26 08:05:14 +01:00
case SCALING_LETTERBOX:
Remove duplicate screen configuration variables There were some duplicate Screen configuration variables that were on Game, when there didn't need to be. - game.fullScreenEffect_badSignal is a duplicate of graphics.screenbuffer->badSignalEffect - game.fullscreen is a duplicate of !graphics.screenbuffer->isWindowed - game.stretchMode is a duplicate of graphics.screenbuffer->stretchMode - game.useLinearFilter is a duplicate of graphics.screenbuffer->isFiltered These duplicate variables have been removed now. I put indentation when handling the ScreenSettings struct in main() so the local doesn't live for the entirety of main() (which is the entirety of the program).
2020-11-13 01:45:51 +01:00
default:
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Current mode: LETTERBOX"), tr, tg, tb);
Remove duplicate screen configuration variables There were some duplicate Screen configuration variables that were on Game, when there didn't need to be. - game.fullScreenEffect_badSignal is a duplicate of graphics.screenbuffer->badSignalEffect - game.fullscreen is a duplicate of !graphics.screenbuffer->isWindowed - game.stretchMode is a duplicate of graphics.screenbuffer->stretchMode - game.useLinearFilter is a duplicate of graphics.screenbuffer->isFiltered These duplicate variables have been removed now. I put indentation when handling the ScreenSettings struct in main() so the local doesn't live for the entirety of main() (which is the entirety of the program).
2020-11-13 01:45:51 +01:00
break;
Fix indentation of "graphicoptions" in Render.cpp There was one level that was indented with 2 spaces instead of 4, which made everything else look weird. Then some lines were randomly indented further for no reason. Doing this before the next commit is done so as to not make the next commit noisier.
2020-04-16 04:52:49 +02:00
}
Add forced fullscreen mode This is mainly to make sure the game is definitely set to fullscreen in Big Picture and on the Steam Deck, and to also remove windowed options that wouldn't make sense if you're not on a desktop (toggling fullscreen, resize to nearest). Those options would also be removed on console and mobile too. There's a bit of an annoying bug where if you launch the game in forced fullscreen mode, but then exit and relaunch in normal mode, your game will have fullscreen window sizes but it won't be fullscreen. This is because forced fullscreen mode tries to preserve your non-forced fullscreen setting, but due to the way window sizes are stored and queried, it can't preserve the non-forced window size. This is a bit difficult to work around, so I'm just putting in a FIXME here because we can fix it later and I'd rather have a slightly buggy forced fullscreen mode than not have one at all. Closes #849.
2021-12-26 07:55:55 +01:00
}
if (game.currentmenuoption == offset + 2 && !gameScreen.isForcedFullscreen())
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Resize to Nearest"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Resize to the nearest window size that is of an integer multiple."), tr, tg, tb);
Extern `gameScreen`, remove `screenbuffer` I know earlier I removed the gameScreen extern in favor of using screenbuffer, but that was only to be consistent. After further consideration, I have found that it's actually really stupid. There's no reason to be accessing it through screenbuffer, and it's probably an artifact of 2.0-2.2 passing stack-allocated otherwise-global classes everywhere through function arguments. Also, it leads to stupid bugs where screenbuffer could potentially be NULL, which has already resulted in various annoying crashes in the past. Although those could be fixed by simply initializing screenbuffer at the very top of main(), but, why not just scrap the whole thing anyway? So that's what I'm doing. As a nice side effect, I've removed the transitive include of Screen.h from Graphics.h. This could've been done already since it only includes it for the pointer anyway, but it's still good to do it now.
2021-12-25 08:56:47 +01:00
if (!gameScreen.isWindowed)
Move "resize to nearest" grouped with other resolution-related options The options for fullscreen and scaling mode were at the top, then there were various other graphical options, and then the option to resize to the nearest window size that is of an integer multiple was all the way below that. Now that last option is moved to be right below the other options related to window sizing.
2020-06-30 22:30:59 +02:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("You must be in windowed mode to use this option."), tr, tg, tb);
Move "resize to nearest" grouped with other resolution-related options The options for fullscreen and scaling mode were at the top, then there were various other graphical options, and then the option to resize to the nearest window size that is of an integer multiple was all the way below that. Now that last option is moved to be right below the other options related to window sizing.
2020-06-30 22:30:59 +02:00
}
Add forced fullscreen mode This is mainly to make sure the game is definitely set to fullscreen in Big Picture and on the Steam Deck, and to also remove windowed options that wouldn't make sense if you're not on a desktop (toggling fullscreen, resize to nearest). Those options would also be removed on console and mobile too. There's a bit of an annoying bug where if you launch the game in forced fullscreen mode, but then exit and relaunch in normal mode, your game will have fullscreen window sizes but it won't be fullscreen. This is because forced fullscreen mode tries to preserve your non-forced fullscreen setting, but due to the way window sizes are stored and queried, it can't preserve the non-forced window size. This is a bit difficult to work around, so I'm just putting in a FIXME here because we can fix it later and I'd rather have a slightly buggy forced fullscreen mode than not have one at all. Closes #849.
2021-12-26 07:55:55 +01:00
}
if (gameScreen.isForcedFullscreen())
{
--offset;
}
if (game.currentmenuoption == offset + 3)
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Toggle Filter"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Change to nearest/linear filter."), tr, tg, tb);
Fix indentation of "graphicoptions" in Render.cpp There was one level that was indented with 2 spaces instead of 4, which made everything else look weird. Then some lines were randomly indented further for no reason. Doing this before the next commit is done so as to not make the next commit noisier.
2020-04-16 04:52:49 +02:00
Extern `gameScreen`, remove `screenbuffer` I know earlier I removed the gameScreen extern in favor of using screenbuffer, but that was only to be consistent. After further consideration, I have found that it's actually really stupid. There's no reason to be accessing it through screenbuffer, and it's probably an artifact of 2.0-2.2 passing stack-allocated otherwise-global classes everywhere through function arguments. Also, it leads to stupid bugs where screenbuffer could potentially be NULL, which has already resulted in various annoying crashes in the past. Although those could be fixed by simply initializing screenbuffer at the very top of main(), but, why not just scrap the whole thing anyway? So that's what I'm doing. As a nice side effect, I've removed the transitive include of Screen.h from Graphics.h. This could've been done already since it only includes it for the pointer anyway, but it's still good to do it now.
2021-12-25 08:56:47 +01:00
if (gameScreen.isFiltered)
Remove duplicate screen configuration variables There were some duplicate Screen configuration variables that were on Game, when there didn't need to be. - game.fullScreenEffect_badSignal is a duplicate of graphics.screenbuffer->badSignalEffect - game.fullscreen is a duplicate of !graphics.screenbuffer->isWindowed - game.stretchMode is a duplicate of graphics.screenbuffer->stretchMode - game.useLinearFilter is a duplicate of graphics.screenbuffer->isFiltered These duplicate variables have been removed now. I put indentation when handling the ScreenSettings struct in main() so the local doesn't live for the entirety of main() (which is the entirety of the program).
2020-11-13 01:45:51 +01:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Current mode: LINEAR"), tr, tg, tb);
Remove duplicate screen configuration variables There were some duplicate Screen configuration variables that were on Game, when there didn't need to be. - game.fullScreenEffect_badSignal is a duplicate of graphics.screenbuffer->badSignalEffect - game.fullscreen is a duplicate of !graphics.screenbuffer->isWindowed - game.stretchMode is a duplicate of graphics.screenbuffer->stretchMode - game.useLinearFilter is a duplicate of graphics.screenbuffer->isFiltered These duplicate variables have been removed now. I put indentation when handling the ScreenSettings struct in main() so the local doesn't live for the entirety of main() (which is the entirety of the program).
2020-11-13 01:45:51 +01:00
}
else
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Current mode: NEAREST"), tr, tg, tb);
Fix indentation of "graphicoptions" in Render.cpp There was one level that was indented with 2 spaces instead of 4, which made everything else look weird. Then some lines were randomly indented further for no reason. Doing this before the next commit is done so as to not make the next commit noisier.
2020-04-16 04:52:49 +02:00
}
Add forced fullscreen mode This is mainly to make sure the game is definitely set to fullscreen in Big Picture and on the Steam Deck, and to also remove windowed options that wouldn't make sense if you're not on a desktop (toggling fullscreen, resize to nearest). Those options would also be removed on console and mobile too. There's a bit of an annoying bug where if you launch the game in forced fullscreen mode, but then exit and relaunch in normal mode, your game will have fullscreen window sizes but it won't be fullscreen. This is because forced fullscreen mode tries to preserve your non-forced fullscreen setting, but due to the way window sizes are stored and queried, it can't preserve the non-forced window size. This is a bit difficult to work around, so I'm just putting in a FIXME here because we can fix it later and I'd rather have a slightly buggy forced fullscreen mode than not have one at all. Closes #849.
2021-12-26 07:55:55 +01:00
}
Fix indentation of "graphicoptions" in Render.cpp There was one level that was indented with 2 spaces instead of 4, which made everything else look weird. Then some lines were randomly indented further for no reason. Doing this before the next commit is done so as to not make the next commit noisier.
2020-04-16 04:52:49 +02:00
Add forced fullscreen mode This is mainly to make sure the game is definitely set to fullscreen in Big Picture and on the Steam Deck, and to also remove windowed options that wouldn't make sense if you're not on a desktop (toggling fullscreen, resize to nearest). Those options would also be removed on console and mobile too. There's a bit of an annoying bug where if you launch the game in forced fullscreen mode, but then exit and relaunch in normal mode, your game will have fullscreen window sizes but it won't be fullscreen. This is because forced fullscreen mode tries to preserve your non-forced fullscreen setting, but due to the way window sizes are stored and queried, it can't preserve the non-forced window size. This is a bit difficult to work around, so I'm just putting in a FIXME here because we can fix it later and I'd rather have a slightly buggy forced fullscreen mode than not have one at all. Closes #849.
2021-12-26 07:55:55 +01:00
if (game.currentmenuoption == offset + 4)
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Analogue Mode"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("There is nothing wrong with your television set. Do not attempt to adjust the picture."), tr, tg, tb);
Add forced fullscreen mode This is mainly to make sure the game is definitely set to fullscreen in Big Picture and on the Steam Deck, and to also remove windowed options that wouldn't make sense if you're not on a desktop (toggling fullscreen, resize to nearest). Those options would also be removed on console and mobile too. There's a bit of an annoying bug where if you launch the game in forced fullscreen mode, but then exit and relaunch in normal mode, your game will have fullscreen window sizes but it won't be fullscreen. This is because forced fullscreen mode tries to preserve your non-forced fullscreen setting, but due to the way window sizes are stored and queried, it can't preserve the non-forced window size. This is a bit difficult to work around, so I'm just putting in a FIXME here because we can fix it later and I'd rather have a slightly buggy forced fullscreen mode than not have one at all. Closes #849.
2021-12-26 07:55:55 +01:00
}
if (game.currentmenuoption == offset + 5)
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Toggle VSync"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Turn VSync on or off."), tr, tg, tb);
Add VSync graphics option, off by default This is if you want delta-timesteps to go as quickly as possible. Also it seems like on Windows this only has an effect in exclusive fullscreen mode.
2020-05-04 22:19:47 +02:00
Extern `gameScreen`, remove `screenbuffer` I know earlier I removed the gameScreen extern in favor of using screenbuffer, but that was only to be consistent. After further consideration, I have found that it's actually really stupid. There's no reason to be accessing it through screenbuffer, and it's probably an artifact of 2.0-2.2 passing stack-allocated otherwise-global classes everywhere through function arguments. Also, it leads to stupid bugs where screenbuffer could potentially be NULL, which has already resulted in various annoying crashes in the past. Although those could be fixed by simply initializing screenbuffer at the very top of main(), but, why not just scrap the whole thing anyway? So that's what I'm doing. As a nice side effect, I've removed the transitive include of Screen.h from Graphics.h. This could've been done already since it only includes it for the pointer anyway, but it's still good to do it now.
2021-12-25 08:56:47 +01:00
if (!gameScreen.vsync)
Add VSync graphics option, off by default This is if you want delta-timesteps to go as quickly as possible. Also it seems like on Windows this only has an effect in exclusive fullscreen mode.
2020-05-04 22:19:47 +02:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Current mode: VSYNC OFF"), tr/2, tg/2, tb/2);
Add VSync graphics option, off by default This is if you want delta-timesteps to go as quickly as possible. Also it seems like on Windows this only has an effect in exclusive fullscreen mode.
2020-05-04 22:19:47 +02:00
}
else
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Current mode: VSYNC ON"), tr, tg, tb);
Add VSync graphics option, off by default This is if you want delta-timesteps to go as quickly as possible. Also it seems like on Windows this only has an effect in exclusive fullscreen mode.
2020-05-04 22:19:47 +02:00
}
Fix indentation of "graphicoptions" in Render.cpp There was one level that was indented with 2 spaces instead of 4, which made everything else look weird. Then some lines were randomly indented further for no reason. Doing this before the next commit is done so as to not make the next commit noisier.
2020-04-16 04:52:49 +02:00
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
Add forced fullscreen mode This is mainly to make sure the game is definitely set to fullscreen in Big Picture and on the Steam Deck, and to also remove windowed options that wouldn't make sense if you're not on a desktop (toggling fullscreen, resize to nearest). Those options would also be removed on console and mobile too. There's a bit of an annoying bug where if you launch the game in forced fullscreen mode, but then exit and relaunch in normal mode, your game will have fullscreen window sizes but it won't be fullscreen. This is because forced fullscreen mode tries to preserve your non-forced fullscreen setting, but due to the way window sizes are stored and queried, it can't preserve the non-forced window size. This is a bit difficult to work around, so I'm just putting in a FIXME here because we can fix it later and I'd rather have a slightly buggy forced fullscreen mode than not have one at all. Closes #849.
2021-12-26 07:55:55 +01:00
}
Add audio category to options menu The audio category contains the MMMMMM soundtrack option, as well as stubs for the soon-to-be-implemented volume slider options.
2021-04-12 00:18:35 +02:00
case Menu::audiooptions:
switch (game.currentmenuoption)
{
case 0:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Music Volume"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("Change the volume of the music."), tr, tg, tb);
Implement music and sound volume sliders This adds music and volume sliders to the audio options. To use the sliders, you navigate to the given option, then press ACTION, and your selection will be transferred to the slider. Pressing left or right will move the slider accordingly. Then you can press ACTION to confirm the volume is what you want and deselect it, or you can press Esc to cancel the volume change, and it will revert to the previous volume; both actions will write your settings to disk. Most of this commit is just adding infrastructure to support having sliders in menus (without copy-pasting code), which is a totally completely new user interface that has never been used before in this game. If we're going to be adding something new, I want to make sure that it at least is done the RIGHT way. Closes #706.
2021-04-12 02:43:17 +02:00
volumesliderrender();
Add audio category to options menu The audio category contains the MMMMMM soundtrack option, as well as stubs for the soon-to-be-implemented volume slider options.
2021-04-12 00:18:35 +02:00
break;
case 1:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Sound Volume"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("Change the volume of sound effects."), tr, tg, tb);
Implement music and sound volume sliders This adds music and volume sliders to the audio options. To use the sliders, you navigate to the given option, then press ACTION, and your selection will be transferred to the slider. Pressing left or right will move the slider accordingly. Then you can press ACTION to confirm the volume is what you want and deselect it, or you can press Esc to cancel the volume change, and it will revert to the previous volume; both actions will write your settings to disk. Most of this commit is just adding infrastructure to support having sliders in menus (without copy-pasting code), which is a totally completely new user interface that has never been used before in this game. If we're going to be adding something new, I want to make sure that it at least is done the RIGHT way. Closes #706.
2021-04-12 02:43:17 +02:00
volumesliderrender();
Add audio category to options menu The audio category contains the MMMMMM soundtrack option, as well as stubs for the soon-to-be-implemented volume slider options.
2021-04-12 00:18:35 +02:00
break;
case 2:
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
{
Add audio category to options menu The audio category contains the MMMMMM soundtrack option, as well as stubs for the soon-to-be-implemented volume slider options.
2021-04-12 00:18:35 +02:00
if (!music.mmmmmm)
{
break;
}
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Soundtrack"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Toggle between MMMMMM and PPPPPP."), tr, tg, tb);
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
const char* soundtrack;
Add audio category to options menu The audio category contains the MMMMMM soundtrack option, as well as stubs for the soon-to-be-implemented volume slider options.
2021-04-12 00:18:35 +02:00
if (music.usingmmmmmm)
{
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
soundtrack = loc::gettext("Current soundtrack: MMMMMM");
Add audio category to options menu The audio category contains the MMMMMM soundtrack option, as well as stubs for the soon-to-be-implemented volume slider options.
2021-04-12 00:18:35 +02:00
}
else
{
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
soundtrack = loc::gettext("Current soundtrack: PPPPPP");
Add audio category to options menu The audio category contains the MMMMMM soundtrack option, as well as stubs for the soon-to-be-implemented volume slider options.
2021-04-12 00:18:35 +02:00
}
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, soundtrack, tr, tg, tb);
Add audio category to options menu The audio category contains the MMMMMM soundtrack option, as well as stubs for the soon-to-be-implemented volume slider options.
2021-04-12 00:18:35 +02:00
break;
}
}
break;
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
case Menu::credits:
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN, -1, 50, loc::gettext("VVVVVV is a game by"), tr, tg, tb);
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN | PR_FONT_8X8, -1, 65, "Terry Cavanagh", tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.drawimagecol(IMAGE_SITE, -1, 86, graphics.getRGB(tr, tg, tb), true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN, -1, 120, loc::gettext("and features music by"), tr, tg, tb);
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN | PR_FONT_8X8, -1, 135, "Magnus Pålsson", tr, tg, tb);
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.drawimagecol(IMAGE_SITE2, -1, 156, graphics.getRGB(tr, tg, tb), true);
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
case Menu::credits2:
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN, -1, 50, loc::gettext("Roomnames are by"), tr, tg, tb);
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN | PR_FONT_8X8, -1, 65, "Bennett Foddy", tr, tg, tb);
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.drawimagecol(IMAGE_SITE3, -1, 86, graphics.getRGB(tr, tg, tb), true);
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN, -1, 110, loc::gettext("C++ version by"), tr, tg, tb);
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN | PR_FONT_8X8, -1, 125, "Simon Roth", tr, tg, tb);
font::print(PR_2X | PR_CEN | PR_FONT_8X8, -1, 145, "Ethan Lee", tr, tg, tb);
font::print(PR_2X | PR_CEN | PR_FONT_8X8, -1, 165, "Misa Kai", tr, tg, tb);
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
case Menu::credits25:
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN, -1, 40, loc::gettext("Beta Testing by"), tr, tg, tb);
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN | PR_FONT_8X8, -1, 55, "Sam Kaplan", tr, tg, tb);
font::print(PR_2X | PR_CEN | PR_FONT_8X8, -1, 75, "Pauli Kohberger", tr, tg, tb);
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN, -1, 130, loc::gettext("Ending Picture by"), tr, tg, tb);
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN | PR_FONT_8X8, -1, 145, "Pauli Kohberger", tr, tg, tb);
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
case Menu::credits3:
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 20, loc::gettext("VVVVVV is supported by the following patrons"), tr, tg, tb);
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
int startidx = game.current_credits_list_index;
Remove `VVV_min/max` in favor of `SDL_min/max` VVV_min/max are functions that only operate on ints, and SDL_min/max are macros that operate on any type but double-evaluate everything. I know I more-or-less said earlier that SDL_min/max were dumb but I've changed my mind and think it's better to use them, taking care to make sure you don't double-evaluate, rather than trying to generate your own litany of functions with either your own hand-rolled generation macros, C++ templates, C11 generics, or GCC extensions (that last one you'd technically use in a macro but it doesn't really matter), all of which have more downsides than just not double-evaluating. And the upside of not double-evaluating is that you're disencouraged from having really complicated single-line min/max expressions and encouraged to precompute the values beforehand anyway so the final min/max is more readable. And furthermore you'll notice when you yourself end up doing double-evaluations anyway. I removed a couple instances of Graphics::len() being double-evaluated in this commit (as well as cleaned up some other min/max-using code). Although the only downside to those double-evaluations was unnecessary computation, rather than checking the wrong result or having multiple side effects, thankfully, it's still good to minimize double-evaluations where possible.
2021-12-23 01:43:31 +01:00
int endidx = SDL_min(startidx + 9, (int)SDL_arraysize(Credits::superpatrons));
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
int xofs = 80 - 16;
int yofs = 40 + 20;
for (int i = startidx; i < endidx; ++i)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_FONT_8X8, xofs, yofs, Credits::superpatrons[i], tr, tg, tb);
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
xofs += 4;
yofs += 14;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
case Menu::credits4:
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 20, loc::gettext("and also by"), tr, tg, tb);
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
int startidx = game.current_credits_list_index;
Remove `VVV_min/max` in favor of `SDL_min/max` VVV_min/max are functions that only operate on ints, and SDL_min/max are macros that operate on any type but double-evaluate everything. I know I more-or-less said earlier that SDL_min/max were dumb but I've changed my mind and think it's better to use them, taking care to make sure you don't double-evaluate, rather than trying to generate your own litany of functions with either your own hand-rolled generation macros, C++ templates, C11 generics, or GCC extensions (that last one you'd technically use in a macro but it doesn't really matter), all of which have more downsides than just not double-evaluating. And the upside of not double-evaluating is that you're disencouraged from having really complicated single-line min/max expressions and encouraged to precompute the values beforehand anyway so the final min/max is more readable. And furthermore you'll notice when you yourself end up doing double-evaluations anyway. I removed a couple instances of Graphics::len() being double-evaluated in this commit (as well as cleaned up some other min/max-using code). Although the only downside to those double-evaluations was unnecessary computation, rather than checking the wrong result or having multiple side effects, thankfully, it's still good to minimize double-evaluations where possible.
2021-12-23 01:43:31 +01:00
int endidx = SDL_min(startidx + 14, (int)SDL_arraysize(Credits::patrons));
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
int maxheight = 10 * 14;
int totalheight = (endidx - startidx) * 10;
int emptyspace = maxheight - totalheight;
int yofs = 40 + (emptyspace / 2);
for (int i = startidx; i < endidx; ++i)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_FONT_8X8, 80, yofs, Credits::patrons[i], tr, tg, tb);
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
yofs += 10;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
case Menu::credits5:
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 20, loc::gettext("With contributions on GitHub from"), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
int startidx = game.current_credits_list_index;
Remove `VVV_min/max` in favor of `SDL_min/max` VVV_min/max are functions that only operate on ints, and SDL_min/max are macros that operate on any type but double-evaluate everything. I know I more-or-less said earlier that SDL_min/max were dumb but I've changed my mind and think it's better to use them, taking care to make sure you don't double-evaluate, rather than trying to generate your own litany of functions with either your own hand-rolled generation macros, C++ templates, C11 generics, or GCC extensions (that last one you'd technically use in a macro but it doesn't really matter), all of which have more downsides than just not double-evaluating. And the upside of not double-evaluating is that you're disencouraged from having really complicated single-line min/max expressions and encouraged to precompute the values beforehand anyway so the final min/max is more readable. And furthermore you'll notice when you yourself end up doing double-evaluations anyway. I removed a couple instances of Graphics::len() being double-evaluated in this commit (as well as cleaned up some other min/max-using code). Although the only downside to those double-evaluations was unnecessary computation, rather than checking the wrong result or having multiple side effects, thankfully, it's still good to minimize double-evaluations where possible.
2021-12-23 01:43:31 +01:00
int endidx = SDL_min(startidx + 9, (int)SDL_arraysize(Credits::githubfriends));
Use dynamic credits lists for main menu credits screens (and add GitHub contributors) (#160) Also added GitHub contributors to the credits on the main menu (previously they were only present in the credits at the end of the game)
2020-02-12 05:45:58 +01:00
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
int maxheight = 14 * 9;
int totalheight = (endidx - startidx) * 14;
int emptyspace = maxheight - totalheight;
Use dynamic credits lists for main menu credits screens (and add GitHub contributors) (#160) Also added GitHub contributors to the credits on the main menu (previously they were only present in the credits at the end of the game)
2020-02-12 05:45:58 +01:00
Put Misa at the top of GitHub Friends
2021-03-31 08:43:05 +02:00
int xofs, yofs;
Move Misa to C++ credits I talked with Ethan earlier about this. For 2.3, he wanted me in GitHub contributors (well, still separate from the rest), to really highlight the source-code-release community-driven nature of 2.3, but he said it'd be fine to put me in C++ credits in 2.4.
2021-09-01 08:19:25 +02:00
xofs = 80 - 16;
yofs = 40 + 20 + (emptyspace / 2);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
for (int i = startidx; i < endidx; ++i)
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_FONT_8X8, xofs, yofs, Credits::githubfriends[i], tr, tg, tb);
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
xofs += 4;
yofs += 14;
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
case Menu::credits6:
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 20, loc::gettext("and thanks also to:"), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 60, loc::gettext("You!"), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 100, loc::gettext("Your support makes it possible for me to continue making the games I want to make, now and into the future."), tr, tg, tb);
Use dynamic credits lists for main menu credits screens (and add GitHub contributors) (#160) Also added GitHub contributors to the credits on the main menu (previously they were only present in the credits at the end of the game)
2020-02-12 05:45:58 +01:00
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 150,loc::gettext("Thank you!"), tr, tg, tb);
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
case Menu::setinvincibility:
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 100, loc::gettext("Are you sure you want to enable invincibility?"), tr, tg, tb);
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
Rename Menu::setslowdown2 to Menu::setslowdown Now that setslowdown1 has been removed it's no longer necessary to have a 2 on the end of setslowdown2.
2020-04-17 01:02:01 +02:00
case Menu::setslowdown:
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Game Speed"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Select a new game speed below."), tr, tg, tb);
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
drawslowdowntext(next_y);
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
case Menu::newgamewarning:
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 100, loc::gettext("Are you sure? This will delete your current saves..."), tr, tg, tb);
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
case Menu::cleardatamenu:
Add option to delete all custom level save data To match the option to nuke all main game save data, there is also now an option to nuke all custom level save data separately (which is just all custom level quicksaves, along with stars for level completion). It has its own confirmation menu too. It does not delete any levels from the levels folder.
2021-08-12 05:54:02 +02:00
case Menu::clearcustomdatamenu:
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 100, loc::gettext("Are you sure you want to delete all your saved data?"), tr, tg, tb);
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
Add being able to delete a custom level quicksave Custom level quicksaves are NOT affected by the clear data menu, so the player should be able to delete quicksaves this way. The quicksave confirmation menu now has an extra option to delete the save (and that option also has its own confirmation menu before deleting).
2021-08-12 05:26:58 +02:00
case Menu::deletequicklevel:
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 100, loc::gettext("Are you sure you want to delete your quicksave?"), tr, tg, tb);
Add being able to delete a custom level quicksave Custom level quicksaves are NOT affected by the clear data menu, so the player should be able to delete quicksaves this way. The quicksave confirmation menu now has an extra option to delete the save (and that option also has its own confirmation menu before deleting).
2021-08-12 05:26:58 +02:00
break;
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
case Menu::startnodeathmode:
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
{
int next_y;
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
next_y = font::print_wrap(PR_CEN, -1, 45, loc::gettext("Good luck!"), tr, tg, tb);
next_y = font::print_wrap(PR_CEN, -1, next_y+15, loc::gettext("You cannot save in this mode."), tr, tg, tb);
font::print_wrap(PR_CEN, -1, next_y+5, loc::gettext("Would you like to disable the cutscenes during the game?"), tr, tg, tb);
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
case Menu::controller:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Game Pad"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 55, loc::gettext("Change controller options."), tr, tg, tb);
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
switch (game.currentmenuoption)
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
{
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
case 0:
Migrate more prints and graphics.len calls to font:: I especially focused on graphics.len and the print calls around them, because graphics.len calls appear a bit less often, might be overlooked when migrating print calls (thus possibly using different fonts by accident) and are often used for some kind of right-alignment or centering which can be changed into PR_RIGHT or PR_CEN with a different X anyway. Notably, I also added a new function to generate these kinds of sliders: ....[]............ Different languages means that the slider for analogue stick sensitivity needs to be longer to fit possibly long words for Low/Medium/High, and then different font sizes means that the longer slider won't fit onscreen in a language that needs a 12-wide font. So slider_get() can take a "target width", which dynamically changes the number of characters depending on the width of them in the interface font. I kinda forgot that I could force the 8x8 font instead of adapting the characters in the slider to the font, and other ideas (like using different characters or a more graphical progress bar) have been brought up on Discord, so this might all change again sooner or later.
2023-01-16 21:29:50 +01:00
{
font::print(0, 32, 75, loc::gettext("Low"), tr, tg, tb);
font::print(PR_CEN, -1, 75, loc::gettext("Medium"), tr, tg, tb);
font::print(PR_RIGHT, 288, 75, loc::gettext("High"), tr, tg, tb);
char slider[SCREEN_WIDTH_CHARS + 1];
slider_get(slider, sizeof(slider), key.sensitivity, 5, 240);
font::print(PR_CEN, -1, 85, slider, tr, tg, tb);
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
break;
Migrate more prints and graphics.len calls to font:: I especially focused on graphics.len and the print calls around them, because graphics.len calls appear a bit less often, might be overlooked when migrating print calls (thus possibly using different fonts by accident) and are often used for some kind of right-alignment or centering which can be changed into PR_RIGHT or PR_CEN with a different X anyway. Notably, I also added a new function to generate these kinds of sliders: ....[]............ Different languages means that the slider for analogue stick sensitivity needs to be longer to fit possibly long words for Low/Medium/High, and then different font sizes means that the longer slider won't fit onscreen in a language that needs a 12-wide font. So slider_get() can take a "target width", which dynamically changes the number of characters depending on the width of them in the interface font. I kinda forgot that I could force the 8x8 font instead of adapting the characters in the slider to the font, and other ideas (like using different characters or a more graphical progress bar) have been brought up on Discord, so this might all change again sooner or later.
2023-01-16 21:29:50 +01:00
}
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
case 1:
case 2:
case 3:
Added ability to bind restart to a controller.
2020-08-09 00:41:59 +02:00
case 4:
Separate pressing Enter to open map from pressing Enter to interact This is a lot of copy-pasted code, but a little bit of copy-pasting never hurt anyone... The keybind to interact with activity zones and teleporters is now separate from the keybind to open the map, or return to the editor from in-editor playtesting, or restart a time trial. The keybind is now E, and the default controller bind is X. No controller button prompts, but the game didn't have controller button prompts anyways, so whatever. Doing this now because if people's muscle memory are going to be broken by not being able to spam the map keybind anymore, at least we can help a bit by changing the keybind so they can keep spamming it - their muscle memory is going to be broken anyways. This option has to be enabled by going to the speedrunner menu options and selecting "interact button". It is disabled by default. All prompt text needs to be string-interpolated every time they are drawn, because it is possible for people to change which interact button they use in the middle of gameplay, via the in-game options. Closes #736.
2021-04-19 08:23:44 +02:00
case 5:
Add controller button layout mappings This adds mappings from SDL's Xbox-based SDL_GameControllerButton constants, to glyphs for the following layouts: - LAYOUT_NINTENDO_SWITCH_PRO, - LAYOUT_NINTENDO_SWITCH_JOYCON_L, - LAYOUT_NINTENDO_SWITCH_JOYCON_R, - LAYOUT_DECK, - LAYOUT_PLAYSTATION, - LAYOUT_XBOX, - LAYOUT_GENERIC, There may still be errors in these, but they should be mostly correct. I'm leaving it up to Ethan to make it show the correct button glyphs for the correct controllers being connected (and possibly to fix these mappings where needed).
2023-03-13 04:16:36 +01:00
{
char buffer_a[SCREEN_WIDTH_CHARS + 1];
char buffer_b[SCREEN_WIDTH_CHARS + 1];
SDL_snprintf(buffer_a, sizeof(buffer_a), "%s%s",
loc::gettext("Flip is bound to: "),
BUTTONGLYPHS_get_all_gamepad_buttons(buffer_b, sizeof(buffer_b), ActionSet_InGame, Action_InGame_ACTION)
);
font::print(PR_CEN, -1, 75, buffer_a, tr, tg, tb);
SDL_snprintf(buffer_a, sizeof(buffer_a), "%s%s",
loc::gettext("Enter is bound to: "),
BUTTONGLYPHS_get_all_gamepad_buttons(buffer_b, sizeof(buffer_b), ActionSet_InGame, Action_InGame_Map)
);
font::print(PR_CEN, -1, 85, buffer_a, tr, tg, tb);
SDL_snprintf(buffer_a, sizeof(buffer_a), "%s%s",
loc::gettext("Menu is bound to: "),
BUTTONGLYPHS_get_all_gamepad_buttons(buffer_b, sizeof(buffer_b), ActionSet_InGame, Action_InGame_Esc)
);
font::print(PR_CEN, -1, 95, buffer_a, tr, tg, tb);
SDL_snprintf(buffer_a, sizeof(buffer_a), "%s%s",
loc::gettext("Restart is bound to: "),
BUTTONGLYPHS_get_all_gamepad_buttons(buffer_b, sizeof(buffer_b), ActionSet_InGame, Action_InGame_Restart)
);
font::print(PR_CEN, -1, 105, buffer_a, tr, tg, tb);
SDL_snprintf(buffer_a, sizeof(buffer_a), "%s%s",
loc::gettext("Interact is bound to: "),
BUTTONGLYPHS_get_all_gamepad_buttons(buffer_b, sizeof(buffer_b), ActionSet_InGame, Action_InGame_Interact)
);
Show correct button glyph for interact if Enter/E are not split I thought 2.2 already had separate map and interact gamepad bindings, and they simply got neglected and broken with 2.3's split Enter/E key option. But actually, the new split Enter/E option also applied to gamepad buttons, and a separate interact binding was added, without really indicating anything if Enter and E are not split. And I guess using the same button for map and interact by default also makes sense for simplicity... This commit makes sure the button glyph displayed in-game is at least the correct button. The gamepad bindings menu is also slightly modified to darken the interact option - the button glyphs code now automatically causes them to show equal buttons anyway, so it wasn't too big of a change to also darken the line and disable the binding option. To me this says: "the interact key is fixed to be the same as enter right now, but there is a way to change it." It's still not ideal of course, and I know a similar change to the gamepad menu to hide the interact option was rejected a year ago because action sets would already fix it, but it's a year later now, and showing misleading button glyphs should be fixed in 2.4, whether it will already have action sets or not (And at this point I think the plan already is to keep the existing input system for 2.4) And it's a 3 line diff to darken and disable the option, compared to fully hiding the option.
2023-03-26 05:19:01 +02:00
font::print(PR_CEN | PR_BRIGHTNESS(game.separate_interact ? 255 : 128), -1, 115, buffer_a, tr, tg, tb);
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
break;
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
}
Add controller button layout mappings This adds mappings from SDL's Xbox-based SDL_GameControllerButton constants, to glyphs for the following layouts: - LAYOUT_NINTENDO_SWITCH_PRO, - LAYOUT_NINTENDO_SWITCH_JOYCON_L, - LAYOUT_NINTENDO_SWITCH_JOYCON_R, - LAYOUT_DECK, - LAYOUT_PLAYSTATION, - LAYOUT_XBOX, - LAYOUT_GENERIC, There may still be errors in these, but they should be mostly correct. I'm leaving it up to Ethan to make it show the correct button glyphs for the correct controllers being connected (and possibly to fix these mappings where needed).
2023-03-13 04:16:36 +01:00
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Use dynamic credits lists for main menu credits screens (and add GitHub contributors) (#160) Also added GitHub contributors to the credits on the main menu (previously they were only present in the credits at the end of the game)
2020-02-12 05:45:58 +01:00
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
break;
case Menu::language:
if (loc::languagelist.empty())
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 90, loc::gettext("ERROR: No language files found."), tr, tg, tb);
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
}
else if ((unsigned)game.currentmenuoption < loc::languagelist.size())
{
Change font::print_wrap text argument from std::string to const char* We no longer need to pass a std::string object to the print and len functions - in fact, we often only have a C string that we want to print or get the visual width of (that C string most often comes from loc::gettext), and it's a bit wasteful to wrap it in a new std::string object on every print/len call. This does mean adding a few more .c_str()s, but there's not many places where a std::string is being passed to these functions, and we already use .c_str() sometimes. -> Commit 1/3: font::print_wrap Commit 2/3: font::print Commit 3/3: font::len
2023-03-04 23:29:12 +01:00
font::print_wrap(PR_CEN, -1, 8, loc::languagelist[game.currentmenuoption].credit.c_str(), tr/2, tg/2, tb/2);
Add button glyphs support to selection hint on language screen The language screen has a "Press Space, Z, or V to select" hint, which I forgot to update for supporting button glyphs in #943, so this commit does. <action_hint>Press Space, Z, or V to select</action_hint> <gamepad_hint>Press {button} to select</gamepad_hint>
2023-03-26 20:15:45 +02:00
const char* select_hint;
char buffer[SCREEN_WIDTH_CHARS + 1];
if (BUTTONGLYPHS_keyboard_is_active())
{
select_hint = loc::languagelist[game.currentmenuoption].action_hint.c_str();
}
else
{
vformat_buf(buffer, sizeof(buffer),
loc::languagelist[game.currentmenuoption].gamepad_hint.c_str(),
"button:but",
vformat_button(ActionSet_Menu, Action_Menu_Accept)
);
select_hint = buffer;
}
font::print(PR_CEN, -1, 230, select_hint, tr/2, tg/2, tb/2);
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
}
break;
case Menu::translator_main:
switch (game.currentmenuoption)
{
case 0:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Translator options"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("Some options that are useful for translators and developers."), tr, tg, tb);
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
break;
case 1:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Maintenance"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("Sync all language files after adding new strings."), tr, tg, tb);
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
break;
}
{
if (FILESYSTEM_isMainLangDirFromRepo())
{
// Just giving people who manually compiled the game some hint as to why this menu is here!
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(0, 8, 208, loc::gettext("Repository language folder:"), tr/2, tg/2, tb/2);
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
}
else
{
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(0, 8, 208, loc::gettext("Language folder:"), tr/2, tg/2, tb/2);
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
}
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_RIGHT, 316, 224, FILESYSTEM_getUserMainLangDirectory(), tr/2, tg/2, tb/2);
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
}
break;
case Menu::translator_options:
switch (game.currentmenuoption)
{
case 0:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Statistics"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("Count the amount of untranslated strings for this language."), tr, tg, tb);
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
break;
case 1:
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Translate rooms"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Enable room name translation mode, so you can translate room names in context. Press I for invincibility."), tr, tg, tb);
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
if (roomname_translator::enabled)
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Currently ENABLED!"), tr, tg, tb);
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
}
else
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Currently Disabled."), tr/2, tg/2, tb/2);
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
}
break;
}
case 2:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Explore game"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("Explore the rooms of any level in the game, to find all room names to translate."), tr, tg, tb);
Add level exploring menu for translators I would, of course, recommend translators to translate the roomnames while playing the full game (optionally in invincibility) so they can immediately get all the context and maybe the most inspiration. And if you want to go back into a specific level, then there's always the time trials and intermission replays which will give you full coverage of all the room names. However, the time trials weren't really made for room name translation. They have some annoying features like the instant restart when you press ENTER at the wrong time, they remove context clues like teleporters and companions, but the worst problem is that the last room in a level is often completely untranslatable inside the time trials because you immediately get sent to the results screen... So, I added a new menu in the translator options, "explore game", which gives you access to all the time trials and the two intermissions, from the same menu. All these time trials (which they're still based off of, under the hood) are stripped of the annoying features that come with time trials. These are the changes I made to time trial behavior in translator exploring mode: - No 3-2-1-Go! countdown - No on-screen time/death/shiny/par - ENTER doesn't restart, and the map menu works. The entire map is also revealed. - Prize for the Reckless is in its normal form - The teleporters in Entanglement Generator, Wheeler's Wormhole and Level Complete are restored as context for room names (actually, we should probably restore them in time trials anyway? Their "press to teleport" prompt is already blocked out in time trials and they do nothing other than being a checkpoint. I guess the reason they were removed was to stop people from opening the teleporter menu when that was not specifically blocked out in time trials yet.) - The companions are there at the end of levels, and behave like in no death mode (become happy and follow you to the teleporter). Also for context. - At the end of each level, you're not suddenly sent to the menu, but you can use the teleporter at your leisure just like in the intermission replays. In the Final Level, you do get sent to the menu automatically, but after a longer delay. I made another mark on VVVVVV: don't be startled, I added gamestates. I wanted all teleporters at the end of levels to behave like the ones at the end of the intermission replays, and all handling for teleporting with specific companions is already done in gamestates, so rather than adding conditional blocks across 5 or so different gamestates, it made more sense to make a single gamestate for "teleporting in translator exploring mode" (3090). I also added an alternative to having to use gamestate 3500 or 82 for the end of the final level: 3091-3092. One other thing I want to add to the "explore game" menu: a per-level count of how many room names are left to translate. That shouldn't be too difficult, and I'm planning that for the next commit.
2022-11-26 03:33:17 +01:00
break;
case 3:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Menu test"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("Cycle through most menus in the game. The menus will not actually work, all options take you to the next menu instead. Press Escape to stop."), tr, tg, tb);
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
break;
Add level exploring menu for translators I would, of course, recommend translators to translate the roomnames while playing the full game (optionally in invincibility) so they can immediately get all the context and maybe the most inspiration. And if you want to go back into a specific level, then there's always the time trials and intermission replays which will give you full coverage of all the room names. However, the time trials weren't really made for room name translation. They have some annoying features like the instant restart when you press ENTER at the wrong time, they remove context clues like teleporters and companions, but the worst problem is that the last room in a level is often completely untranslatable inside the time trials because you immediately get sent to the results screen... So, I added a new menu in the translator options, "explore game", which gives you access to all the time trials and the two intermissions, from the same menu. All these time trials (which they're still based off of, under the hood) are stripped of the annoying features that come with time trials. These are the changes I made to time trial behavior in translator exploring mode: - No 3-2-1-Go! countdown - No on-screen time/death/shiny/par - ENTER doesn't restart, and the map menu works. The entire map is also revealed. - Prize for the Reckless is in its normal form - The teleporters in Entanglement Generator, Wheeler's Wormhole and Level Complete are restored as context for room names (actually, we should probably restore them in time trials anyway? Their "press to teleport" prompt is already blocked out in time trials and they do nothing other than being a checkpoint. I guess the reason they were removed was to stop people from opening the teleporter menu when that was not specifically blocked out in time trials yet.) - The companions are there at the end of levels, and behave like in no death mode (become happy and follow you to the teleporter). Also for context. - At the end of each level, you're not suddenly sent to the menu, but you can use the teleporter at your leisure just like in the intermission replays. In the Final Level, you do get sent to the menu automatically, but after a longer delay. I made another mark on VVVVVV: don't be startled, I added gamestates. I wanted all teleporters at the end of levels to behave like the ones at the end of the intermission replays, and all handling for teleporting with specific companions is already done in gamestates, so rather than adding conditional blocks across 5 or so different gamestates, it made more sense to make a single gamestate for "teleporting in translator exploring mode" (3090). I also added an alternative to having to use gamestate 3500 or 82 for the end of the final level: 3091-3092. One other thing I want to add to the "explore game" menu: a per-level count of how many room names are left to translate. That shouldn't be too difficult, and I'm planning that for the next commit.
2022-11-26 03:33:17 +01:00
case 4:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Cutscene test"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("Display all text boxes from cutscenes.xml. Only tests the basic appearance of each individual text box."), tr, tg, tb);
Add cutscene test menu This allows translators to test all text boxes in the scripts. It doesn't run the scripts themselves - it only shows the basic appearance of each text box individually, so context may be lost but it's good to have a way to see any text boxes that might otherwise not be easily seen because they require specific circumstances to appear.
2022-12-24 04:16:56 +01:00
break;
case 5:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Limits check"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("Find translations that don't fit within their defined bounds."), tr, tg, tb);
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
break;
}
break;
case Menu::translator_options_limitscheck:
{
size_t of = loc::limitscheck_current_overflow;
if (of >= loc::text_overflows.size())
{
int next_y;
if (loc::text_overflows.empty())
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
next_y = font::print_wrap(PR_CEN, -1, 20, loc::gettext("No text overflows found!"), tr, tg, tb);
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
}
else
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
next_y = font::print_wrap(PR_CEN, -1, 20, loc::gettext("No text overflows left!"), tr, tg, tb);
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
}
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Note that this detection isn't perfect."), tr, tg, tb);
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
}
else
{
loc::TextOverflow& overflow = loc::text_overflows[of];
char buffer[SCREEN_WIDTH_CHARS + 1];
vformat_buf(buffer, sizeof(buffer),
"{page}/{total} {max_w}*{max_h} ({max_w_px}x{max_h_px}) [{lang}]",
"page:int, total:int, max_w:int, max_h:int, max_w_px:int, max_h_px:int, lang:str",
(int) of+1, (int) loc::text_overflows.size(),
overflow.max_w, overflow.max_h,
overflow.max_w_px, overflow.max_h_px,
overflow.lang.c_str()
);
Migrate more prints and graphics.len calls to font:: I especially focused on graphics.len and the print calls around them, because graphics.len calls appear a bit less often, might be overlooked when migrating print calls (thus possibly using different fonts by accident) and are often used for some kind of right-alignment or centering which can be changed into PR_RIGHT or PR_CEN with a different X anyway. Notably, I also added a new function to generate these kinds of sliders: ....[]............ Different languages means that the slider for analogue stick sensitivity needs to be longer to fit possibly long words for Low/Medium/High, and then different font sizes means that the longer slider won't fit onscreen in a language that needs a 12-wide font. So slider_get() can take a "target width", which dynamically changes the number of characters depending on the width of them in the interface font. I kinda forgot that I could force the 8x8 font instead of adapting the characters in the slider to the font, and other ideas (like using different characters or a more graphical progress bar) have been brought up on Discord, so this might all change again sooner or later.
2023-01-16 21:29:50 +01:00
font::print(PR_FONT_8X8, 10, 10, buffer, tr/2, tg/2, tb/2);
Add language-specific font configuration meta.xml can now have a <font> tag, which gives the name of the font that the language needs. This will directly control the interface font when the language is active, and will soon also control the font used for each option on the language screen.
2023-01-15 01:31:02 +01:00
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
int box_x = SDL_min(10, (320-overflow.max_w_px)/2);
Migrate more prints and graphics.len calls to font:: I especially focused on graphics.len and the print calls around them, because graphics.len calls appear a bit less often, might be overlooked when migrating print calls (thus possibly using different fonts by accident) and are often used for some kind of right-alignment or centering which can be changed into PR_RIGHT or PR_CEN with a different X anyway. Notably, I also added a new function to generate these kinds of sliders: ....[]............ Different languages means that the slider for analogue stick sensitivity needs to be longer to fit possibly long words for Low/Medium/High, and then different font sizes means that the longer slider won't fit onscreen in a language that needs a 12-wide font. So slider_get() can take a "target width", which dynamically changes the number of characters depending on the width of them in the interface font. I kinda forgot that I could force the 8x8 font instead of adapting the characters in the slider to the font, and other ideas (like using different characters or a more graphical progress bar) have been brought up on Discord, so this might all change again sooner or later.
2023-01-16 21:29:50 +01:00
graphics.fill_rect(box_x-1, 30-1, overflow.max_w_px+2, overflow.max_h_px+2, tr/3, tg/3, tb/3);
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
int wraplimit;
if (overflow.multiline)
{
wraplimit = overflow.max_w_px;
}
else
{
wraplimit = 320-box_x;
}
if (overflow.text != NULL)
{
Migrate more prints and graphics.len calls to font:: I especially focused on graphics.len and the print calls around them, because graphics.len calls appear a bit less often, might be overlooked when migrating print calls (thus possibly using different fonts by accident) and are often used for some kind of right-alignment or centering which can be changed into PR_RIGHT or PR_CEN with a different X anyway. Notably, I also added a new function to generate these kinds of sliders: ....[]............ Different languages means that the slider for analogue stick sensitivity needs to be longer to fit possibly long words for Low/Medium/High, and then different font sizes means that the longer slider won't fit onscreen in a language that needs a 12-wide font. So slider_get() can take a "target width", which dynamically changes the number of characters depending on the width of them in the interface font. I kinda forgot that I could force the 8x8 font instead of adapting the characters in the slider to the font, and other ideas (like using different characters or a more graphical progress bar) have been brought up on Discord, so this might all change again sooner or later.
2023-01-16 21:29:50 +01:00
font::print_wrap(overflow.flags, box_x, 30, overflow.text, tr, tg, tb, -1, wraplimit);
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
}
}
break;
}
case Menu::translator_options_stats:
{
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(0, 16, 16, loc::get_langmeta()->nativename, tr, tg, tb);
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
const char* line_template = "%4d";
char buffer[5];
int coldiv;
#define stat_line(y, filename, untranslated_counter) \
SDL_snprintf(buffer, sizeof(buffer), line_template, \
untranslated_counter \
); \
coldiv = untranslated_counter > 0 ? 1 : 2; \
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_FONT_8X8, 16, y, filename, tr/coldiv, tg/coldiv, tb/coldiv); \
font::print(PR_FONT_8X8, 272, y, buffer, tr/coldiv, tg/coldiv, tb/coldiv)
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
stat_line(48, "strings.xml", loc::n_untranslated[loc::UNTRANSLATED_STRINGS]);
stat_line(64, "numbers.xml", loc::n_untranslated[loc::UNTRANSLATED_NUMBERS]);
stat_line(80, "strings_plural.xml", loc::n_untranslated[loc::UNTRANSLATED_STRINGS_PLURAL]);
stat_line(96, "cutscenes.xml", loc::n_untranslated[loc::UNTRANSLATED_CUTSCENES]);
stat_line(112, "roomnames.xml", loc::n_untranslated_roomnames);
stat_line(128, "roomnames_special.xml", loc::n_untranslated[loc::UNTRANSLATED_ROOMNAMES_SPECIAL]);
#undef stat_line
break;
}
Add level exploring menu for translators I would, of course, recommend translators to translate the roomnames while playing the full game (optionally in invincibility) so they can immediately get all the context and maybe the most inspiration. And if you want to go back into a specific level, then there's always the time trials and intermission replays which will give you full coverage of all the room names. However, the time trials weren't really made for room name translation. They have some annoying features like the instant restart when you press ENTER at the wrong time, they remove context clues like teleporters and companions, but the worst problem is that the last room in a level is often completely untranslatable inside the time trials because you immediately get sent to the results screen... So, I added a new menu in the translator options, "explore game", which gives you access to all the time trials and the two intermissions, from the same menu. All these time trials (which they're still based off of, under the hood) are stripped of the annoying features that come with time trials. These are the changes I made to time trial behavior in translator exploring mode: - No 3-2-1-Go! countdown - No on-screen time/death/shiny/par - ENTER doesn't restart, and the map menu works. The entire map is also revealed. - Prize for the Reckless is in its normal form - The teleporters in Entanglement Generator, Wheeler's Wormhole and Level Complete are restored as context for room names (actually, we should probably restore them in time trials anyway? Their "press to teleport" prompt is already blocked out in time trials and they do nothing other than being a checkpoint. I guess the reason they were removed was to stop people from opening the teleporter menu when that was not specifically blocked out in time trials yet.) - The companions are there at the end of levels, and behave like in no death mode (become happy and follow you to the teleporter). Also for context. - At the end of each level, you're not suddenly sent to the menu, but you can use the teleporter at your leisure just like in the intermission replays. In the Final Level, you do get sent to the menu automatically, but after a longer delay. I made another mark on VVVVVV: don't be startled, I added gamestates. I wanted all teleporters at the end of levels to behave like the ones at the end of the intermission replays, and all handling for teleporting with specific companions is already done in gamestates, so rather than adding conditional blocks across 5 or so different gamestates, it made more sense to make a single gamestate for "teleporting in translator exploring mode" (3090). I also added an alternative to having to use gamestate 3500 or 82 for the end of the final level: 3091-3092. One other thing I want to add to the "explore game" menu: a per-level count of how many room names are left to translate. That shouldn't be too difficult, and I'm planning that for the next commit.
2022-11-26 03:33:17 +01:00
case Menu::translator_options_exploregame:
switch (game.currentmenuoption)
{
case 0:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Space Station 1"), tr, tg, tb);
Add level exploring menu for translators I would, of course, recommend translators to translate the roomnames while playing the full game (optionally in invincibility) so they can immediately get all the context and maybe the most inspiration. And if you want to go back into a specific level, then there's always the time trials and intermission replays which will give you full coverage of all the room names. However, the time trials weren't really made for room name translation. They have some annoying features like the instant restart when you press ENTER at the wrong time, they remove context clues like teleporters and companions, but the worst problem is that the last room in a level is often completely untranslatable inside the time trials because you immediately get sent to the results screen... So, I added a new menu in the translator options, "explore game", which gives you access to all the time trials and the two intermissions, from the same menu. All these time trials (which they're still based off of, under the hood) are stripped of the annoying features that come with time trials. These are the changes I made to time trial behavior in translator exploring mode: - No 3-2-1-Go! countdown - No on-screen time/death/shiny/par - ENTER doesn't restart, and the map menu works. The entire map is also revealed. - Prize for the Reckless is in its normal form - The teleporters in Entanglement Generator, Wheeler's Wormhole and Level Complete are restored as context for room names (actually, we should probably restore them in time trials anyway? Their "press to teleport" prompt is already blocked out in time trials and they do nothing other than being a checkpoint. I guess the reason they were removed was to stop people from opening the teleporter menu when that was not specifically blocked out in time trials yet.) - The companions are there at the end of levels, and behave like in no death mode (become happy and follow you to the teleporter). Also for context. - At the end of each level, you're not suddenly sent to the menu, but you can use the teleporter at your leisure just like in the intermission replays. In the Final Level, you do get sent to the menu automatically, but after a longer delay. I made another mark on VVVVVV: don't be startled, I added gamestates. I wanted all teleporters at the end of levels to behave like the ones at the end of the intermission replays, and all handling for teleporting with specific companions is already done in gamestates, so rather than adding conditional blocks across 5 or so different gamestates, it made more sense to make a single gamestate for "teleporting in translator exploring mode" (3090). I also added an alternative to having to use gamestate 3500 or 82 for the end of the final level: 3091-3092. One other thing I want to add to the "explore game" menu: a per-level count of how many room names are left to translate. That shouldn't be too difficult, and I'm planning that for the next commit.
2022-11-26 03:33:17 +01:00
break;
case 1:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("The Laboratory"), tr, tg, tb);
Add level exploring menu for translators I would, of course, recommend translators to translate the roomnames while playing the full game (optionally in invincibility) so they can immediately get all the context and maybe the most inspiration. And if you want to go back into a specific level, then there's always the time trials and intermission replays which will give you full coverage of all the room names. However, the time trials weren't really made for room name translation. They have some annoying features like the instant restart when you press ENTER at the wrong time, they remove context clues like teleporters and companions, but the worst problem is that the last room in a level is often completely untranslatable inside the time trials because you immediately get sent to the results screen... So, I added a new menu in the translator options, "explore game", which gives you access to all the time trials and the two intermissions, from the same menu. All these time trials (which they're still based off of, under the hood) are stripped of the annoying features that come with time trials. These are the changes I made to time trial behavior in translator exploring mode: - No 3-2-1-Go! countdown - No on-screen time/death/shiny/par - ENTER doesn't restart, and the map menu works. The entire map is also revealed. - Prize for the Reckless is in its normal form - The teleporters in Entanglement Generator, Wheeler's Wormhole and Level Complete are restored as context for room names (actually, we should probably restore them in time trials anyway? Their "press to teleport" prompt is already blocked out in time trials and they do nothing other than being a checkpoint. I guess the reason they were removed was to stop people from opening the teleporter menu when that was not specifically blocked out in time trials yet.) - The companions are there at the end of levels, and behave like in no death mode (become happy and follow you to the teleporter). Also for context. - At the end of each level, you're not suddenly sent to the menu, but you can use the teleporter at your leisure just like in the intermission replays. In the Final Level, you do get sent to the menu automatically, but after a longer delay. I made another mark on VVVVVV: don't be startled, I added gamestates. I wanted all teleporters at the end of levels to behave like the ones at the end of the intermission replays, and all handling for teleporting with specific companions is already done in gamestates, so rather than adding conditional blocks across 5 or so different gamestates, it made more sense to make a single gamestate for "teleporting in translator exploring mode" (3090). I also added an alternative to having to use gamestate 3500 or 82 for the end of the final level: 3091-3092. One other thing I want to add to the "explore game" menu: a per-level count of how many room names are left to translate. That shouldn't be too difficult, and I'm planning that for the next commit.
2022-11-26 03:33:17 +01:00
break;
case 2:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("The Tower"), tr, tg, tb);
Add level exploring menu for translators I would, of course, recommend translators to translate the roomnames while playing the full game (optionally in invincibility) so they can immediately get all the context and maybe the most inspiration. And if you want to go back into a specific level, then there's always the time trials and intermission replays which will give you full coverage of all the room names. However, the time trials weren't really made for room name translation. They have some annoying features like the instant restart when you press ENTER at the wrong time, they remove context clues like teleporters and companions, but the worst problem is that the last room in a level is often completely untranslatable inside the time trials because you immediately get sent to the results screen... So, I added a new menu in the translator options, "explore game", which gives you access to all the time trials and the two intermissions, from the same menu. All these time trials (which they're still based off of, under the hood) are stripped of the annoying features that come with time trials. These are the changes I made to time trial behavior in translator exploring mode: - No 3-2-1-Go! countdown - No on-screen time/death/shiny/par - ENTER doesn't restart, and the map menu works. The entire map is also revealed. - Prize for the Reckless is in its normal form - The teleporters in Entanglement Generator, Wheeler's Wormhole and Level Complete are restored as context for room names (actually, we should probably restore them in time trials anyway? Their "press to teleport" prompt is already blocked out in time trials and they do nothing other than being a checkpoint. I guess the reason they were removed was to stop people from opening the teleporter menu when that was not specifically blocked out in time trials yet.) - The companions are there at the end of levels, and behave like in no death mode (become happy and follow you to the teleporter). Also for context. - At the end of each level, you're not suddenly sent to the menu, but you can use the teleporter at your leisure just like in the intermission replays. In the Final Level, you do get sent to the menu automatically, but after a longer delay. I made another mark on VVVVVV: don't be startled, I added gamestates. I wanted all teleporters at the end of levels to behave like the ones at the end of the intermission replays, and all handling for teleporting with specific companions is already done in gamestates, so rather than adding conditional blocks across 5 or so different gamestates, it made more sense to make a single gamestate for "teleporting in translator exploring mode" (3090). I also added an alternative to having to use gamestate 3500 or 82 for the end of the final level: 3091-3092. One other thing I want to add to the "explore game" menu: a per-level count of how many room names are left to translate. That shouldn't be too difficult, and I'm planning that for the next commit.
2022-11-26 03:33:17 +01:00
break;
case 3:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Space Station 2"), tr, tg, tb);
Add level exploring menu for translators I would, of course, recommend translators to translate the roomnames while playing the full game (optionally in invincibility) so they can immediately get all the context and maybe the most inspiration. And if you want to go back into a specific level, then there's always the time trials and intermission replays which will give you full coverage of all the room names. However, the time trials weren't really made for room name translation. They have some annoying features like the instant restart when you press ENTER at the wrong time, they remove context clues like teleporters and companions, but the worst problem is that the last room in a level is often completely untranslatable inside the time trials because you immediately get sent to the results screen... So, I added a new menu in the translator options, "explore game", which gives you access to all the time trials and the two intermissions, from the same menu. All these time trials (which they're still based off of, under the hood) are stripped of the annoying features that come with time trials. These are the changes I made to time trial behavior in translator exploring mode: - No 3-2-1-Go! countdown - No on-screen time/death/shiny/par - ENTER doesn't restart, and the map menu works. The entire map is also revealed. - Prize for the Reckless is in its normal form - The teleporters in Entanglement Generator, Wheeler's Wormhole and Level Complete are restored as context for room names (actually, we should probably restore them in time trials anyway? Their "press to teleport" prompt is already blocked out in time trials and they do nothing other than being a checkpoint. I guess the reason they were removed was to stop people from opening the teleporter menu when that was not specifically blocked out in time trials yet.) - The companions are there at the end of levels, and behave like in no death mode (become happy and follow you to the teleporter). Also for context. - At the end of each level, you're not suddenly sent to the menu, but you can use the teleporter at your leisure just like in the intermission replays. In the Final Level, you do get sent to the menu automatically, but after a longer delay. I made another mark on VVVVVV: don't be startled, I added gamestates. I wanted all teleporters at the end of levels to behave like the ones at the end of the intermission replays, and all handling for teleporting with specific companions is already done in gamestates, so rather than adding conditional blocks across 5 or so different gamestates, it made more sense to make a single gamestate for "teleporting in translator exploring mode" (3090). I also added an alternative to having to use gamestate 3500 or 82 for the end of the final level: 3091-3092. One other thing I want to add to the "explore game" menu: a per-level count of how many room names are left to translate. That shouldn't be too difficult, and I'm planning that for the next commit.
2022-11-26 03:33:17 +01:00
break;
case 4:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("The Warp Zone"), tr, tg, tb);
Add level exploring menu for translators I would, of course, recommend translators to translate the roomnames while playing the full game (optionally in invincibility) so they can immediately get all the context and maybe the most inspiration. And if you want to go back into a specific level, then there's always the time trials and intermission replays which will give you full coverage of all the room names. However, the time trials weren't really made for room name translation. They have some annoying features like the instant restart when you press ENTER at the wrong time, they remove context clues like teleporters and companions, but the worst problem is that the last room in a level is often completely untranslatable inside the time trials because you immediately get sent to the results screen... So, I added a new menu in the translator options, "explore game", which gives you access to all the time trials and the two intermissions, from the same menu. All these time trials (which they're still based off of, under the hood) are stripped of the annoying features that come with time trials. These are the changes I made to time trial behavior in translator exploring mode: - No 3-2-1-Go! countdown - No on-screen time/death/shiny/par - ENTER doesn't restart, and the map menu works. The entire map is also revealed. - Prize for the Reckless is in its normal form - The teleporters in Entanglement Generator, Wheeler's Wormhole and Level Complete are restored as context for room names (actually, we should probably restore them in time trials anyway? Their "press to teleport" prompt is already blocked out in time trials and they do nothing other than being a checkpoint. I guess the reason they were removed was to stop people from opening the teleporter menu when that was not specifically blocked out in time trials yet.) - The companions are there at the end of levels, and behave like in no death mode (become happy and follow you to the teleporter). Also for context. - At the end of each level, you're not suddenly sent to the menu, but you can use the teleporter at your leisure just like in the intermission replays. In the Final Level, you do get sent to the menu automatically, but after a longer delay. I made another mark on VVVVVV: don't be startled, I added gamestates. I wanted all teleporters at the end of levels to behave like the ones at the end of the intermission replays, and all handling for teleporting with specific companions is already done in gamestates, so rather than adding conditional blocks across 5 or so different gamestates, it made more sense to make a single gamestate for "teleporting in translator exploring mode" (3090). I also added an alternative to having to use gamestate 3500 or 82 for the end of the final level: 3091-3092. One other thing I want to add to the "explore game" menu: a per-level count of how many room names are left to translate. That shouldn't be too difficult, and I'm planning that for the next commit.
2022-11-26 03:33:17 +01:00
break;
case 5:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Intermission 1"), tr, tg, tb);
Add level exploring menu for translators I would, of course, recommend translators to translate the roomnames while playing the full game (optionally in invincibility) so they can immediately get all the context and maybe the most inspiration. And if you want to go back into a specific level, then there's always the time trials and intermission replays which will give you full coverage of all the room names. However, the time trials weren't really made for room name translation. They have some annoying features like the instant restart when you press ENTER at the wrong time, they remove context clues like teleporters and companions, but the worst problem is that the last room in a level is often completely untranslatable inside the time trials because you immediately get sent to the results screen... So, I added a new menu in the translator options, "explore game", which gives you access to all the time trials and the two intermissions, from the same menu. All these time trials (which they're still based off of, under the hood) are stripped of the annoying features that come with time trials. These are the changes I made to time trial behavior in translator exploring mode: - No 3-2-1-Go! countdown - No on-screen time/death/shiny/par - ENTER doesn't restart, and the map menu works. The entire map is also revealed. - Prize for the Reckless is in its normal form - The teleporters in Entanglement Generator, Wheeler's Wormhole and Level Complete are restored as context for room names (actually, we should probably restore them in time trials anyway? Their "press to teleport" prompt is already blocked out in time trials and they do nothing other than being a checkpoint. I guess the reason they were removed was to stop people from opening the teleporter menu when that was not specifically blocked out in time trials yet.) - The companions are there at the end of levels, and behave like in no death mode (become happy and follow you to the teleporter). Also for context. - At the end of each level, you're not suddenly sent to the menu, but you can use the teleporter at your leisure just like in the intermission replays. In the Final Level, you do get sent to the menu automatically, but after a longer delay. I made another mark on VVVVVV: don't be startled, I added gamestates. I wanted all teleporters at the end of levels to behave like the ones at the end of the intermission replays, and all handling for teleporting with specific companions is already done in gamestates, so rather than adding conditional blocks across 5 or so different gamestates, it made more sense to make a single gamestate for "teleporting in translator exploring mode" (3090). I also added an alternative to having to use gamestate 3500 or 82 for the end of the final level: 3091-3092. One other thing I want to add to the "explore game" menu: a per-level count of how many room names are left to translate. That shouldn't be too difficult, and I'm planning that for the next commit.
2022-11-26 03:33:17 +01:00
break;
case 6:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Intermission 2"), tr, tg, tb);
Add level exploring menu for translators I would, of course, recommend translators to translate the roomnames while playing the full game (optionally in invincibility) so they can immediately get all the context and maybe the most inspiration. And if you want to go back into a specific level, then there's always the time trials and intermission replays which will give you full coverage of all the room names. However, the time trials weren't really made for room name translation. They have some annoying features like the instant restart when you press ENTER at the wrong time, they remove context clues like teleporters and companions, but the worst problem is that the last room in a level is often completely untranslatable inside the time trials because you immediately get sent to the results screen... So, I added a new menu in the translator options, "explore game", which gives you access to all the time trials and the two intermissions, from the same menu. All these time trials (which they're still based off of, under the hood) are stripped of the annoying features that come with time trials. These are the changes I made to time trial behavior in translator exploring mode: - No 3-2-1-Go! countdown - No on-screen time/death/shiny/par - ENTER doesn't restart, and the map menu works. The entire map is also revealed. - Prize for the Reckless is in its normal form - The teleporters in Entanglement Generator, Wheeler's Wormhole and Level Complete are restored as context for room names (actually, we should probably restore them in time trials anyway? Their "press to teleport" prompt is already blocked out in time trials and they do nothing other than being a checkpoint. I guess the reason they were removed was to stop people from opening the teleporter menu when that was not specifically blocked out in time trials yet.) - The companions are there at the end of levels, and behave like in no death mode (become happy and follow you to the teleporter). Also for context. - At the end of each level, you're not suddenly sent to the menu, but you can use the teleporter at your leisure just like in the intermission replays. In the Final Level, you do get sent to the menu automatically, but after a longer delay. I made another mark on VVVVVV: don't be startled, I added gamestates. I wanted all teleporters at the end of levels to behave like the ones at the end of the intermission replays, and all handling for teleporting with specific companions is already done in gamestates, so rather than adding conditional blocks across 5 or so different gamestates, it made more sense to make a single gamestate for "teleporting in translator exploring mode" (3090). I also added an alternative to having to use gamestate 3500 or 82 for the end of the final level: 3091-3092. One other thing I want to add to the "explore game" menu: a per-level count of how many room names are left to translate. That shouldn't be too difficult, and I'm planning that for the next commit.
2022-11-26 03:33:17 +01:00
break;
case 7:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("The Final Level"), tr, tg, tb);
Add level exploring menu for translators I would, of course, recommend translators to translate the roomnames while playing the full game (optionally in invincibility) so they can immediately get all the context and maybe the most inspiration. And if you want to go back into a specific level, then there's always the time trials and intermission replays which will give you full coverage of all the room names. However, the time trials weren't really made for room name translation. They have some annoying features like the instant restart when you press ENTER at the wrong time, they remove context clues like teleporters and companions, but the worst problem is that the last room in a level is often completely untranslatable inside the time trials because you immediately get sent to the results screen... So, I added a new menu in the translator options, "explore game", which gives you access to all the time trials and the two intermissions, from the same menu. All these time trials (which they're still based off of, under the hood) are stripped of the annoying features that come with time trials. These are the changes I made to time trial behavior in translator exploring mode: - No 3-2-1-Go! countdown - No on-screen time/death/shiny/par - ENTER doesn't restart, and the map menu works. The entire map is also revealed. - Prize for the Reckless is in its normal form - The teleporters in Entanglement Generator, Wheeler's Wormhole and Level Complete are restored as context for room names (actually, we should probably restore them in time trials anyway? Their "press to teleport" prompt is already blocked out in time trials and they do nothing other than being a checkpoint. I guess the reason they were removed was to stop people from opening the teleporter menu when that was not specifically blocked out in time trials yet.) - The companions are there at the end of levels, and behave like in no death mode (become happy and follow you to the teleporter). Also for context. - At the end of each level, you're not suddenly sent to the menu, but you can use the teleporter at your leisure just like in the intermission replays. In the Final Level, you do get sent to the menu automatically, but after a longer delay. I made another mark on VVVVVV: don't be startled, I added gamestates. I wanted all teleporters at the end of levels to behave like the ones at the end of the intermission replays, and all handling for teleporting with specific companions is already done in gamestates, so rather than adding conditional blocks across 5 or so different gamestates, it made more sense to make a single gamestate for "teleporting in translator exploring mode" (3090). I also added an alternative to having to use gamestate 3500 or 82 for the end of the final level: 3091-3092. One other thing I want to add to the "explore game" menu: a per-level count of how many room names are left to translate. That shouldn't be too difficult, and I'm planning that for the next commit.
2022-11-26 03:33:17 +01:00
break;
}
Add per-area untranslated roomname counters This makes it easy from the "explore game" menu to see which levels still have untranslated room names and how many.
2022-11-27 20:06:08 +01:00
if (roomname_translator::enabled)
{
if (game.currentmenuoption >= 0 && game.currentmenuoption < 8)
{
int names_left = loc::n_untranslated_roomnames_area[game.currentmenuoption + 1];
int coldiv = names_left > 0 ? 1 : 2;
char buffer[4*SCREEN_WIDTH_CHARS + 1];
loc::gettext_plural_fill(
buffer, sizeof(buffer),
"{n} normal room names untranslated",
"{n} normal room name untranslated",
"n:int",
names_left
);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, buffer, tr/coldiv, tg/coldiv, tb/coldiv);
Add per-area untranslated roomname counters This makes it easy from the "explore game" menu to see which levels still have untranslated room names and how many.
2022-11-27 20:06:08 +01:00
}
}
else
Add level exploring menu for translators I would, of course, recommend translators to translate the roomnames while playing the full game (optionally in invincibility) so they can immediately get all the context and maybe the most inspiration. And if you want to go back into a specific level, then there's always the time trials and intermission replays which will give you full coverage of all the room names. However, the time trials weren't really made for room name translation. They have some annoying features like the instant restart when you press ENTER at the wrong time, they remove context clues like teleporters and companions, but the worst problem is that the last room in a level is often completely untranslatable inside the time trials because you immediately get sent to the results screen... So, I added a new menu in the translator options, "explore game", which gives you access to all the time trials and the two intermissions, from the same menu. All these time trials (which they're still based off of, under the hood) are stripped of the annoying features that come with time trials. These are the changes I made to time trial behavior in translator exploring mode: - No 3-2-1-Go! countdown - No on-screen time/death/shiny/par - ENTER doesn't restart, and the map menu works. The entire map is also revealed. - Prize for the Reckless is in its normal form - The teleporters in Entanglement Generator, Wheeler's Wormhole and Level Complete are restored as context for room names (actually, we should probably restore them in time trials anyway? Their "press to teleport" prompt is already blocked out in time trials and they do nothing other than being a checkpoint. I guess the reason they were removed was to stop people from opening the teleporter menu when that was not specifically blocked out in time trials yet.) - The companions are there at the end of levels, and behave like in no death mode (become happy and follow you to the teleporter). Also for context. - At the end of each level, you're not suddenly sent to the menu, but you can use the teleporter at your leisure just like in the intermission replays. In the Final Level, you do get sent to the menu automatically, but after a longer delay. I made another mark on VVVVVV: don't be startled, I added gamestates. I wanted all teleporters at the end of levels to behave like the ones at the end of the intermission replays, and all handling for teleporting with specific companions is already done in gamestates, so rather than adding conditional blocks across 5 or so different gamestates, it made more sense to make a single gamestate for "teleporting in translator exploring mode" (3090). I also added an alternative to having to use gamestate 3500 or 82 for the end of the final level: 3091-3092. One other thing I want to add to the "explore game" menu: a per-level count of how many room names are left to translate. That shouldn't be too difficult, and I'm planning that for the next commit.
2022-11-26 03:33:17 +01:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("You have not enabled room name translation mode!"), tr, tg, tb);
Add level exploring menu for translators I would, of course, recommend translators to translate the roomnames while playing the full game (optionally in invincibility) so they can immediately get all the context and maybe the most inspiration. And if you want to go back into a specific level, then there's always the time trials and intermission replays which will give you full coverage of all the room names. However, the time trials weren't really made for room name translation. They have some annoying features like the instant restart when you press ENTER at the wrong time, they remove context clues like teleporters and companions, but the worst problem is that the last room in a level is often completely untranslatable inside the time trials because you immediately get sent to the results screen... So, I added a new menu in the translator options, "explore game", which gives you access to all the time trials and the two intermissions, from the same menu. All these time trials (which they're still based off of, under the hood) are stripped of the annoying features that come with time trials. These are the changes I made to time trial behavior in translator exploring mode: - No 3-2-1-Go! countdown - No on-screen time/death/shiny/par - ENTER doesn't restart, and the map menu works. The entire map is also revealed. - Prize for the Reckless is in its normal form - The teleporters in Entanglement Generator, Wheeler's Wormhole and Level Complete are restored as context for room names (actually, we should probably restore them in time trials anyway? Their "press to teleport" prompt is already blocked out in time trials and they do nothing other than being a checkpoint. I guess the reason they were removed was to stop people from opening the teleporter menu when that was not specifically blocked out in time trials yet.) - The companions are there at the end of levels, and behave like in no death mode (become happy and follow you to the teleporter). Also for context. - At the end of each level, you're not suddenly sent to the menu, but you can use the teleporter at your leisure just like in the intermission replays. In the Final Level, you do get sent to the menu automatically, but after a longer delay. I made another mark on VVVVVV: don't be startled, I added gamestates. I wanted all teleporters at the end of levels to behave like the ones at the end of the intermission replays, and all handling for teleporting with specific companions is already done in gamestates, so rather than adding conditional blocks across 5 or so different gamestates, it made more sense to make a single gamestate for "teleporting in translator exploring mode" (3090). I also added an alternative to having to use gamestate 3500 or 82 for the end of the final level: 3091-3092. One other thing I want to add to the "explore game" menu: a per-level count of how many room names are left to translate. That shouldn't be too difficult, and I'm planning that for the next commit.
2022-11-26 03:33:17 +01:00
}
break;
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
case Menu::translator_maintenance:
switch (game.currentmenuoption)
{
case 0:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Sync language files"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("Merge all new strings from the template files into the translation files, keeping existing translations."), tr, tg, tb);
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
break;
case 1:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Statistics"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("Count the amount of untranslated strings for each language."), tr, tg, tb);
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
break;
case 2:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Limits check"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("Find translations that don't fit within their defined bounds."), tr, tg, tb);
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
}
break;
case Menu::translator_maintenance_sync:
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 20, loc::gettext("If new strings were added to the English template language files, this feature will insert them in the translation files for all languages. Make a backup, just in case."), tr, tg, tb);
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN, -1, next_y, loc::gettext("Full syncing EN→All:"), tr, tg, tb);
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
next_y = font::print_wrap(PR_CEN | PR_FONT_8X8, -1, next_y+10, "meta.xml\nstrings.xml\nstrings_plural.xml\ncutscenes.xml\nroomnames.xml\nroomnames_special.xml", tr/2, tg/2, tb/2);
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN, -1, next_y, loc::gettext("Syncing not supported:"), tr, tg, tb);
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print_wrap(PR_CEN | PR_FONT_8X8, -1, next_y+10, "numbers.xml", tr/2, tg/2, tb/2);
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
break;
}
case Menu::translator_error_setlangwritedir:
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 95, loc::gettext("ERROR: Could not write to language folder! Make sure there is no \"lang\" folder next to the regular saves."), tr, tg, tb);
Move some options to a new menu, "advanced options" VVVVVV's menus are kind of packed to the brim, so I thought it was time to recategorize the menus a little bit. There's now a new "advanced options" menu which holds the following options which were moved out of graphic options, game options and especially accessibility options: - toggle mouse - unfocus pause - fake load screen - room name background - glitchrunner mode I also made the positioning of the titles and descriptions more consistent, and made some options which were moved to the new menu not so abbreviated ("load screen" and "room name bg")
2020-06-30 22:06:19 +02:00
break;
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
case Menu::speedrunneroptions:
switch (game.currentmenuoption)
{
case 0:
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Glitchrunner Mode"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Re-enable glitches that existed in previous versions of the game."), tr, tg, tb);
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
drawglitchrunnertext(next_y);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
break;
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
}
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
case 1:
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Input Delay"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Re-enable the 1-frame input delay from previous versions of the game."), tr, tg, tb);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
if (game.inputdelay)
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Input delay is ON"), tr, tg, tb);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
}
else
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Input delay is OFF"), tr / 2, tg / 2, tb / 2);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
}
break;
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
}
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
case 2:
Separate pressing Enter to open map from pressing Enter to interact This is a lot of copy-pasted code, but a little bit of copy-pasting never hurt anyone... The keybind to interact with activity zones and teleporters is now separate from the keybind to open the map, or return to the editor from in-editor playtesting, or restart a time trial. The keybind is now E, and the default controller bind is X. No controller button prompts, but the game didn't have controller button prompts anyways, so whatever. Doing this now because if people's muscle memory are going to be broken by not being able to spam the map keybind anymore, at least we can help a bit by changing the keybind so they can keep spamming it - their muscle memory is going to be broken anyways. This option has to be enabled by going to the speedrunner menu options and selecting "interact button". It is disabled by default. All prompt text needs to be string-interpolated every time they are drawn, because it is possible for people to change which interact button they use in the middle of gameplay, via the in-game options. Closes #736.
2021-04-19 08:23:44 +02:00
{
Replace hardcoded temp buffer sizes with a named constant Constants.h will house constants like the screen size and others. But basically only the screen size for now. Now we don't have to type that "4 bytes per 40 chars (whole screen)" comment everywhere...
2021-09-13 06:39:07 +02:00
char buffer[SCREEN_WIDTH_CHARS + 1];
Separate pressing Enter to open map from pressing Enter to interact This is a lot of copy-pasted code, but a little bit of copy-pasting never hurt anyone... The keybind to interact with activity zones and teleporters is now separate from the keybind to open the map, or return to the editor from in-editor playtesting, or restart a time trial. The keybind is now E, and the default controller bind is X. No controller button prompts, but the game didn't have controller button prompts anyways, so whatever. Doing this now because if people's muscle memory are going to be broken by not being able to spam the map keybind anymore, at least we can help a bit by changing the keybind so they can keep spamming it - their muscle memory is going to be broken anyways. This option has to be enabled by going to the speedrunner menu options and selecting "interact button". It is disabled by default. All prompt text needs to be string-interpolated every time they are drawn, because it is possible for people to change which interact button they use in the middle of gameplay, via the in-game options. Closes #736.
2021-04-19 08:23:44 +02:00
const char* button;
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Interact Button"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Toggle whether you interact with prompts using ENTER or E."), tr, tg, tb);
Separate pressing Enter to open map from pressing Enter to interact This is a lot of copy-pasted code, but a little bit of copy-pasting never hurt anyone... The keybind to interact with activity zones and teleporters is now separate from the keybind to open the map, or return to the editor from in-editor playtesting, or restart a time trial. The keybind is now E, and the default controller bind is X. No controller button prompts, but the game didn't have controller button prompts anyways, so whatever. Doing this now because if people's muscle memory are going to be broken by not being able to spam the map keybind anymore, at least we can help a bit by changing the keybind so they can keep spamming it - their muscle memory is going to be broken anyways. This option has to be enabled by going to the speedrunner menu options and selecting "interact button". It is disabled by default. All prompt text needs to be string-interpolated every time they are drawn, because it is possible for people to change which interact button they use in the middle of gameplay, via the in-game options. Closes #736.
2021-04-19 08:23:44 +02:00
if (game.separate_interact)
{
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
button = loc::gettext("E");
Separate pressing Enter to open map from pressing Enter to interact This is a lot of copy-pasted code, but a little bit of copy-pasting never hurt anyone... The keybind to interact with activity zones and teleporters is now separate from the keybind to open the map, or return to the editor from in-editor playtesting, or restart a time trial. The keybind is now E, and the default controller bind is X. No controller button prompts, but the game didn't have controller button prompts anyways, so whatever. Doing this now because if people's muscle memory are going to be broken by not being able to spam the map keybind anymore, at least we can help a bit by changing the keybind so they can keep spamming it - their muscle memory is going to be broken anyways. This option has to be enabled by going to the speedrunner menu options and selecting "interact button". It is disabled by default. All prompt text needs to be string-interpolated every time they are drawn, because it is possible for people to change which interact button they use in the middle of gameplay, via the in-game options. Closes #736.
2021-04-19 08:23:44 +02:00
}
else
{
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
button = loc::gettext("ENTER");
Separate pressing Enter to open map from pressing Enter to interact This is a lot of copy-pasted code, but a little bit of copy-pasting never hurt anyone... The keybind to interact with activity zones and teleporters is now separate from the keybind to open the map, or return to the editor from in-editor playtesting, or restart a time trial. The keybind is now E, and the default controller bind is X. No controller button prompts, but the game didn't have controller button prompts anyways, so whatever. Doing this now because if people's muscle memory are going to be broken by not being able to spam the map keybind anymore, at least we can help a bit by changing the keybind so they can keep spamming it - their muscle memory is going to be broken anyways. This option has to be enabled by going to the speedrunner menu options and selecting "interact button". It is disabled by default. All prompt text needs to be string-interpolated every time they are drawn, because it is possible for people to change which interact button they use in the middle of gameplay, via the in-game options. Closes #736.
2021-04-19 08:23:44 +02:00
}
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
vformat_buf(buffer, sizeof(buffer), loc::gettext("Interact button: {button}"), "button:str", button);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, buffer, tr, tg, tb);
Separate pressing Enter to open map from pressing Enter to interact This is a lot of copy-pasted code, but a little bit of copy-pasting never hurt anyone... The keybind to interact with activity zones and teleporters is now separate from the keybind to open the map, or return to the editor from in-editor playtesting, or restart a time trial. The keybind is now E, and the default controller bind is X. No controller button prompts, but the game didn't have controller button prompts anyways, so whatever. Doing this now because if people's muscle memory are going to be broken by not being able to spam the map keybind anymore, at least we can help a bit by changing the keybind so they can keep spamming it - their muscle memory is going to be broken anyways. This option has to be enabled by going to the speedrunner menu options and selecting "interact button". It is disabled by default. All prompt text needs to be string-interpolated every time they are drawn, because it is possible for people to change which interact button they use in the middle of gameplay, via the in-game options. Closes #736.
2021-04-19 08:23:44 +02:00
break;
}
case 3:
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Fake Load Screen"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Disable the fake loading screen which appears on game launch."), tr, tg, tb);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
if (game.skipfakeload)
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Fake loading screen is OFF"), tr / 2, tg / 2, tb / 2);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
else
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Fake loading screen is ON"), tr, tg, tb);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
break;
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
}
Add in-game timer option (#790)
2021-08-05 23:31:20 +02:00
case 4:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("In-Game Timer"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Toggle the in-game timer outside of time trials."), tr, tg, tb);
Add in-game timer option (#790)
2021-08-05 23:31:20 +02:00
if (game.showingametimer)
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("In-Game Timer is ON"), tr, tg, tb);
Fix trailing whitespace introduced by lssa No comment.
2021-08-06 00:04:18 +02:00
}
else
Add in-game timer option (#790)
2021-08-05 23:31:20 +02:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("In-Game Timer is OFF"), tr / 2, tg / 2, tb / 2);
Add in-game timer option (#790)
2021-08-05 23:31:20 +02:00
}
break;
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
}
break;
Split glitchrunner mode into multiple versions Previously, turning glitchrunner mode on essentially locked you to emulating 2.0, and turning it off just meant normal 2.3 behavior. But what if you wanted 2.2 behavior instead? Well, that's what I had to ask when a TAS of mine would desync in 2.3 because of the two-frame delay fix (glitchrunner off), but would also desync because of 2.0 warp lines (glitchrunner on). What I've done is made it so there are three states to glitchrunner mode now: 2.0 (previously just the "on" state), 2.2 (previously a state you couldn't use), and "off". Furthermore, I made it an enum, so in case future versions of the game patch out more glitches, we can add them to the enum (and the only other thing we have to update is a lookup table in GlitchrunnerMode.c). Also, 2.2 glitches exist in 2.0, so you'll want to use GlitchrunnerMode_less_than_or_equal() to check glitchrunner version.
2021-08-05 02:09:49 +02:00
case Menu::setglitchrunner:
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Glitchrunner Mode"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Select a new glitchrunner version below."), tr, tg, tb);
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
drawglitchrunnertext(next_y);
Split glitchrunner mode into multiple versions Previously, turning glitchrunner mode on essentially locked you to emulating 2.0, and turning it off just meant normal 2.3 behavior. But what if you wanted 2.2 behavior instead? Well, that's what I had to ask when a TAS of mine would desync in 2.3 because of the two-frame delay fix (glitchrunner off), but would also desync because of 2.0 warp lines (glitchrunner on). What I've done is made it so there are three states to glitchrunner mode now: 2.0 (previously just the "on" state), 2.2 (previously a state you couldn't use), and "off". Furthermore, I made it an enum, so in case future versions of the game patch out more glitches, we can add them to the enum (and the only other thing we have to update is a lookup table in GlitchrunnerMode.c). Also, 2.2 glitches exist in 2.0, so you'll want to use GlitchrunnerMode_less_than_or_equal() to check glitchrunner version.
2021-08-05 02:09:49 +02:00
break;
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
}
Move some options to a new menu, "advanced options" VVVVVV's menus are kind of packed to the brim, so I thought it was time to recategorize the menus a little bit. There's now a new "advanced options" menu which holds the following options which were moved out of graphic options, game options and especially accessibility options: - toggle mouse - unfocus pause - fake load screen - room name background - glitchrunner mode I also made the positioning of the titles and descriptions more consistent, and made some options which were moved to the new menu not so abbreviated ("load screen" and "room name bg")
2020-06-30 22:06:19 +02:00
case Menu::advancedoptions:
switch (game.currentmenuoption)
{
case 0:
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Unfocus Pause"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Toggle if the game will pause when the window is unfocused."), tr, tg, tb);
Move some options to a new menu, "advanced options" VVVVVV's menus are kind of packed to the brim, so I thought it was time to recategorize the menus a little bit. There's now a new "advanced options" menu which holds the following options which were moved out of graphic options, game options and especially accessibility options: - toggle mouse - unfocus pause - fake load screen - room name background - glitchrunner mode I also made the positioning of the titles and descriptions more consistent, and made some options which were moved to the new menu not so abbreviated ("load screen" and "room name bg")
2020-06-30 22:06:19 +02:00
if (game.disablepause)
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Unfocus pause is OFF"), tr/2, tg/2, tb/2);
Move some options to a new menu, "advanced options" VVVVVV's menus are kind of packed to the brim, so I thought it was time to recategorize the menus a little bit. There's now a new "advanced options" menu which holds the following options which were moved out of graphic options, game options and especially accessibility options: - toggle mouse - unfocus pause - fake load screen - room name background - glitchrunner mode I also made the positioning of the titles and descriptions more consistent, and made some options which were moved to the new menu not so abbreviated ("load screen" and "room name bg")
2020-06-30 22:06:19 +02:00
}
else
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Unfocus pause is ON"), tr, tg, tb);
Move some options to a new menu, "advanced options" VVVVVV's menus are kind of packed to the brim, so I thought it was time to recategorize the menus a little bit. There's now a new "advanced options" menu which holds the following options which were moved out of graphic options, game options and especially accessibility options: - toggle mouse - unfocus pause - fake load screen - room name background - glitchrunner mode I also made the positioning of the titles and descriptions more consistent, and made some options which were moved to the new menu not so abbreviated ("load screen" and "room name bg")
2020-06-30 22:06:19 +02:00
}
break;
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
}
Axe mouse cursor config option The config option has been removed. I'm going to implement something that automatically shows and hides the mouse cursor whenever appropriate, which is better than a config option.
2021-04-17 07:00:33 +02:00
case 1:
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Unfocus Audio"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Toggle if the audio will pause when the window is unfocused."), tr, tg, tb);
Add unfocus audio pause option Some people prefer the 2.2 behavior where unfocusing pauses the game, but the music still plays. One such person is Trinket9 on the VVVVVV Discord server, who wanted it that way. The reason audio pausing was added in the first place was to prevent desyncing music in levels with cutscenes that synced to music. Rather than reverting it, let's add this option instead.
2021-08-05 21:20:05 +02:00
if (game.disableaudiopause)
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Unfocus audio pause is OFF"), tr/2, tg/2, tb/2);
Add unfocus audio pause option Some people prefer the 2.2 behavior where unfocusing pauses the game, but the music still plays. One such person is Trinket9 on the VVVVVV Discord server, who wanted it that way. The reason audio pausing was added in the first place was to prevent desyncing music in levels with cutscenes that synced to music. Rather than reverting it, let's add this option instead.
2021-08-05 21:20:05 +02:00
}
else
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Unfocus audio pause is ON"), tr, tg, tb);
Add unfocus audio pause option Some people prefer the 2.2 behavior where unfocusing pauses the game, but the music still plays. One such person is Trinket9 on the VVVVVV Discord server, who wanted it that way. The reason audio pausing was added in the first place was to prevent desyncing music in levels with cutscenes that synced to music. Rather than reverting it, let's add this option instead.
2021-08-05 21:20:05 +02:00
}
break;
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
}
Add unfocus audio pause option Some people prefer the 2.2 behavior where unfocusing pauses the game, but the music still plays. One such person is Trinket9 on the VVVVVV Discord server, who wanted it that way. The reason audio pausing was added in the first place was to prevent desyncing music in levels with cutscenes that synced to music. Rather than reverting it, let's add this option instead.
2021-08-05 21:20:05 +02:00
case 2:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Room Name BG"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Lets you see through what is behind the name at the bottom of the screen."), tr, tg, tb);
Move some options to a new menu, "advanced options" VVVVVV's menus are kind of packed to the brim, so I thought it was time to recategorize the menus a little bit. There's now a new "advanced options" menu which holds the following options which were moved out of graphic options, game options and especially accessibility options: - toggle mouse - unfocus pause - fake load screen - room name background - glitchrunner mode I also made the positioning of the titles and descriptions more consistent, and made some options which were moved to the new menu not so abbreviated ("load screen" and "room name bg")
2020-06-30 22:06:19 +02:00
if (graphics.translucentroomname)
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Room name background is TRANSLUCENT"), tr/2, tg/2, tb/2);
Move some options to a new menu, "advanced options" VVVVVV's menus are kind of packed to the brim, so I thought it was time to recategorize the menus a little bit. There's now a new "advanced options" menu which holds the following options which were moved out of graphic options, game options and especially accessibility options: - toggle mouse - unfocus pause - fake load screen - room name background - glitchrunner mode I also made the positioning of the titles and descriptions more consistent, and made some options which were moved to the new menu not so abbreviated ("load screen" and "room name bg")
2020-06-30 22:06:19 +02:00
else
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Room name background is OPAQUE"), tr, tg, tb);
Move some options to a new menu, "advanced options" VVVVVV's menus are kind of packed to the brim, so I thought it was time to recategorize the menus a little bit. There's now a new "advanced options" menu which holds the following options which were moved out of graphic options, game options and especially accessibility options: - toggle mouse - unfocus pause - fake load screen - room name background - glitchrunner mode I also made the positioning of the titles and descriptions more consistent, and made some options which were moved to the new menu not so abbreviated ("load screen" and "room name bg")
2020-06-30 22:06:19 +02:00
break;
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
case Menu::accessibility:
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
{
Use macros to calculate accessibility offset This means the offset is calculated at compile-time, and we can use a proper case-switch here instead of an else-if chain.
2021-04-09 18:00:52 +02:00
#ifdef MAKEANDPLAY
#define OFFSET 0
#else
#define OFFSET 1
#endif
switch (game.currentmenuoption)
{
Clean up of options menus for v2.3 (fixes #696)
2021-04-09 12:09:12 +02:00
#if !defined(MAKEANDPLAY)
Use macros to calculate accessibility offset This means the offset is calculated at compile-time, and we can use a proper case-switch here instead of an else-if chain.
2021-04-09 18:00:52 +02:00
case 0:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Unlock Play Modes"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("Unlock parts of the game normally unlocked as you progress."), tr, tg, tb);
Use macros to calculate accessibility offset This means the offset is calculated at compile-time, and we can use a proper case-switch here instead of an else-if chain.
2021-04-09 18:00:52 +02:00
break;
Clean up of options menus for v2.3 (fixes #696)
2021-04-09 12:09:12 +02:00
#endif
Use macros to calculate accessibility offset This means the offset is calculated at compile-time, and we can use a proper case-switch here instead of an else-if chain.
2021-04-09 18:00:52 +02:00
case OFFSET+0:
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Invincibility"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Explore the game freely without dying. (Can cause glitches.)"), tr, tg, tb);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
if (map.invincibility)
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Invincibility is ON."), tr, tg, tb);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
}
else
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Invincibility is OFF."), tr / 2, tg / 2, tb / 2);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
}
Use macros to calculate accessibility offset This means the offset is calculated at compile-time, and we can use a proper case-switch here instead of an else-if chain.
2021-04-09 18:00:52 +02:00
break;
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
}
Use macros to calculate accessibility offset This means the offset is calculated at compile-time, and we can use a proper case-switch here instead of an else-if chain.
2021-04-09 18:00:52 +02:00
case OFFSET+1:
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Slowdown"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Reduce the game speed."), tr, tg, tb);
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
drawslowdowntext(next_y);
Use macros to calculate accessibility offset This means the offset is calculated at compile-time, and we can use a proper case-switch here instead of an else-if chain.
2021-04-09 18:00:52 +02:00
break;
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
}
Use macros to calculate accessibility offset This means the offset is calculated at compile-time, and we can use a proper case-switch here instead of an else-if chain.
2021-04-09 18:00:52 +02:00
case OFFSET+2:
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Backgrounds"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Disable animated backgrounds in menus and during gameplay."), tr, tg, tb);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
if (!game.colourblindmode)
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Backgrounds are ON."), tr, tg, tb);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
}
else
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Backgrounds are OFF."), tr / 2, tg / 2, tb / 2);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
}
Use macros to calculate accessibility offset This means the offset is calculated at compile-time, and we can use a proper case-switch here instead of an else-if chain.
2021-04-09 18:00:52 +02:00
break;
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
}
Use macros to calculate accessibility offset This means the offset is calculated at compile-time, and we can use a proper case-switch here instead of an else-if chain.
2021-04-09 18:00:52 +02:00
case OFFSET+3:
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Screen Effects"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Disables screen shakes and flashes."), tr, tg, tb);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
if (!game.noflashingmode)
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Screen Effects are ON."), tr, tg, tb);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
}
else
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Screen Effects are OFF."), tr / 2, tg / 2, tb / 2);
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
}
Use macros to calculate accessibility offset This means the offset is calculated at compile-time, and we can use a proper case-switch here instead of an else-if chain.
2021-04-09 18:00:52 +02:00
break;
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
}
Use macros to calculate accessibility offset This means the offset is calculated at compile-time, and we can use a proper case-switch here instead of an else-if chain.
2021-04-09 18:00:52 +02:00
case OFFSET+4:
Outline text outline text and draw backing In order to help players spot the difference between outlined text and non-outlined text, we now outline the text outline text itself (if text outline is enabled, of course). But drawing the outline alone doesn't stand out enough, so we have to draw a solid backing against the text as well, in order to properly show the contrast.
2021-06-13 00:19:15 +02:00
{
const char* text;
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Text Outline"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Disables outline on game text."), tr, tg, tb);
Outline text outline text and draw backing In order to help players spot the difference between outlined text and non-outlined text, we now outline the text outline text itself (if text outline is enabled, of course). But drawing the outline alone doesn't stand out enough, so we have to draw a solid backing against the text as well, in order to properly show the contrast.
2021-06-13 00:19:15 +02:00
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.fill_rect(0, next_y-4, 320, 16, tr, tg, tb);
Outline text outline text and draw backing In order to help players spot the difference between outlined text and non-outlined text, we now outline the text outline text itself (if text outline is enabled, of course). But drawing the outline alone doesn't stand out enough, so we have to draw a solid backing against the text as well, in order to properly show the contrast.
2021-06-13 00:19:15 +02:00
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
if (!graphics.notextoutline)
{
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
text = loc::gettext("Text outlines are ON.");
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
}
else
{
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
text = loc::gettext("Text outlines are OFF.");
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
}
Outline text outline text and draw backing In order to help players spot the difference between outlined text and non-outlined text, we now outline the text outline text itself (if text outline is enabled, of course). But drawing the outline alone doesn't stand out enough, so we have to draw a solid backing against the text as well, in order to properly show the contrast.
2021-06-13 00:19:15 +02:00
Completely remove Graphics::bprint Only three deprecated functions remain: - Graphics::Print - Graphics::PrintWrap - Graphics::bigprint I also fixed multiline transparent textboxes having their outlines overlap the text itself, and fixed textboxclass::padtowidth assuming glyph widths of 8 (it made the hints at the start of intermission 1 run offscreen for example)
2023-01-17 22:18:39 +01:00
font::print(PR_BOR | PR_CEN, -1, next_y, text, 255, 255, 255);
Use macros to calculate accessibility offset This means the offset is calculated at compile-time, and we can use a proper case-switch here instead of an else-if chain.
2021-04-09 18:00:52 +02:00
break;
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
}
Outline text outline text and draw backing In order to help players spot the difference between outlined text and non-outlined text, we now outline the text outline text itself (if text outline is enabled, of course). But drawing the outline alone doesn't stand out enough, so we have to draw a solid backing against the text as well, in order to properly show the contrast.
2021-06-13 00:19:15 +02:00
}
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
break;
Use macros to calculate accessibility offset This means the offset is calculated at compile-time, and we can use a proper case-switch here instead of an else-if chain.
2021-04-09 18:00:52 +02:00
#undef OFFSET
Fix whitespace from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 introduced mixed indentation and one trailing whitespace, which I've cleaned up.
2021-04-09 17:53:55 +02:00
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
case Menu::playint1:
case Menu::playint2:
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("Who do you want to play the level with?"), tr, tg, tb);
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
case Menu::playmodes:
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
switch (game.currentmenuoption)
Fix mixed indentation in titlerender.cpp There's a lot, looks like mainly because of the person who added MMMMMM and M&P.
2020-04-02 23:19:15 +02:00
{
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
case 0:
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Time Trials"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Replay any level in the game in a competitive time trial mode."), tr, tg, tb);
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
Factor out slowdown/invincibility conds to function This factors out the slowdown and invincibility conditionals to a function. This means less copy-pasted code, and it also conveys intent (that we don't want to allow competitive options if we have either of these cheats enabled). This function isn't implemented in the header because then we would have to include Map.h for map.invincibility, and transitive includes are evil. Although, map.invincibility ought to be on Game instead (it was only mapclass due to 2.2-and-previous argument passing), but that's a bunch of variable reshuffling that can be done later.
2021-05-04 03:29:23 +02:00
if (game.nocompetitive())
Fix mixed indentation in titlerender.cpp There's a lot, looks like mainly because of the person who added MMMMMM and M&P.
2020-04-02 23:19:15 +02:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Time Trials are not available with slowdown or invincibility."), tr, tg, tb);
Fix mixed indentation in titlerender.cpp There's a lot, looks like mainly because of the person who added MMMMMM and M&P.
2020-04-02 23:19:15 +02:00
}
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
break;
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
}
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
case 1:
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Intermissions"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Replay the intermission levels."), tr, tg, tb);
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
if (!game.unlock[15] && !game.unlock[16])
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("TO UNLOCK: Complete the intermission levels in-game."), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
break;
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
}
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
case 2:
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("No Death Mode"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Play the entire game without dying once."), tr, tg, tb);
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
Factor out slowdown/invincibility conds to function This factors out the slowdown and invincibility conditionals to a function. This means less copy-pasted code, and it also conveys intent (that we don't want to allow competitive options if we have either of these cheats enabled). This function isn't implemented in the header because then we would have to include Map.h for map.invincibility, and transitive includes are evil. Although, map.invincibility ought to be on Game instead (it was only mapclass due to 2.2-and-previous argument passing), but that's a bunch of variable reshuffling that can be done later.
2021-05-04 03:29:23 +02:00
if (game.nocompetitive())
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("No Death Mode is not available with slowdown or invincibility."), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
else if (!game.unlock[17])
Add text outline as an accessibility option
2020-01-17 18:37:53 +01:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("TO UNLOCK: Achieve an S-rank or above in at least 4 time trials."), tr, tg, tb);
Add text outline as an accessibility option
2020-01-17 18:37:53 +01:00
}
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
break;
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
}
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
case 3:
Add Flip Mode to game options if in M&P or in-game menu and unlocked Flip Mode will now be in the game options menu if either: (1) You're playing the M&P version. (2) You have it unlocked and you came here from the in-game pause screen. This is because if you're playing M&P, you'd have to close the game, edit unlock.vvv, and re-launch the game to toggle Flip Mode, since there's no other way to do so. And if you're playing the full version, you'd have to save and exit your session in order to toggle Flip Mode.
2020-06-30 05:45:57 +02:00
// WARNING: Partially duplicated in Menu::options
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Flip Mode"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Flip the entire game vertically. Compatible with other game modes."), tr, tg, tb);
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
if (game.unlock[18])
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
if (graphics.setflipmode)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Currently ENABLED!"), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Currently Disabled."), tr/2, tg/2, tb/2);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Add an accessibility option to toggle the fake loading screen (#63)
2020-01-13 02:45:44 +01:00
}
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
else
Add an accessibility option to be able to see through the roomname This is the variable dwgfx.translucentroomname and <translucentroomname> in unlock.vvv. This lets you see through the black background of the roomname at the bottom of the screen, i.e. it makes the roomname background translucent. So you can see if someone decides to hide pesky spikes there.
2020-01-25 05:43:04 +01:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("TO UNLOCK: Complete the game."), tr, tg, tb);
Add an accessibility option to be able to see through the roomname This is the variable dwgfx.translucentroomname and <translucentroomname> in unlock.vvv. This lets you see through the black background of the roomname at the bottom of the screen, i.e. it makes the roomname background translucent. So you can see if someone decides to hide pesky spikes there.
2020-01-25 05:43:04 +01:00
}
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
break;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
case Menu::youwannaquit:
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 75, loc::gettext("Are you sure you want to quit?"), tr, tg, tb);
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
case Menu::continuemenu:
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
switch (game.currentmenuoption)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
case 0:
Reposition game time and trinket count in game save box The game time is moved a little to the left, and the trinket count a little to the right. To fix #376 for real, the trinket count is now positioned automatically based on its length. The trinket icon is now also displayed at the far right (instead of to the left of the count) for better symmetry, and so that switching between tele save and quick save doesn't make the trinket icon move if the trinket counts have different lengths.
2020-08-03 00:11:58 +02:00
{
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
//Show teleporter save info
drawpixeltextbox: Remove now-unused parameters They go bye-bye. This is a friendly reminder that the map menu rendering code is heavily copy-pasted, dear god...
2021-09-04 00:26:57 +02:00
graphics.drawpixeltextbox(17, 65-20, 286, 90, 65, 185, 207);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 20, loc::gettext("Tele Save"), tr, tg, tb);
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN, -1, 80-20, game.tele_currentarea, 25, 255 - (help.glow / 2), 255 - (help.glow / 2));
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
for (int i = 0; i < 6; i++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
graphics.drawcrewman(169-(3*42)+(i*42), 95-20, i, game.tele_crewstats[i], true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(0, 59, 132-20, game.tele_gametime, 255 - (help.glow / 2), 255 - (help.glow / 2), 255 - (help.glow / 2));
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
char buffer[SCREEN_WIDTH_CHARS + 1];
vformat_buf(buffer, sizeof(buffer),
loc::gettext("{savebox_n_trinkets|wordy}"),
"savebox_n_trinkets:int",
game.tele_trinkets
);
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_RIGHT, 262, 132-20, buffer, 255 - (help.glow / 2), 255 - (help.glow / 2), 255 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.draw_sprite(34, 126-20, 50, graphics.col_clock);
graphics.draw_sprite(270, 126-20, 22, graphics.col_trinket);
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
break;
Reposition game time and trinket count in game save box The game time is moved a little to the left, and the trinket count a little to the right. To fix #376 for real, the trinket count is now positioned automatically based on its length. The trinket icon is now also displayed at the far right (instead of to the left of the count) for better symmetry, and so that switching between tele save and quick save doesn't make the trinket icon move if the trinket counts have different lengths.
2020-08-03 00:11:58 +02:00
}
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
case 1:
Reposition game time and trinket count in game save box The game time is moved a little to the left, and the trinket count a little to the right. To fix #376 for real, the trinket count is now positioned automatically based on its length. The trinket icon is now also displayed at the far right (instead of to the left of the count) for better symmetry, and so that switching between tele save and quick save doesn't make the trinket icon move if the trinket counts have different lengths.
2020-08-03 00:11:58 +02:00
{
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
//Show quick save info
drawpixeltextbox: Remove now-unused parameters They go bye-bye. This is a friendly reminder that the map menu rendering code is heavily copy-pasted, dear god...
2021-09-04 00:26:57 +02:00
graphics.drawpixeltextbox(17, 65-20, 286, 90, 65, 185, 207);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 20, loc::gettext("Quick Save"), tr, tg, tb);
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN, -1, 80-20, game.quick_currentarea, 25, 255 - (help.glow / 2), 255 - (help.glow / 2));
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
for (int i = 0; i < 6; i++)
{
graphics.drawcrewman(169-(3*42)+(i*42), 95-20, i, game.quick_crewstats[i], true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(0, 59, 132-20, game.quick_gametime, 255 - (help.glow / 2), 255 - (help.glow / 2), 255 - (help.glow / 2));
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
char buffer[SCREEN_WIDTH_CHARS + 1];
vformat_buf(buffer, sizeof(buffer),
loc::gettext("{savebox_n_trinkets|wordy}"),
"savebox_n_trinkets:int",
game.quick_trinkets
);
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_RIGHT, 262, 132-20, buffer, 255 - (help.glow / 2), 255 - (help.glow / 2), 255 - (help.glow / 2));
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.draw_sprite(34, 126-20, 50, graphics.col_clock);
graphics.draw_sprite(270, 126-20, 22, graphics.col_trinket);
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
break;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Reposition game time and trinket count in game save box The game time is moved a little to the left, and the trinket count a little to the right. To fix #376 for real, the trinket count is now positioned automatically based on its length. The trinket icon is now also displayed at the far right (instead of to the left of the count) for better symmetry, and so that switching between tele save and quick save doesn't make the trinket icon move if the trinket counts have different lengths.
2020-08-03 00:11:58 +02:00
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
case Menu::gameover:
case Menu::gameover2:
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_3X | PR_CEN, -1, 25, loc::gettext("GAME OVER"), tr, tg, tb);
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
Fix No Death Mode results being reset before being shown This does the same thing as the last commit, but for No Death Mode instead of Time Trials. Whenever you die in No Death Mode, or complete it, all the relevant variables get copied to variables prefixed with 'ndmresult' that never get reset by script.hardreset(), and these variables are what titlerender() use, instead of the "live" ones.
2021-01-08 01:18:07 +01:00
for (size_t i = 0; i < SDL_arraysize(game.ndmresultcrewstats); i++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Fix No Death Mode results being reset before being shown This does the same thing as the last commit, but for No Death Mode instead of Time Trials. Whenever you die in No Death Mode, or complete it, all the relevant variables get copied to variables prefixed with 'ndmresult' that never get reset by script.hardreset(), and these variables are what titlerender() use, instead of the "live" ones.
2021-01-08 01:18:07 +01:00
graphics.drawcrewman(169-(3*42)+(i*42), 68, i, game.ndmresultcrewstats[i], true);
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
}
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
char buffer[2*SCREEN_WIDTH_CHARS + 1];
loc::gettext_plural_fill(
buffer, sizeof(buffer),
"You rescued {n_crew|wordy} crewmates",
"You rescued {n_crew|wordy} crewmate",
"n_crew:int",
game.ndmresultcrewrescued
);
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN, -1, 100, buffer, tr, tg, tb);
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
loc::gettext_plural_fill(
buffer, sizeof(buffer),
"and found {n_trinkets|wordy} trinkets.",
"and found {n_trinkets|wordy} trinket.",
"n_trinkets:int",
game.ndmresulttrinkets
);
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print_wrap(PR_CEN | PR_CJK_LOW, -1, 110, buffer, tr, tg, tb);
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN, -1, 145, loc::gettext("You managed to reach:"), tr, tg, tb);
font::print(PR_CEN | PR_CJK_LOW, -1, 155, game.ndmresulthardestroom, tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
const char* encouragement;
Fix No Death Mode results being reset before being shown This does the same thing as the last commit, but for No Death Mode instead of Time Trials. Whenever you die in No Death Mode, or complete it, all the relevant variables get copied to variables prefixed with 'ndmresult' that never get reset by script.hardreset(), and these variables are what titlerender() use, instead of the "live" ones.
2021-01-08 01:18:07 +01:00
switch (game.ndmresultcrewrescued)
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
{
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
case 1:
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
encouragement = loc::gettext("Keep trying! You'll get there!");
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
break;
case 2:
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
encouragement = loc::gettext("Nice one!");
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
break;
case 3:
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
encouragement = loc::gettext("Wow! Congratulations!");
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
break;
case 4:
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
encouragement = loc::gettext("Incredible!");
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
break;
case 5:
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
encouragement = loc::gettext("Unbelievable! Well done!");
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
break;
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
default:
encouragement = loc::gettext("Er, how did you do that?");
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
break;
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 190, encouragement, tr, tg, tb);
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
case Menu::nodeathmodecomplete:
case Menu::nodeathmodecomplete2:
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_4X | PR_CEN | PR_CJK_LOW, -1, 8, loc::gettext("WOW"), tr, tg, tb);
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
Fix No Death Mode results being reset before being shown This does the same thing as the last commit, but for No Death Mode instead of Time Trials. Whenever you die in No Death Mode, or complete it, all the relevant variables get copied to variables prefixed with 'ndmresult' that never get reset by script.hardreset(), and these variables are what titlerender() use, instead of the "live" ones.
2021-01-08 01:18:07 +01:00
for (size_t i = 0; i < SDL_arraysize(game.ndmresultcrewstats); i++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Fix No Death Mode results being reset before being shown This does the same thing as the last commit, but for No Death Mode instead of Time Trials. Whenever you die in No Death Mode, or complete it, all the relevant variables get copied to variables prefixed with 'ndmresult' that never get reset by script.hardreset(), and these variables are what titlerender() use, instead of the "live" ones.
2021-01-08 01:18:07 +01:00
graphics.drawcrewman(169-(3*42)+(i*42), 68, i, game.ndmresultcrewstats[i], true);
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
}
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN, -1, 100, loc::gettext("You rescued all the crewmates!"), tr, tg, tb);
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
char buffer[3*SCREEN_WIDTH_CHARS + 1];
loc::gettext_plural_fill(
buffer, sizeof(buffer),
"And you found {n_trinkets|wordy} trinkets.",
"And you found {n_trinkets|wordy} trinket.",
"n_trinkets:int",
game.ndmresulttrinkets
);
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print_wrap(PR_CEN | PR_CJK_LOW, -1, 110, buffer, tr, tg, tb);
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 160, loc::gettext("A new trophy has been awarded and placed in the secret lab to acknowledge your achievement!"), tr, tg, tb);
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
case Menu::timetrialcomplete:
case Menu::timetrialcomplete2:
case Menu::timetrialcomplete3:
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
{
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_3X | PR_CEN, -1, 20, loc::gettext("Results"), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
std::string tempstring = game.resulttimestring() + loc::gettext(" / ") + game.timetstring(game.timetrialresultpar) + loc::gettext(".99");
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
graphics.drawspritesetcol(22, 80-15, 50, 22);
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_CJK_HIGH, 49, 80-15, loc::gettext("TIME TAKEN:"), 255, 255, 255);
font::print(PR_CJK_LOW, 49, 90-15, tempstring, tr, tg, tb);
Fix Time Trial results being reset before being shown This makes it so when a Time Trial gets completed, all the relevant variables get copied onto variables prefixed with 'timetrialresult', which never get reset by script.hardreset(). Then titlerender() will use those variables accordingly.
2021-01-08 01:02:45 +01:00
if (game.timetrialresulttime <= game.timetrialresultpar)
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
{
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_RIGHT | PR_CJK_LOW, 292, 90-15, loc::gettext("+1 Rank!"), 255, 255, 255);
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Fix Time Trial results being reset before being shown This makes it so when a Time Trial gets completed, all the relevant variables get copied onto variables prefixed with 'timetrialresult', which never get reset by script.hardreset(). Then titlerender() will use those variables accordingly.
2021-01-08 01:02:45 +01:00
tempstring = help.String(game.timetrialresultdeaths);
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
graphics.drawspritesetcol(22-4, 80+20-4, 12, 22);
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_CJK_HIGH, 49, 80+20, loc::gettext("NUMBER OF DEATHS:"), 255, 255, 255);
font::print(PR_CJK_LOW, 49, 90+20, tempstring, tr, tg, tb);
Fix Time Trial results being reset before being shown This makes it so when a Time Trial gets completed, all the relevant variables get copied onto variables prefixed with 'timetrialresult', which never get reset by script.hardreset(). Then titlerender() will use those variables accordingly.
2021-01-08 01:02:45 +01:00
if (game.timetrialresultdeaths == 0)
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
{
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_RIGHT | PR_CJK_LOW, 292, 90+20, loc::gettext("+1 Rank!"), 255, 255, 255);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
char buffer[SCREEN_WIDTH_CHARS + 1];
vformat_buf(
buffer, sizeof(buffer),
loc::gettext("{n_trinkets} of {max_trinkets}"),
"n_trinkets:int, max_trinkets:int",
game.timetrialresulttrinkets, game.timetrialresultshinytarget
);
graphics.drawspritesetcol(22, 80+55, 22, 22);
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_CJK_HIGH, 49, 80+55, loc::gettext("SHINY TRINKETS:"), 255, 255, 255);
font::print(PR_CJK_LOW, 49, 90+55, buffer, tr, tg, tb);
Fix Time Trial results being reset before being shown This makes it so when a Time Trial gets completed, all the relevant variables get copied onto variables prefixed with 'timetrialresult', which never get reset by script.hardreset(). Then titlerender() will use those variables accordingly.
2021-01-08 01:02:45 +01:00
if (game.timetrialresulttrinkets >= game.timetrialresultshinytarget)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_RIGHT | PR_CJK_LOW, 292, 90+55, loc::gettext("+1 Rank!"), 255, 255, 255);
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
const char* rank = "";
switch(game.timetrialrank)
{
case 0:
rank = loc::gettext("B");
break;
case 1:
rank = loc::gettext("A");
break;
case 2:
rank = loc::gettext("S");
break;
case 3:
rank = loc::gettext("V");
break;
}
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
int rankw = font::len(PR_4X, rank);
int ranktextw = font::len(PR_2X, loc::gettext("Rank:")) + 16 + rankw;
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
int ranktextx = (320-ranktextw)/2;
int rankx = ranktextx + ranktextw - rankw;
Convert menu names to be an enum instead of being stringly-typed Stringly-typed things are bad, because if you make a typo when typing out a string, it's not caught at compile-time. And in the case of this menu system, you'd have to do an excessive amount of testing to uncover any bugs caused by a typo. Why do that when you can just use an enum and catch compile-time errors instead? Also, you can't use switch-case statements on stringly-typed variables. So every menu name is now in the enum Menu::MenuName, but you can simply refer to a menu name by just prefixing it with Menu::. Unfortunately, I've had to change the "continue" menu name to be "continuemenu", because "continue" is a keyword in C and C++. Also, it looks like "timetrialcomplete4" is an unused menu name, even though it was referenced in Render.cpp.
2020-04-16 06:53:36 +02:00
if (game.currentmenuname == Menu::timetrialcomplete2 || game.currentmenuname == Menu::timetrialcomplete3)
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
{
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_2X, ranktextx, 175, loc::gettext("Rank:"), tr, tg, tb);
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
}
Convert menu names to be an enum instead of being stringly-typed Stringly-typed things are bad, because if you make a typo when typing out a string, it's not caught at compile-time. And in the case of this menu system, you'd have to do an excessive amount of testing to uncover any bugs caused by a typo. Why do that when you can just use an enum and catch compile-time errors instead? Also, you can't use switch-case statements on stringly-typed variables. So every menu name is now in the enum Menu::MenuName, but you can simply refer to a menu name by just prefixing it with Menu::. Unfortunately, I've had to change the "continue" menu name to be "continuemenu", because "continue" is a keyword in C and C++. Also, it looks like "timetrialcomplete4" is an unused menu name, even though it was referenced in Render.cpp.
2020-04-16 06:53:36 +02:00
if (game.currentmenuname == Menu::timetrialcomplete3)
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
{
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_4X, rankx, 165, rank, 255, 255, 255);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
case Menu::unlockmenutrials:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Unlock Time Trials"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("You can unlock each time trial separately."), tr, tg, tb);
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
case Menu::timetrials:
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
{
bool unlocked = false;
int id_trial = game.currentmenuoption;
int par;
int max_trinkets;
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
switch (game.currentmenuoption)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
case 0:
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
if(game.unlock[9])
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Space Station 1"), tr, tg, tb);
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
unlocked = true;
par = 75;
max_trinkets = 2;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
else
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("???"), tr, tg, tb);
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN, -1, 60, loc::gettext("TO UNLOCK:"), tr, tg, tb);
font::print(PR_CEN, -1, 75, loc::gettext("Rescue Violet"), tr, tg, tb);
font::print(PR_CEN, -1, 87, loc::gettext("Find three trinkets"), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
break;
case 1:
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
if(game.unlock[10])
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("The Laboratory"), tr, tg, tb);
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
unlocked = true;
par = 165;
max_trinkets = 4;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
else
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("???"), tr, tg, tb);
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN, -1, 60, loc::gettext("TO UNLOCK:"), tr, tg, tb);
font::print(PR_CEN, -1, 75, loc::gettext("Rescue Victoria"), tr, tg, tb);
font::print(PR_CEN, -1, 87, loc::gettext("Find six trinkets"), tr, tg, tb);
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
}
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
break;
case 2:
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
if(game.unlock[11])
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("The Tower"), tr, tg, tb);
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
unlocked = true;
par = 105;
max_trinkets = 2;
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
}
else
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("???"), tr, tg, tb);
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN, -1, 60, loc::gettext("TO UNLOCK:"), tr, tg, tb);
font::print(PR_CEN, -1, 75, loc::gettext("Rescue Vermilion"), tr, tg, tb);
font::print(PR_CEN, -1, 87, loc::gettext("Find nine trinkets"), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
break;
case 3:
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
if(game.unlock[12])
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Space Station 2"), tr, tg, tb);
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
unlocked = true;
par = 200;
max_trinkets = 5;
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
}
else
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("???"), tr, tg, tb);
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN, -1, 60, loc::gettext("TO UNLOCK:"), tr, tg, tb);
font::print(PR_CEN, -1, 75, loc::gettext("Rescue Vitellary"), tr, tg, tb);
font::print(PR_CEN, -1, 87, loc::gettext("Find twelve trinkets"), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
break;
case 4:
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
if(game.unlock[13])
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("The Warp Zone"), tr, tg, tb);
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
unlocked = true;
par = 120;
max_trinkets = 1;
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
}
else
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("???"), tr, tg, tb);
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN, -1, 60, loc::gettext("TO UNLOCK:"), tr, tg, tb);
font::print(PR_CEN, -1, 75, loc::gettext("Rescue Verdigris"), tr, tg, tb);
font::print(PR_CEN, -1, 87, loc::gettext("Find fifteen trinkets"), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Use case-switch for menu options where possible I've converted every "else if"-chain in menu render/input code to be a case-switch, except for the levels list, the "game options" menu (because it has the MMMMMM menu option which isn't a compile-time constant), and the "play" menu (because it has the Secret Lab menu option which also isn't a compile-time option). I also did NOT convert some case-switches relating to unlocks in Input.cpp, mostly because they use a system where the "if we have this unlocked" conditional is a part of the "if this is the current menu option" conditional, and they use the 'else' branch to play a sad sound if that "if we have this unlocked" conditional fails. I've also converted the game.gameframerate and game.crewrescued() "else if"-chains to be case-switches instead.
2020-04-16 05:10:11 +02:00
break;
case 5:
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
if(game.unlock[14])
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("The Final Level"), tr, tg, tb);
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
unlocked = true;
par = 135;
max_trinkets = 1;
}
else
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("???"), tr, tg, tb);
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN, -1, 60, loc::gettext("TO UNLOCK:"), tr, tg, tb);
font::print(PR_CEN, -1, 75, loc::gettext("Complete the game"), tr, tg, tb);
font::print(PR_CEN, -1, 87, loc::gettext("Find eighteen trinkets"), tr, tg, tb);
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
}
break;
}
if (unlocked)
{
if (game.besttimes[id_trial] == -1)
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 75, loc::gettext("Not yet attempted"), tr, tg, tb);
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
}
else
{
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
int sp = SDL_max(10, font::height(0));
font::print(0, 32, 65, loc::gettext("RECORDS"), tr, tg, tb);
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
const char* label = loc::gettext("TIME");
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
int label_len = font::len(0, label);
font::print(0, 32, 65+sp, label, tr, tg, tb);
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
label = loc::gettext("SHINY");
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
label_len = SDL_max(label_len, font::len(0, label));
font::print(0, 32, 65+sp*2, label, tr, tg, tb);
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
label = loc::gettext("LIVES");
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
label_len = SDL_max(label_len, font::len(0, label));
font::print(0, 32, 65+sp*3, label, tr, tg, tb);
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(0, label_len+48, 65+sp, game.timetstring(game.besttimes[id_trial]), tr, tg, tb);
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
char buffer[SCREEN_WIDTH_CHARS + 1];
vformat_buf(
buffer, sizeof(buffer),
loc::gettext("{n_trinkets}/{max_trinkets}"),
"n_trinkets:int, max_trinkets:int",
game.besttrinkets[id_trial], max_trinkets
);
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(0, label_len+48, 65+sp*2, buffer, tr, tg, tb);
font::print(0, label_len+48, 65+sp*3, help.String(game.bestlives[id_trial]), tr, tg, tb);
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
const char* str_par_time = loc::gettext("PAR TIME");
const std::string par_time = game.timetstring(par);
const char* str_best_rank = loc::gettext("BEST RANK");
const char* rank;
switch(game.bestrank[id_trial])
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
case 0:
rank = loc::gettext("B");
break;
case 1:
rank = loc::gettext("A");
break;
case 2:
rank = loc::gettext("S");
break;
case 3:
rank = loc::gettext("V");
break;
default:
rank = "?";
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
int w[4] = {
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::len(0, str_par_time),
Change font::len text argument from std::string to const char* See the previous two commits, a lot of the time we don't need std::string objects to be passed to these functions because we already have C strings. Commit 1/3: font::print_wrap Commit 2/3: font::print -> Commit 3/3: font::len
2023-03-05 00:32:58 +01:00
font::len(0, par_time.c_str()),
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::len(0, str_best_rank),
font::len(PR_2X, rank)
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
};
int longest_w = 0;
for (size_t i = 0; i < 4; i++)
{
if (w[i] > longest_w)
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
{
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
longest_w = w[i];
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
int center_x = 288 - longest_w/2;
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_CEN, center_x, 65, str_par_time, tr, tg, tb);
font::print(PR_CEN, center_x, 65+sp, par_time, tr, tg, tb);
font::print(PR_CEN, center_x, 65+sp*3, str_best_rank, tr, tg, tb);
font::print(
PR_2X | PR_CEN,
center_x,
66+sp*4,
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
rank,
225, 225, 225
);
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
case Menu::gamecompletecontinue:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN | PR_CJK_HIGH, -1, 25, loc::gettext("Congratulations!"), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 45, loc::gettext("Your save files have been updated."), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 110, loc::gettext("If you want to keep exploring the game, select CONTINUE from the play menu."), tr, tg, tb);
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
case Menu::unlockmenu:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Unlock Play Modes"), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, loc::gettext("From here, you may unlock parts of the game that are normally unlocked as you play."), tr, tg, tb);
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
case Menu::unlocktimetrial:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 45, loc::gettext("Congratulations!"), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 125, loc::gettext("You have unlocked a new Time Trial."), tr, tg, tb);
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
case Menu::unlocktimetrials:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 45, loc::gettext("Congratulations!"), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 125, loc::gettext("You have unlocked some new Time Trials."), tr, tg, tb);
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
case Menu::unlocknodeathmode:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 45, loc::gettext("Congratulations!"), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 125, loc::gettext("You have unlocked No Death Mode."), tr, tg, tb);
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
case Menu::unlockflipmode:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 45, loc::gettext("Congratulations!"), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 125, loc::gettext("You have unlocked Flip Mode."), tr, tg, tb);
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
case Menu::unlockintermission:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 45, loc::gettext("Congratulations!"), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 125, loc::gettext("You have unlocked the intermission levels."), tr, tg, tb);
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
case Menu::playerworlds:
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 180, loc::gettext("To install new player levels, copy the .vvvvvv files to the levels folder."), tr, tg, tb);
Hide level path by default You will now need to go through another confirm menu in order to print your level path. The confirm menu warns you may leak sensitive information if you are streaming. Screenshots: https://i.imgur.com/0Dc9jsZ.png https://i.imgur.com/UhDgXqj.png https://i.imgur.com/Z0ftQnH.png Fixes #853.
2021-12-22 09:58:27 +01:00
break;
case Menu::confirmshowlevelspath:
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 80, loc::gettext("Are you sure you want to show the levels path? This may reveal sensitive information if you are streaming."), tr, tg, tb);
Hide level path by default You will now need to go through another confirm menu in order to print your level path. The confirm menu warns you may leak sensitive information if you are streaming. Screenshots: https://i.imgur.com/0Dc9jsZ.png https://i.imgur.com/UhDgXqj.png https://i.imgur.com/Z0ftQnH.png Fixes #853.
2021-12-22 09:58:27 +01:00
break;
case Menu::showlevelspath:
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
int next_y = font::print_wrap(PR_CEN, -1, 40, loc::gettext("The levels path is:"), tr, tg, tb);
font::print_wrap(0, 0, next_y, FILESYSTEM_getUserLevelDirectory(), tr, tg, tb, 10, 320);
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
Render.cpp: make menurender translatable This mainly adds loc::gettext calls for all the menu titles and explanations. It also redesigns the time trial screen. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:43:24 +01:00
}
Add error messages for failed writes to disk of settings Changing settings would most of the time attempt to save unlock.vvv and now also settings.vvv, but there would be no feedback whether the files have been saved successfully or not. Now, if saving fails when changing settings in the menu, a warning message will be shown. The setting will still be applied of course, but the user will be informed it couldn't be saved. This message can be silenced until the game is restarted, because I can imagine this could get very annoying when someone already knows their settings aren't writeable. Also, some options didn't even save settings in the first place. These are turning off invincibility, and by coincidence precisely all the options in the advanced options menu. I made sure these options now do so.
2020-11-22 03:10:26 +01:00
case Menu::errorsavingsettings:
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 95, loc::gettext("ERROR: Could not save settings file!"), tr, tg, tb);
Make indentation in settings saving error consistent with rest of cases
2020-11-22 04:14:52 +01:00
break;
Do not close game if custom level has assets issues It's quite rude to close the game entirely if there is trouble with assets. Instead, just unload the assets and gracefully return to the title screen.
2021-08-07 05:57:34 +02:00
case Menu::errorloadinglevel:
If loaded level assets fail to mount, print message to non-console users This error case can happen, but if it does, non-console users get an ERROR page with no further information. So use setLevelDirError if this failure mode happens. And Menu::errorloadinglevel needs to be changed to accomodate that.
2021-08-18 19:02:06 +02:00
{
const char* str;
if (FILESYSTEM_levelDirHasError())
{
str = FILESYSTEM_getLevelDirError();
}
else
{
str = graphics.error;
}
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 45, loc::gettext("ERROR"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, str, tr, tg, tb);
Do not close game if custom level has assets issues It's quite rude to close the game entirely if there is trouble with assets. Instead, just unload the assets and gracefully return to the title screen.
2021-08-07 05:57:34 +02:00
break;
If loaded level assets fail to mount, print message to non-console users This error case can happen, but if it does, non-console users get an ERROR page with no further information. So use setLevelDirError if this failure mode happens. And Menu::errorloadinglevel needs to be changed to accomodate that.
2021-08-18 19:02:06 +02:00
}
Display improper zip structure message to non-console users If a zip file is improperly structured, a message will be displayed when the player loads the level list. This will only display the last-displayed improper zip, because there only needs to be one displayed at a time. Also because doing anything more would most likely require heap allocation, and I don't want to do that.
2021-08-07 07:26:48 +02:00
case Menu::warninglevellist:
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN, -1, 45, loc::gettext("WARNING"), tr, tg, tb);
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 65, FILESYSTEM_getLevelDirError(), tr, tg, tb);
Display improper zip structure message to non-console users If a zip file is improperly structured, a message will be displayed when the player loads the level list. This will only display the last-displayed improper zip, because there only needs to be one displayed at a time. Also because doing anything more would most likely require heap allocation, and I don't want to do that.
2021-08-07 07:26:48 +02:00
break;
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
default:
break;
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
}
}
Fix a few missing implicit void arg declarations While working on #535, I noticed that editormenuactionpress() still didn't do the explicit void declaration. Then I ran `rg 'void.*\(\)'` and found three other functions that I somehow missed in #628. Whoops. Well, now they no longer are missed.
2021-03-19 05:20:05 +01:00
void titlerender(void)
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
{
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.clear();
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
if (!game.menustart)
{
Fix colors updating too fast in TITLEMODE/MAPMODE/GAMECOMPLETEMODE These colors were of the colors of each crewmate, the inactive crewmate color, and the color of the trinket and clock on the quicksave/summary screens. These colors all used fRandom() and so kept updating too quickly because they would be recalculated every time the delta-timestep render function got called, which isn't ideal. Thus, I've had to add attributes onto the Graphics class to store these colors and make sure they're only recalculated in logic functions instead. Thankfully, the color used for the sprites on the time trial results screen doesn't use fRandom(), so I don't have to worry about those. There's a new version of Graphics::drawsprite() that takes in a pre-made color already, instead of a color ID. As well, I've also added Graphics::updatetitlecolours() to update these colors on the title screen.
2020-05-02 01:40:35 +02:00
tr = graphics.col_tr;
tg = graphics.col_tg;
tb = graphics.col_tb;
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
int temp = 50;
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.draw_sprite((160 - 96) + 0 * 32, temp, 23, tr, tg, tb);
graphics.draw_sprite((160 - 96) + 1 * 32, temp, 23, tr, tg, tb);
graphics.draw_sprite((160 - 96) + 2 * 32, temp, 23, tr, tg, tb);
graphics.draw_sprite((160 - 96) + 3 * 32, temp, 23, tr, tg, tb);
graphics.draw_sprite((160 - 96) + 4 * 32, temp, 23, tr, tg, tb);
graphics.draw_sprite((160 - 96) + 5 * 32, temp, 23, tr, tg, tb);
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
#if defined(MAKEANDPLAY)
Migrate more prints and graphics.len calls to font:: I especially focused on graphics.len and the print calls around them, because graphics.len calls appear a bit less often, might be overlooked when migrating print calls (thus possibly using different fonts by accident) and are often used for some kind of right-alignment or centering which can be changed into PR_RIGHT or PR_CEN with a different X anyway. Notably, I also added a new function to generate these kinds of sliders: ....[]............ Different languages means that the slider for analogue stick sensitivity needs to be longer to fit possibly long words for Low/Medium/High, and then different font sizes means that the longer slider won't fit onscreen in a language that needs a 12-wide font. So slider_get() can take a "target width", which dynamically changes the number of characters depending on the width of them in the interface font. I kinda forgot that I could force the 8x8 font instead of adapting the characters in the slider to the font, and other ideas (like using different characters or a more graphical progress bar) have been brought up on Discord, so this might all change again sooner or later.
2023-01-16 21:29:50 +01:00
font::print(PR_RIGHT, 264, temp+35, loc::gettext("MAKE AND PLAY EDITION"), tr, tg, tb);
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
#endif
Replace ACTION in texts by {button} placeholders Gamepads and the Steam Deck need "ACTION" to be replaced by a controller glyph, so that's now possible.
2023-03-18 22:32:26 +01:00
char buffer[SCREEN_WIDTH_CHARS*2 + 1];
vformat_buf(
buffer, sizeof(buffer),
loc::gettext("[ Press {button} to Start ]"),
"button:but",
vformat_button(ActionSet_Menu, Action_Menu_Accept)
);
font::print_wrap(PR_CEN, -1, 175, buffer, tr, tg, tb);
if (BUTTONGLYPHS_keyboard_is_active())
{
font::print_wrap(PR_CEN, -1, 195, loc::gettext("ACTION = Space, Z, or V"), int(tr*0.5f), int(tg*0.5f), int(tb*0.5f));
}
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
}
else
{
Move title usages of towerbg to titlebg With the previous commit in place, we can now simply move some usages of the previous towerbg to use a separate object instead. That way, we don't have to mess with a monolithic state, or some better way to phrase what I just said, and we instead have two separate objects that can coexist side-by-side.
2020-11-03 00:23:53 +01:00
if(!game.colourblindmode) graphics.drawtowerbackground(graphics.titlebg);
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
Fix colors updating too fast in TITLEMODE/MAPMODE/GAMECOMPLETEMODE These colors were of the colors of each crewmate, the inactive crewmate color, and the color of the trinket and clock on the quicksave/summary screens. These colors all used fRandom() and so kept updating too quickly because they would be recalculated every time the delta-timestep render function got called, which isn't ideal. Thus, I've had to add attributes onto the Graphics class to store these colors and make sure they're only recalculated in logic functions instead. Thankfully, the color used for the sprites on the time trial results screen doesn't use fRandom(), so I don't have to worry about those. There's a new version of Graphics::drawsprite() that takes in a pre-made color already, instead of a color ID. As well, I've also added Graphics::updatetitlecolours() to update these colors on the title screen.
2020-05-02 01:40:35 +02:00
tr = graphics.col_tr;
tg = graphics.col_tg;
tb = graphics.col_tb;
Move menu rendering to separate function Just like I moved the menu ACTION press handler, I'm doing this as well. It only removes one level of indentation, but it makes titlerender() easier to understand. Just like before, I have to put the separate function first, else titlerender() won't know what it is.
2020-04-16 01:29:54 +02:00
menurender();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
tr = int(tr * .8f);
tg = int(tg * .8f);
tb = int(tb * .8f);
if (tr < 0) tr = 0;
if(tr>255) tr=255;
if (tg < 0) tg = 0;
if(tg>255) tg=255;
if (tb < 0) tb = 0;
if(tb>255) tb=255;
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
graphics.drawmenu(tr, tg, tb, game.currentmenuname);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
graphics.drawfade();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Put screen effects render handling inside a function This de-duplicates the screen effects rendering code by putting it inside a function, Graphics::renderwithscreeneffects(), and using that instead of copy-pasted code.
2020-04-27 04:24:50 +02:00
graphics.renderwithscreeneffects();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 23:23:59 +01:00
void gamecompleterender(void)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.clear();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Move title usages of towerbg to titlebg With the previous commit in place, we can now simply move some usages of the previous towerbg to use a separate object instead. That way, we don't have to mess with a monolithic state, or some better way to phrase what I just said, and we instead have two separate objects that can coexist side-by-side.
2020-11-03 00:23:53 +01:00
if(!game.colourblindmode) graphics.drawtowerbackground(graphics.titlebg);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Fix colors updating too fast in TITLEMODE/MAPMODE/GAMECOMPLETEMODE These colors were of the colors of each crewmate, the inactive crewmate color, and the color of the trinket and clock on the quicksave/summary screens. These colors all used fRandom() and so kept updating too quickly because they would be recalculated every time the delta-timestep render function got called, which isn't ideal. Thus, I've had to add attributes onto the Graphics class to store these colors and make sure they're only recalculated in logic functions instead. Thankfully, the color used for the sprites on the time trial results screen doesn't use fRandom(), so I don't have to worry about those. There's a new version of Graphics::drawsprite() that takes in a pre-made color already, instead of a color ID. As well, I've also added Graphics::updatetitlecolours() to update these colors on the title screen.
2020-05-02 01:40:35 +02:00
tr = graphics.col_tr;
tg = graphics.col_tg;
tb = graphics.col_tb;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//rendering starts... here!
Interpolate credits position So that it's as smooth as possible, especially when holding down ACTION to make it go really fast.
2020-04-30 19:56:27 +02:00
int position = graphics.lerp(game.oldcreditposition, game.creditposition);
if (graphics.onscreen(220 + position))
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Interpolate credits position So that it's as smooth as possible, especially when holding down ACTION to make it go really fast.
2020-04-30 19:56:27 +02:00
int temp = 220 + position;
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.draw_sprite((160 - 96) + 0 * 32, temp, 23, tr, tg, tb);
graphics.draw_sprite((160 - 96) + 1 * 32, temp, 23, tr, tg, tb);
graphics.draw_sprite((160 - 96) + 2 * 32, temp, 23, tr, tg, tb);
graphics.draw_sprite((160 - 96) + 3 * 32, temp, 23, tr, tg, tb);
graphics.draw_sprite((160 - 96) + 4 * 32, temp, 23, tr, tg, tb);
graphics.draw_sprite((160 - 96) + 5 * 32, temp, 23, tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
if (graphics.onscreen(290 + position)) font::print(PR_2X | PR_CEN, -1, 290 + position, loc::gettext("Starring"), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Interpolate credits position So that it's as smooth as possible, especially when holding down ACTION to make it go really fast.
2020-04-30 19:56:27 +02:00
if (graphics.onscreen(320 + position))
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Interpolate credits position So that it's as smooth as possible, especially when holding down ACTION to make it go really fast.
2020-04-30 19:56:27 +02:00
graphics.drawcrewman(70, 320 + position, 0, true);
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(0, 100, 330 + position, loc::gettext("Captain Viridian"), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Interpolate credits position So that it's as smooth as possible, especially when holding down ACTION to make it go really fast.
2020-04-30 19:56:27 +02:00
if (graphics.onscreen(350 + position))
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Interpolate credits position So that it's as smooth as possible, especially when holding down ACTION to make it go really fast.
2020-04-30 19:56:27 +02:00
graphics.drawcrewman(70, 350 + position, 1, true);
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(0, 100, 360 + position, loc::gettext("Doctor Violet"), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Interpolate credits position So that it's as smooth as possible, especially when holding down ACTION to make it go really fast.
2020-04-30 19:56:27 +02:00
if (graphics.onscreen(380 + position))
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Interpolate credits position So that it's as smooth as possible, especially when holding down ACTION to make it go really fast.
2020-04-30 19:56:27 +02:00
graphics.drawcrewman(70, 380 + position, 2, true);
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(0, 100, 390 + position, loc::gettext("Professor Vitellary"), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Interpolate credits position So that it's as smooth as possible, especially when holding down ACTION to make it go really fast.
2020-04-30 19:56:27 +02:00
if (graphics.onscreen(410 + position))
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Interpolate credits position So that it's as smooth as possible, especially when holding down ACTION to make it go really fast.
2020-04-30 19:56:27 +02:00
graphics.drawcrewman(70, 410 + position, 3, true);
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(0, 100, 420 + position, loc::gettext("Officer Vermilion"), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Interpolate credits position So that it's as smooth as possible, especially when holding down ACTION to make it go really fast.
2020-04-30 19:56:27 +02:00
if (graphics.onscreen(440 + position))
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Interpolate credits position So that it's as smooth as possible, especially when holding down ACTION to make it go really fast.
2020-04-30 19:56:27 +02:00
graphics.drawcrewman(70, 440 + position, 4, true);
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(0, 100, 450 + position, loc::gettext("Chief Verdigris"), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Interpolate credits position So that it's as smooth as possible, especially when holding down ACTION to make it go really fast.
2020-04-30 19:56:27 +02:00
if (graphics.onscreen(470 + position))
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Interpolate credits position So that it's as smooth as possible, especially when holding down ACTION to make it go really fast.
2020-04-30 19:56:27 +02:00
graphics.drawcrewman(70, 470 + position, 5, true);
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(0, 100, 480 + position, loc::gettext("Doctor Victoria"), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
if (graphics.onscreen(520 + position)) font::print(PR_3X | PR_CEN, -1, 520 + position, loc::gettext("Credits"), tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Interpolate credits position So that it's as smooth as possible, especially when holding down ACTION to make it go really fast.
2020-04-30 19:56:27 +02:00
if (graphics.onscreen(560 + position))
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CJK_HIGH, 40, 560 + position, loc::gettext("Created by"), tr, tg, tb);
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_FONT_8X8, 60, 570 + position, "Terry Cavanagh", tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Interpolate credits position So that it's as smooth as possible, especially when holding down ACTION to make it go really fast.
2020-04-30 19:56:27 +02:00
if (graphics.onscreen(600 + position))
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CJK_HIGH, 40, 600 + position, loc::gettext("With Music by"), tr, tg, tb);
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_FONT_8X8, 60, 610 + position, "Magnus Pålsson", tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Interpolate credits position So that it's as smooth as possible, especially when holding down ACTION to make it go really fast.
2020-04-30 19:56:27 +02:00
if (graphics.onscreen(640 + position))
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CJK_HIGH, 40, 640 + position, loc::gettext("Rooms Named by"), tr, tg, tb);
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_FONT_8X8, 60, 650 + position, "Bennett Foddy", tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Move Misa to C++ credits I talked with Ethan earlier about this. For 2.3, he wanted me in GitHub contributors (well, still separate from the rest), to really highlight the source-code-release community-driven nature of 2.3, but he said it'd be fine to put me in C++ credits in 2.4.
2021-09-01 08:19:25 +02:00
if (graphics.onscreen(710 + position))
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CJK_HIGH, 40, 680 + position, loc::gettext("C++ Port by"), tr, tg, tb);
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_FONT_8X8, 60, 690 + position, "Simon Roth", tr, tg, tb);
font::print(PR_2X | PR_FONT_8X8, 60, 710 + position, "Ethan Lee", tr, tg, tb);
font::print(PR_2X | PR_FONT_8X8, 60, 730 + position, "Misa Kai", tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Fix Pauli Kohberger's name stopping being drawn too early This is because the y-position of the graphics.onscreen() check was a little too high. Then their name (under Beta Testing) would suddenly disappear too early. You'd have to look real close to spot it, but it does happen. It's cuz the credits are all kinda hardcoded, which is probably bad, but fixing that would have to come later...
2021-09-01 08:23:27 +02:00
if (graphics.onscreen(770 + position))
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CJK_HIGH, 40, 760 + position, loc::gettext("Beta Testing by"), tr, tg, tb);
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_FONT_8X8, 60, 770 + position, "Sam Kaplan", tr, tg, tb);
font::print(PR_2X | PR_FONT_8X8, 60, 790 + position, "Pauli Kohberger", tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Move Misa to C++ credits I talked with Ethan earlier about this. For 2.3, he wanted me in GitHub contributors (well, still separate from the rest), to really highlight the source-code-release community-driven nature of 2.3, but he said it'd be fine to put me in C++ credits in 2.4.
2021-09-01 08:19:25 +02:00
if (graphics.onscreen(820 + position))
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CJK_HIGH, 40, 820 + position, loc::gettext("Ending Picture by"), tr, tg, tb);
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_FONT_8X8, 60, 830 + position, "Pauli Kohberger", tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
if (graphics.onscreen(910 + position)) font::print(PR_3X | PR_CEN, -1, 890 + position, loc::gettext("Patrons"), tr, tg, tb);
Integrate dynamic list sizes for credited patrons, add CONTRIBUTORS to credits (Also added myself to the credits, only took 6 years to not be lazy about it)
2020-01-17 02:14:56 +01:00
Move Misa to C++ credits I talked with Ethan earlier about this. For 2.3, he wanted me in GitHub contributors (well, still separate from the rest), to really highlight the source-code-release community-driven nature of 2.3, but he said it'd be fine to put me in C++ credits in 2.4.
2021-09-01 08:19:25 +02:00
int creditOffset = 950;
Integrate dynamic list sizes for credited patrons, add CONTRIBUTORS to credits (Also added myself to the credits, only took 6 years to not be lazy about it)
2020-01-17 02:14:56 +01:00
Turn (super)patrons/githubfriends into arrays & move them to new file So, originally, I wanted to keep them on Game, but it turns out that if I initialize it in Game.cpp, the compiler will complain that other files won't know what's actually inside the array. To do that, I'd have to initialize it in Game.h. But I don't want to initialize it in Game.h because that'd mean recompiling a lot of unnecessary files whenever someone gets added to the credits. So, I moved all the patrons, superpatrons, and GitHub contributors to a new file, Credits.h, which only contains the list (and the credits max position calculation). That way, whenever someone gets added, only the minimal amount of files need to be recompiled.
2020-07-03 12:13:15 +02:00
for (size_t i = 0; i < SDL_arraysize(Credits::superpatrons); i += 1)
Integrate dynamic list sizes for credited patrons, add CONTRIBUTORS to credits (Also added myself to the credits, only took 6 years to not be lazy about it)
2020-01-17 02:14:56 +01:00
{
Interpolate credits position So that it's as smooth as possible, especially when holding down ACTION to make it go really fast.
2020-04-30 19:56:27 +02:00
if (graphics.onscreen(creditOffset + position))
Integrate dynamic list sizes for credited patrons, add CONTRIBUTORS to credits (Also added myself to the credits, only took 6 years to not be lazy about it)
2020-01-17 02:14:56 +01:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_CEN | PR_FONT_8X8, -1, creditOffset + position, Credits::superpatrons[i], tr, tg, tb);
Integrate dynamic list sizes for credited patrons, add CONTRIBUTORS to credits (Also added myself to the credits, only took 6 years to not be lazy about it)
2020-01-17 02:14:56 +01:00
}
creditOffset += 10;
}
creditOffset += 10;
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
if (graphics.onscreen(creditOffset + position)) font::print(PR_CEN, -1, creditOffset + position, loc::gettext("and"), tr, tg, tb);
Integrate dynamic list sizes for credited patrons, add CONTRIBUTORS to credits (Also added myself to the credits, only took 6 years to not be lazy about it)
2020-01-17 02:14:56 +01:00
creditOffset += 20;
Turn (super)patrons/githubfriends into arrays & move them to new file So, originally, I wanted to keep them on Game, but it turns out that if I initialize it in Game.cpp, the compiler will complain that other files won't know what's actually inside the array. To do that, I'd have to initialize it in Game.h. But I don't want to initialize it in Game.h because that'd mean recompiling a lot of unnecessary files whenever someone gets added to the credits. So, I moved all the patrons, superpatrons, and GitHub contributors to a new file, Credits.h, which only contains the list (and the credits max position calculation). That way, whenever someone gets added, only the minimal amount of files need to be recompiled.
2020-07-03 12:13:15 +02:00
for (size_t i = 0; i < SDL_arraysize(Credits::patrons); i += 1)
Integrate dynamic list sizes for credited patrons, add CONTRIBUTORS to credits (Also added myself to the credits, only took 6 years to not be lazy about it)
2020-01-17 02:14:56 +01:00
{
Interpolate credits position So that it's as smooth as possible, especially when holding down ACTION to make it go really fast.
2020-04-30 19:56:27 +02:00
if (graphics.onscreen(creditOffset + position))
Integrate dynamic list sizes for credited patrons, add CONTRIBUTORS to credits (Also added myself to the credits, only took 6 years to not be lazy about it)
2020-01-17 02:14:56 +01:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_CEN | PR_FONT_8X8, -1, creditOffset + position, Credits::patrons[i], tr, tg, tb);
Integrate dynamic list sizes for credited patrons, add CONTRIBUTORS to credits (Also added myself to the credits, only took 6 years to not be lazy about it)
2020-01-17 02:14:56 +01:00
}
creditOffset += 10;
}
creditOffset += 20;
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
if (graphics.onscreen(creditOffset + position)) font::print(PR_2X | PR_CEN, -1, creditOffset + position, loc::gettext("GitHub Contributors"), tr, tg, tb);
Integrate dynamic list sizes for credited patrons, add CONTRIBUTORS to credits (Also added myself to the credits, only took 6 years to not be lazy about it)
2020-01-17 02:14:56 +01:00
creditOffset += 30;
Turn (super)patrons/githubfriends into arrays & move them to new file So, originally, I wanted to keep them on Game, but it turns out that if I initialize it in Game.cpp, the compiler will complain that other files won't know what's actually inside the array. To do that, I'd have to initialize it in Game.h. But I don't want to initialize it in Game.h because that'd mean recompiling a lot of unnecessary files whenever someone gets added to the credits. So, I moved all the patrons, superpatrons, and GitHub contributors to a new file, Credits.h, which only contains the list (and the credits max position calculation). That way, whenever someone gets added, only the minimal amount of files need to be recompiled.
2020-07-03 12:13:15 +02:00
for (size_t i = 0; i < SDL_arraysize(Credits::githubfriends); i += 1)
Integrate dynamic list sizes for credited patrons, add CONTRIBUTORS to credits (Also added myself to the credits, only took 6 years to not be lazy about it)
2020-01-17 02:14:56 +01:00
{
Interpolate credits position So that it's as smooth as possible, especially when holding down ACTION to make it go really fast.
2020-04-30 19:56:27 +02:00
if (graphics.onscreen(creditOffset + position))
Integrate dynamic list sizes for credited patrons, add CONTRIBUTORS to credits (Also added myself to the credits, only took 6 years to not be lazy about it)
2020-01-17 02:14:56 +01:00
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_CEN | PR_FONT_8X8, -1, creditOffset + position, Credits::githubfriends[i], tr, tg, tb);
Integrate dynamic list sizes for credited patrons, add CONTRIBUTORS to credits (Also added myself to the credits, only took 6 years to not be lazy about it)
2020-01-17 02:14:56 +01:00
}
creditOffset += 10;
}
creditOffset += 140;
Render.cpp: make titlerender and gamecompleterender translatable This mainly adds loc::gettext calls. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-31 01:22:39 +01:00
if (graphics.onscreen(creditOffset + position))
{
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN | PR_CJK_HIGH, -1, creditOffset + position, loc::gettext("Thanks for"), tr, tg, tb);
Render.cpp: make titlerender and gamecompleterender translatable This mainly adds loc::gettext calls. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-31 01:22:39 +01:00
creditOffset += 20;
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_2X | PR_CEN | PR_CJK_LOW, -1, creditOffset + position, loc::gettext("playing!"), tr, tg, tb);
Render.cpp: make titlerender and gamecompleterender translatable This mainly adds loc::gettext calls. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-31 01:22:39 +01:00
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
graphics.drawfade();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Only render screen effects on the title screen and in-game In-game because that's where screen effects are used the most. But on the title screen, screen effects are used when you press ACTION to start the game, and when you enable screen effects, too. Otherwise, we don't need screen effects for any other game-gamestate.
2020-04-27 04:29:40 +02:00
graphics.render();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 23:23:59 +01:00
void gamecompleterender2(void)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.clear();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.drawimage(IMAGE_ENDING, 0, 0);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
for (int j = 0; j < 30; j++)
{
for (int i = 0; i < 40; i++)
{
if (j == game.creditposy)
{
if (i > game.creditposx)
{
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.fill_rect(i * 8, j * 8, 8, 8, 0, 0, 0);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
if (j > game.creditposy)
{
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.fill_rect(i * 8, j * 8, 8, 8, 0, 0, 0);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.fill_rect(graphics.lerp(game.oldcreditposx * 8, game.creditposx * 8) + 8, game.creditposy * 8, 8, 8, 0, 0, 0);
Interpolate end picture reveal scroll This is so it looks smooth at framerates above 30.
2020-05-02 03:23:52 +02:00
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
graphics.drawfade();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Only render screen effects on the title screen and in-game In-game because that's where screen effects are used the most. But on the title screen, screen effects are used when you press ACTION to start the game, and when you enable screen effects, too. Otherwise, we don't need screen effects for any other game-gamestate.
2020-04-27 04:29:40 +02:00
graphics.render();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Separate pressing Enter to open map from pressing Enter to interact This is a lot of copy-pasted code, but a little bit of copy-pasting never hurt anyone... The keybind to interact with activity zones and teleporters is now separate from the keybind to open the map, or return to the editor from in-editor playtesting, or restart a time trial. The keybind is now E, and the default controller bind is X. No controller button prompts, but the game didn't have controller button prompts anyways, so whatever. Doing this now because if people's muscle memory are going to be broken by not being able to spam the map keybind anymore, at least we can help a bit by changing the keybind so they can keep spamming it - their muscle memory is going to be broken anyways. This option has to be enabled by going to the speedrunner menu options and selecting "interact button". It is disabled by default. All prompt text needs to be string-interpolated every time they are drawn, because it is possible for people to change which interact button they use in the middle of gameplay, via the in-game options. Closes #736.
2021-04-19 08:23:44 +02:00
static const char* interact_prompt(
char* buffer,
const size_t buffer_size,
const char* raw
) {
Add support for button glyph display This adds a function that converts an action (such as interacting in-game) to the corresponding button text ("ENTER", "E") or button glyph (PlayStation triangle, Steam Deck Y, etc). This function currently only gives the existing ENTERs or Es, because I don't know how best to detect controller usage, or whether the game is running on a Steam Deck, or what buttons need to be displayed there. Still, it should now be really easy to adapt the rendering of keyboard keys to consoles, controllers, or rebound keys. To identify the actions that currently need to be displayed, this commit also adds the initial enums for action sets as described by Ethan in a comment in #834 (Jan 18, 2022).
2023-03-18 22:30:16 +01:00
vformat_buf(
buffer, buffer_size,
raw,
"button:but",
vformat_button(ActionSet_InGame, Action_InGame_Interact)
);
Separate pressing Enter to open map from pressing Enter to interact This is a lot of copy-pasted code, but a little bit of copy-pasting never hurt anyone... The keybind to interact with activity zones and teleporters is now separate from the keybind to open the map, or return to the editor from in-editor playtesting, or restart a time trial. The keybind is now E, and the default controller bind is X. No controller button prompts, but the game didn't have controller button prompts anyways, so whatever. Doing this now because if people's muscle memory are going to be broken by not being able to spam the map keybind anymore, at least we can help a bit by changing the keybind so they can keep spamming it - their muscle memory is going to be broken anyways. This option has to be enabled by going to the speedrunner menu options and selecting "interact button". It is disabled by default. All prompt text needs to be string-interpolated every time they are drawn, because it is possible for people to change which interact button they use in the middle of gameplay, via the in-game options. Closes #736.
2021-04-19 08:23:44 +02:00
return buffer;
}
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 23:23:59 +01:00
void gamerender(void)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.set_render_target(graphics.gameplayTexture);
graphics.set_color(0, 0, 0, 255);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if(!game.blackout)
{
Merge towerrender() into gamerender() This removes a lot of duplicate code, which towerrender() mostly consisted of, even though the only difference is that it draws a separate map and screen edge spikes are drawn.
2020-04-27 00:16:35 +02:00
if (map.towermode)
Fix mixed indentation in titlerender.cpp There's a lot, looks like mainly because of the person who added MMMMMM and M&P.
2020-04-02 23:19:15 +02:00
{
Merge towerrender() into gamerender() This removes a lot of duplicate code, which towerrender() mostly consisted of, even though the only difference is that it draws a separate map and screen edge spikes are drawn.
2020-04-27 00:16:35 +02:00
if (!game.colourblindmode)
{
Refactor tower background to use a separate object instead Previously, the tower background was controlled by a disparate set of attributes on Graphics and mapclass, and wasn't really encapsulated. (If that's what that word means, I don't particularly care about object-oriented lingo.) But now, all relevant things that a tower background has has been put into a TowerBG struct, so it will be easy to make multiple copies without having to duplicate the code that handles it.
2020-11-03 00:05:24 +01:00
graphics.drawtowerbackground(graphics.towerbg);
Merge towerrender() into gamerender() This removes a lot of duplicate code, which towerrender() mostly consisted of, even though the only difference is that it draws a separate map and screen edge spikes are drawn.
2020-04-27 00:16:35 +02:00
}
else
{
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.clear();
Merge towerrender() into gamerender() This removes a lot of duplicate code, which towerrender() mostly consisted of, even though the only difference is that it draws a separate map and screen edge spikes are drawn.
2020-04-27 00:16:35 +02:00
}
Don't selectively undraw tiles in towers if backgrounds are off The game for some reason had this thing where it would not draw the diagonal background tiles if you had animated backgrounds turned off. Which is weird, because spikes with that background are still drawn as spikes with that background. And also, it doesn't do this for any of the tower hallway rooms, which is inconsistent. Better to simplify the logic in Render.cpp anyways by removing graphics.drawtower_nobackground() and making it really clear what exactly we'll do if backgrounds are turned off. ("Aren't we already not drawing the background? What's this _nobackground() function for?")
2020-06-30 20:10:00 +02:00
graphics.drawtowermap();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
Fix mixed indentation in titlerender.cpp There's a lot, looks like mainly because of the person who added MMMMMM and M&P.
2020-04-02 23:19:15 +02:00
{
Merge towerrender() into gamerender() This removes a lot of duplicate code, which towerrender() mostly consisted of, even though the only difference is that it draws a separate map and screen edge spikes are drawn.
2020-04-27 00:16:35 +02:00
if(!game.colourblindmode)
{
graphics.drawbackground(map.background);
}
else
{
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.clear();
Merge towerrender() into gamerender() This removes a lot of duplicate code, which towerrender() mostly consisted of, even though the only difference is that it draws a separate map and screen edge spikes are drawn.
2020-04-27 00:16:35 +02:00
}
Add finalmode check to drawfinalmap call This fixes the finalstretch tile shifting persisting if you return to the main dimension and final_colormode isn't reset properly. It's possible to do so in the main game by using a teleporter in finalmode while having the Intermission 1 or 2 companion active. For custom levels, level makers can make a setup that automatically turns on finalstretch, goes to finalmode, and then returns to the main dimension. The only thing being... as a level maker myself, this tile shifting REALLY doesn't seem useful (and no one has ever used it because the setup to do so hadn't really been found or documented until this year). For one, the exact shift is randomized every time (there's an fRandom() call to cycle the colors). For two, it goes away after the player saves and reloads the level. And for three, it doesn't animate like it does in finalmode (this is the biggest reason IMO). Nevertheless, I've decided to keep support for this in custom levels, in case someone in the future does want to use it and is okay with the limitations.
2021-03-26 01:40:50 +01:00
if ((map.finalmode || map.custommode) && map.final_colormode)
Merge towerrender() into gamerender() This removes a lot of duplicate code, which towerrender() mostly consisted of, even though the only difference is that it draws a separate map and screen edge spikes are drawn.
2020-04-27 00:16:35 +02:00
{
graphics.drawfinalmap();
}
else
{
graphics.drawmap();
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
graphics.drawentities();
Merge towerrender() into gamerender() This removes a lot of duplicate code, which towerrender() mostly consisted of, even though the only difference is that it draws a separate map and screen edge spikes are drawn.
2020-04-27 00:16:35 +02:00
if (map.towermode)
{
graphics.drawtowerspikes();
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Enumify all fade modes This removes the magic numbers previously used for controlling the fade mode, which are really not readable at all unless you already know what they mean. 0: FADE_NONE 1: FADE_FULLY_BLACK 2: FADE_START_FADEOUT 3: FADE_FADING_OUT 4: FADE_START_FADEIN 5: FADE_FADING_IN There is also the macro FADEMODE_IS_FADING, which indicates when the intention is to only check if the game is fading right now, which wasn't clearly conveyed previously. I also took the opportunity to clean up the style of any lines I touched. This included rewriting if-else chains into case-switches, turning one-liner if-then statements into proper blocks, fixing up comments, and even commenting the `fademode == FADE_NONE` on the tower spike checks (which, it was previously undocumented why that check was there, but I think I know why it's there). As for type safety, we already get some by transforming the variable types into the enum. Assignment is prohibited without a cast. But, apparently, comparison is perfectly legal and won't even give so much as a warning. To work around this and make absolutely sure I made all existing comparisons now use the enum, I temporarily changed it to be an `enum class`, which is a C++11 feature that makes it so all comparisons are illegal. Unfortunately, it scopes them in a namespace with the same name as a class, so I had to temporarily define macros to make sure my existing code worked. I also had to temporarily up the standard in CMakeLists.txt to get it to compile. But after all that was done, I found the rest of the places where a comparison to an integer was used, and fixed them.
2022-04-25 09:57:47 +02:00
if (graphics.fademode == FADE_NONE
&& !game.intimetrial
&& !game.isingamecompletescreen()
&& (!game.swnmode || game.swngame != 1)
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
&& game.showingametimer
&& !roomname_translator::enabled)
Add in-game timer option (#790)
2021-08-05 23:31:20 +02:00
{
Render.cpp: make gamerender translatable This mainly adds loc::gettext calls. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-31 01:13:10 +01:00
const char* tempstring = loc::gettext("TIME:");
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
int label_len = font::len(0, tempstring);
font::print(PR_BOR, 6, 6, tempstring, 255,255,255);
Simplify time formatting functions Here's my notes on all the existing functions and what kind of time formats they output: - Game::giventimestring(int hrs, int min, int sec) H:MM:SS MM:SS - Game::timestring() // uses game.hours/minutes/seconds H:MM:SS MM:SS - Game::partimestring() // uses game.timetrialpar (seconds) MM:SS - Game::resulttimestring() // uses game.timetrialresulttime (sec) + timetrialresultframes (1/30s) MM:SS.CC - Game::timetstring(int t) // t = seconds MM:SS - Game::timestringcenti(char* buffer, const size_t buffer_size) // uses game.hours/minutes/seconds/frames H:MM:SS.CC MM:SS.CC - UtilityClass::timestring(int t) // t = frames, 30 frames = 1 second S:CC M:SS:CC This is kind of a mess, and there's a lot of functions that do the same thing except using different variables. For localization, I also want translators to be able to localize all these time formats - many languages use the decimal comma instead of the decimal point (12:34,56) maybe some languages really prefer something like 1時02分11秒44瞬... Which I don't know to be correct, but it's good to be prepared for it and not restrict translators arbitrarily to only changing ":" and "." when we can start making the system better in the first place. I added a new function, UtilityClass::format_time. This is the place where all time formats come together, given the number of seconds and optionally frames. I have simplified the above-mentioned functions somewhat, but I haven't given them a complete refactor or renaming - I mainly made sure that they all use the same backend so I can make the formats consistent and properly localizable. (And before we start shoving more temporary char buffers everywhere just to get rid of the std::string's, maybe we need to think of a globally used working buffer of size SCREEN_WIDTH_CHARS+1, as a register of sorts, for when any line of text needs to be made or processed, then printed, and then goes unused. Maybe help.textrow, or something like that.) As for this commit, the available time formats are now more consistent and changed a little in some places. Leading zeroes for the first unit are now no longer included, time trial results and the Super Gravitron can now display hours when they went to 60 minutes before, and we now always use .CC instead of :CC. These are the formats: - H:MM:SS - H:MM:SS.CC - M:SS - M:SS.CC - S.CC (only used when always_minutes=false, for the Gravitrons) Here's what changes to the current functions: - Game::partimestring() is removed - it was used in two places, and could be replaced by game.timetstring(game.timetrialpar) - Game::giventimestring(h,m,s) and Game::timestring() are now wrappers for the other functions - The four remaining functions (Game::resulttimestring(), Game::timetstring(t), Game::timestringcenti(buffer, buffer_size) and UtilityClass::timestring(t)) are now wrappers for the "central function", UtilityClass::format_time. - UtilityClass::twodigits(int t) is now unused so it's also removed. - I also added int UtilityClass::hms_to_seconds(int h, int m, int s)
2021-12-25 17:13:46 +01:00
char buffer[SCREEN_WIDTH_CHARS + 1];
Add centiseconds to timer overlays This adds centiseconds to the in-game timer, as well as the time trial timer. This is to aid speedrun moderators in determining when exactly a run was completed, which they can't easily do if the timer only has a precision up to a second.
2021-12-21 02:32:12 +01:00
game.timestringcenti(buffer, sizeof(buffer));
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_BOR, 6+label_len, 6, buffer, 196,196,196);
Add in-game timer option (#790)
2021-08-05 23:31:20 +02:00
}
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
bool force_roomname_hidden = false;
Migrate more prints to font::, determine font for most textboxes Some textboxes need to be in the level font (like room names, cutscene dialogue, etc - even in the main game), and some need to be in the interface font (like when you collect a shiny trinket or crewmate). So most of these textboxes now have graphics.textboxprintflags(font_flag) as appropriate. RoomnameTranslator.cpp is now also migrated to the new print system - in room name translator mode, the room name is now displayed in the 8x8 font if it's untranslated and the level font if it is.
2023-01-13 05:11:39 +01:00
bool roomname_untranslated = false;
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
int roomname_r = 196, roomname_g = 196, roomname_b = 255 - help.glow;
if (roomname_translator::enabled)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
roomname_translator::overlay_render(
&force_roomname_hidden,
Migrate more prints to font::, determine font for most textboxes Some textboxes need to be in the level font (like room names, cutscene dialogue, etc - even in the main game), and some need to be in the interface font (like when you collect a shiny trinket or crewmate). So most of these textboxes now have graphics.textboxprintflags(font_flag) as appropriate. RoomnameTranslator.cpp is now also migrated to the new print system - in room name translator mode, the room name is now displayed in the 8x8 font if it's untranslated and the level font if it is.
2023-01-13 05:11:39 +01:00
&roomname_untranslated,
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
&roomname_r, &roomname_g, &roomname_b
);
}
De-duplicate finalmode glitchname printing Instead of copy-pasting the call twice, just use a variable to switch between the two names.
2021-12-26 09:03:18 +01:00
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
if ((map.extrarow==0 || (map.custommode && map.roomname[0] != '\0')) && !force_roomname_hidden)
{
Strip out old special roomname system This commit replaces the old system with the new one, making it much easier to edit the transforming and glitchy roomnames. Additionally, this syncs flag 72 to finalstretch. Co-authored-by: Misa Elizabeth Kai <infoteddy@infoteddy.info>
2023-02-18 00:52:57 +01:00
const char* roomname = loc::gettext_roomname(map.custommode, game.roomx, game.roomy, map.roomname, map.roomname_special);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Migrate more prints to font::, determine font for most textboxes Some textboxes need to be in the level font (like room names, cutscene dialogue, etc - even in the main game), and some need to be in the interface font (like when you collect a shiny trinket or crewmate). So most of these textboxes now have graphics.textboxprintflags(font_flag) as appropriate. RoomnameTranslator.cpp is now also migrated to the new print system - in room name translator mode, the room name is now displayed in the 8x8 font if it's untranslated and the level font if it is.
2023-01-13 05:11:39 +01:00
graphics.render_roomname(
roomname_untranslated ? PR_FONT_8X8 : PR_FONT_LEVEL,
roomname,
roomname_r, roomname_g, roomname_b
);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
if (map.roomtexton)
{
//Draw room text!
Refactor roomtext to not use ad-hoc objects / separate length trackers This refactors the roomtext code to (1) not use ad-hoc objects and (2) not use a separate length-tracking variable to keep track of the actual amount of roomtext in a room. What I mean by ad-hoc object is, instead of formally creating a fully-fledged struct or class and storing one vector containing that object, this game instead hacks together an object by storing each attribute of an object in different vectors. In the case of roomtext, instead of making a Roomtext object that has attributes 'x', 'y', and 'text', the 'text' attribute of each is stored in the vector 'roomtext', the 'x' attribute of each is stored in the vector 'roomtextx', and the 'y' attribute of each is stored in the vector 'roomtexty'. It's only an object in the sense that you can grab the attributes of each roomtext by using the same index across all three vectors. This makes it somewhat annoying to maintain and deal with, like when I wanted add sub-tile positions to roomtext in VVVVVV: Community Edition. Instead of being able to add attributes to an already-existing formalized Roomtext object, I would instead have to add two more vectors, which is inelegant. Or I could refactor the whole system, which is what I decided to do instead. Furthermore, this removes the separate length-tracking variable 'roomtextnumlines', which makes the code much more easy to maintain and deal with, as the amount of roomtext is naturally tracked by C++ instead of us having to keep track of the actual amount of roomtext manually.
2020-03-01 03:26:12 +01:00
for (size_t i = 0; i < map.roomtext.size(); i++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Start using level-specific font where needed, make CJK tweaks Level text such as room names, text box content, and the contents of the script editor need to be displayed in the level-specific font, and tweaked to look right. This involves displaying less lines in the script editor, making text boxes bigger, displaying some text higher and some text lower. This is still unfinished, but it's the real start of a migration to font::print functions!
2023-01-12 05:27:52 +01:00
font::print(PR_FONT_LEVEL | PR_CJK_LOW, map.roomtext[i].x*8, (map.roomtext[i].y*8), map.roomtext[i].text, 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
Move all editor-specific attributes to a new editorclass This is a pretty hefty commit! But essentially, I made a new editorclass object, and moved all functions and variables that only get used in the in-game level editor to that class. This cleanly demarcates which things are in the editor and which things are just general custom level stuff. Then I fixed up all the callers. I also fixed up some NO_CUSTOM_LEVELS and NO_EDITOR ifdefs, too, in several places.
2021-02-21 00:40:11 +01:00
#if !defined(NO_CUSTOM_LEVELS) && !defined(NO_EDITOR)
Replace PR_COLORGLYPH_BRI(a) and PR_ALPHA(a) with PR_BRIGHTNESS(a) There used to be two ways of fading in/out text in VVVVVV: - Local code that modifies the R, G and B values of the text - Keeping the RGB values the same and using the alpha channel The latter approach is only used once, for [Press ENTER to return to editor]. The former approach causes problems with colored (button) glyphs: there's no way for the print function to tell from the RGB values whether a color is "full Viridian-cyan" or "Viridian-cyan faded out 50%", so I added the flag PR_COLORGLYPH_BRI(value) to tell the print function that the color brightness is reduced to match the brightness of colored glyphs to the brightness of the rest of the text. However, there were already plans to make the single use of alpha consistent with the rest of the game and the style, so PR_ALPHA(value) could be removed, as well as the bit signifying whether the brightness or alpha value is used. For the editor text, I simply copied the "Press {button} to teleport" behavior of hiding the text completely if it becomes darker than 100/255. Another simplification is to make the print function handle not just the brightness of the color glyphs while local code handled the brightness of the normal text color, but to make the print function handle both. That way, the callsite can simply pass in the full colors and the brightness flag, and the flag name can be made a lot simpler as well: PR_BRIGHTNESS(value).
2023-01-31 02:22:43 +01:00
if(map.custommode && !map.custommodeforreal && !game.advancetext){
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//Return to level editor
Clean up scripts in the editor Scripts used a weird "hook" system, where script names were extracted into their own list. This was completely unneeded, so it has been replaced with using the script.customscripts vector directly. The script editor has been cleaned up, so the cursor's Y position is relative to the entire script, rather than what's just displaying on the screen currently. This simplifies a lot of code, and I don't know why it was done the other way in the first place. The script selector and script editor cursors have been sped up, since both lists can be massive, and waiting 6 frames per line is extremely slow and boring. This is still slow and boring, but we don't have proper input repetition yet.
2023-03-09 18:10:58 +01:00
int alpha = graphics.lerp(ed.old_return_message_timer, ed.return_message_timer);
Replace PR_COLORGLYPH_BRI(a) and PR_ALPHA(a) with PR_BRIGHTNESS(a) There used to be two ways of fading in/out text in VVVVVV: - Local code that modifies the R, G and B values of the text - Keeping the RGB values the same and using the alpha channel The latter approach is only used once, for [Press ENTER to return to editor]. The former approach causes problems with colored (button) glyphs: there's no way for the print function to tell from the RGB values whether a color is "full Viridian-cyan" or "Viridian-cyan faded out 50%", so I added the flag PR_COLORGLYPH_BRI(value) to tell the print function that the color brightness is reduced to match the brightness of colored glyphs to the brightness of the rest of the text. However, there were already plans to make the single use of alpha consistent with the rest of the game and the style, so PR_ALPHA(value) could be removed, as well as the bit signifying whether the brightness or alpha value is used. For the editor text, I simply copied the "Press {button} to teleport" behavior of hiding the text completely if it becomes darker than 100/255. Another simplification is to make the print function handle not just the brightness of the color glyphs while local code handled the brightness of the normal text color, but to make the print function handle both. That way, the callsite can simply pass in the full colors and the brightness flag, and the flag name can be made a lot simpler as well: PR_BRIGHTNESS(value).
2023-01-31 02:22:43 +01:00
if (alpha > 100)
{
Add support for button glyph display This adds a function that converts an action (such as interacting in-game) to the corresponding button text ("ENTER", "E") or button glyph (PlayStation triangle, Steam Deck Y, etc). This function currently only gives the existing ENTERs or Es, because I don't know how best to detect controller usage, or whether the game is running on a Steam Deck, or what buttons need to be displayed there. Still, it should now be really easy to adapt the rendering of keyboard keys to consoles, controllers, or rebound keys. To identify the actions that currently need to be displayed, this commit also adds the initial enums for action sets as described by Ethan in a comment in #834 (Jan 18, 2022).
2023-03-18 22:30:16 +01:00
char buffer[SCREEN_WIDTH_CHARS + 1];
vformat_buf(
buffer, sizeof(buffer),
loc::gettext("[Press {button} to return to editor]"),
"button:but",
vformat_button(ActionSet_InGame, Action_InGame_Map)
);
font::print(PR_BRIGHTNESS(alpha) | PR_BOR, 5, 5, buffer, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
Replace PR_COLORGLYPH_BRI(a) and PR_ALPHA(a) with PR_BRIGHTNESS(a) There used to be two ways of fading in/out text in VVVVVV: - Local code that modifies the R, G and B values of the text - Keeping the RGB values the same and using the alpha channel The latter approach is only used once, for [Press ENTER to return to editor]. The former approach causes problems with colored (button) glyphs: there's no way for the print function to tell from the RGB values whether a color is "full Viridian-cyan" or "Viridian-cyan faded out 50%", so I added the flag PR_COLORGLYPH_BRI(value) to tell the print function that the color brightness is reduced to match the brightness of colored glyphs to the brightness of the rest of the text. However, there were already plans to make the single use of alpha consistent with the rest of the game and the style, so PR_ALPHA(value) could be removed, as well as the bit signifying whether the brightness or alpha value is used. For the editor text, I simply copied the "Press {button} to teleport" behavior of hiding the text completely if it becomes darker than 100/255. Another simplification is to make the print function handle not just the brightness of the color glyphs while local code handled the brightness of the normal text color, but to make the print function handle both. That way, the callsite can simply pass in the full colors and the brightness flag, and the flag name can be made a lot simpler as well: PR_BRIGHTNESS(value).
2023-01-31 02:22:43 +01:00
}
}
Fix NO_CUSTOM_LEVELS compile after #158 ifdef out the code that draws the "return to editor" text in NO_CUSTOM_LEVELS builds now that it accesses variables in the editor class (PR #158)
2020-02-11 05:52:08 +01:00
#endif
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
graphics.cutscenebars();
graphics.drawfade();
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
Fix textboxes fully fading out during blackout When `blackout` is active, the screen (to simplify) stops getting drawn to. The excecption is textboxes, which draw anyway. But since the screen isn't being cleared, removed textboxes stay on screen, since that texture isn't being cleared. In the SDL_Renderer PR, I accidentally broke this behavior, so this commit fixes it. Fixes #951.
2023-03-19 17:16:22 +01:00
graphics.drawgui();
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.set_render_target(graphics.gameTexture);
graphics.copy_texture(graphics.gameplayTexture, NULL, NULL);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Replace ACTION in texts by {button} placeholders Gamepads and the Steam Deck need "ACTION" to be replaced by a controller glyph, so that's now possible.
2023-03-18 22:32:26 +01:00
if (game.advancetext)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Replace ACTION in texts by {button} placeholders Gamepads and the Steam Deck need "ACTION" to be replaced by a controller glyph, so that's now possible.
2023-03-18 22:32:26 +01:00
char buffer_adv[SCREEN_WIDTH_CHARS + 1];
vformat_buf(
buffer_adv, sizeof(buffer_adv),
loc::gettext("- Press {button} to advance text -"),
"button:but",
vformat_button(ActionSet_InGame, Action_InGame_ACTION)
);
font::print(PR_CEN | PR_BOR, -1, graphics.flipmode ? 228 : 5, buffer_adv, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Move tele/activity/trophytext conds to collision detection This moves the teleporter, activity prompt, and trophy text "don't draw" conditionals to the part where the game checks collision with them, instead of whenever the game draws them. This makes it so that the game smoothly does the fade-in/fade-out animation instead of suddenly stopping rendering them whenever their "don't draw" conditions apply. Now, the "Press ENTER to activate terminal" prompt will no longer suddenly disappear whenever you activate one, and the "- Press ENTER to Teleport -" prompt will smoothly fade back in after teleporting, instead of suddenly popping in on screen.
2020-08-03 06:02:27 +02:00
if (game.readytotele > 100 || game.oldreadytotele > 100)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Replace hardcoded temp buffer sizes with a named constant Constants.h will house constants like the screen size and others. But basically only the screen size for now. Now we don't have to type that "4 bytes per 40 chars (whole screen)" comment everywhere...
2021-09-13 06:39:07 +02:00
char buffer[SCREEN_WIDTH_CHARS + 1];
Separate pressing Enter to open map from pressing Enter to interact This is a lot of copy-pasted code, but a little bit of copy-pasting never hurt anyone... The keybind to interact with activity zones and teleporters is now separate from the keybind to open the map, or return to the editor from in-editor playtesting, or restart a time trial. The keybind is now E, and the default controller bind is X. No controller button prompts, but the game didn't have controller button prompts anyways, so whatever. Doing this now because if people's muscle memory are going to be broken by not being able to spam the map keybind anymore, at least we can help a bit by changing the keybind so they can keep spamming it - their muscle memory is going to be broken anyways. This option has to be enabled by going to the speedrunner menu options and selecting "interact button". It is disabled by default. All prompt text needs to be string-interpolated every time they are drawn, because it is possible for people to change which interact button they use in the middle of gameplay, via the in-game options. Closes #736.
2021-04-19 08:23:44 +02:00
const char* final_string = interact_prompt(
buffer,
sizeof(buffer),
Entity.cpp: make all activity prompts translatable This adds loc::gettext for all "Press {button} to explode" and friends, and also changes the interact_prompt function in Render.cpp to expect {button} instead of %s. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:26:51 +01:00
loc::gettext("- Press {button} to Teleport -")
Separate pressing Enter to open map from pressing Enter to interact This is a lot of copy-pasted code, but a little bit of copy-pasting never hurt anyone... The keybind to interact with activity zones and teleporters is now separate from the keybind to open the map, or return to the editor from in-editor playtesting, or restart a time trial. The keybind is now E, and the default controller bind is X. No controller button prompts, but the game didn't have controller button prompts anyways, so whatever. Doing this now because if people's muscle memory are going to be broken by not being able to spam the map keybind anymore, at least we can help a bit by changing the keybind so they can keep spamming it - their muscle memory is going to be broken anyways. This option has to be enabled by going to the speedrunner menu options and selecting "interact button". It is disabled by default. All prompt text needs to be string-interpolated every time they are drawn, because it is possible for people to change which interact button they use in the middle of gameplay, via the in-game options. Closes #736.
2021-04-19 08:23:44 +02:00
);
Interpolate "- Press ENTER to Teleport -" prompt This is only really noticeable in slowmode, but if you're playing in slowmode it'll be pretty smooth.
2020-04-30 02:04:25 +02:00
int alpha = graphics.lerp(game.oldreadytotele, game.readytotele);
Separate pressing Enter to open map from pressing Enter to interact This is a lot of copy-pasted code, but a little bit of copy-pasting never hurt anyone... The keybind to interact with activity zones and teleporters is now separate from the keybind to open the map, or return to the editor from in-editor playtesting, or restart a time trial. The keybind is now E, and the default controller bind is X. No controller button prompts, but the game didn't have controller button prompts anyways, so whatever. Doing this now because if people's muscle memory are going to be broken by not being able to spam the map keybind anymore, at least we can help a bit by changing the keybind so they can keep spamming it - their muscle memory is going to be broken anyways. This option has to be enabled by going to the speedrunner menu options and selecting "interact button". It is disabled by default. All prompt text needs to be string-interpolated every time they are drawn, because it is possible for people to change which interact button they use in the middle of gameplay, via the in-game options. Closes #736.
2021-04-19 08:23:44 +02:00
Implement first font::print function, fix most fading of colored glyphs There has always been a mess of different print functions that all had slightly different specifics and called each other: Print(x, y, text, r, g, b, cen) nothing special here, just does what the arguments say PrintAlpha(x, y, text, r, g, b, a, cen) just Print but with an alpha argument PrintWrap(x, y, text, r, g, b, cen, linespacing, maxwidth) added for wordwrapping, heavily used now bprint(x, y, text, r, g, b, cen) prints an outline, then just PrintAlpha bprintalpha(x, y, text, r, g, b, a, cen) just bprint but with an alpha argument bigprint(x, y, text, r, g, b, cen, sc) nothing special here, just does what the arguments say bigbprint(x, y, text, r, g, b, cen, sc) prints an outline, then just bigprint bigrprint(x, y, text, r, g, b, cen, sc) right-aligns text, unless cen is given in which case it just centers text like other functions already do? bigbrprint(x, y, text, r, g, b, cen, sc) prints an outline, then just bigrprint We need even more specifics with the new font system: we need to be able to specify whether CJK characters should be vertically centered or stick out on the top/bottom, and we sometimes need to pass in brightness variables for colored glyphs. And text printing functions now fit better in Font.cpp anyway. So there's now a big overhaul of print functions: all these functions will be replaced by font::print and font::print_wrap (the former of which now exists). These take flags as their first argument, which can be 0 for a basic left-aligned print, PR_CEN for centered text (set X to -1!!!) PR_BOR for a border (instead of functions like bprint and bigbprint), PR_2X, PR_3X etc for scaling, and these can be combined with |. Some text, for example [Press ESC to return to editor], fades in/out using the alpha value, which is passed to the print function. In some other places (like Press ENTER to teleport, textboxes, trophy text...) text can fade in or out by direct changes to the RGB values. This means regular color-adjusted white text can change color, but colored button glyphs can't, since there's no way to know in the print system what the maximum RGB values of a specific textbox are supposed to be, so the only thing it can do is draw the button glyphs at full brightness, which looks bad. Therefore, you can now also pass in the brightness value via the flags, with PR_COLORGLYPH_BRI(255).
2023-01-06 04:43:21 +01:00
font::print(
Replace PR_COLORGLYPH_BRI(a) and PR_ALPHA(a) with PR_BRIGHTNESS(a) There used to be two ways of fading in/out text in VVVVVV: - Local code that modifies the R, G and B values of the text - Keeping the RGB values the same and using the alpha channel The latter approach is only used once, for [Press ENTER to return to editor]. The former approach causes problems with colored (button) glyphs: there's no way for the print function to tell from the RGB values whether a color is "full Viridian-cyan" or "Viridian-cyan faded out 50%", so I added the flag PR_COLORGLYPH_BRI(value) to tell the print function that the color brightness is reduced to match the brightness of colored glyphs to the brightness of the rest of the text. However, there were already plans to make the single use of alpha consistent with the rest of the game and the style, so PR_ALPHA(value) could be removed, as well as the bit signifying whether the brightness or alpha value is used. For the editor text, I simply copied the "Press {button} to teleport" behavior of hiding the text completely if it becomes darker than 100/255. Another simplification is to make the print function handle not just the brightness of the color glyphs while local code handled the brightness of the normal text color, but to make the print function handle both. That way, the callsite can simply pass in the full colors and the brightness flag, and the flag name can be made a lot simpler as well: PR_BRIGHTNESS(value).
2023-01-31 02:22:43 +01:00
PR_BRIGHTNESS(alpha) | PR_CEN | PR_BOR,
Implement first font::print function, fix most fading of colored glyphs There has always been a mess of different print functions that all had slightly different specifics and called each other: Print(x, y, text, r, g, b, cen) nothing special here, just does what the arguments say PrintAlpha(x, y, text, r, g, b, a, cen) just Print but with an alpha argument PrintWrap(x, y, text, r, g, b, cen, linespacing, maxwidth) added for wordwrapping, heavily used now bprint(x, y, text, r, g, b, cen) prints an outline, then just PrintAlpha bprintalpha(x, y, text, r, g, b, a, cen) just bprint but with an alpha argument bigprint(x, y, text, r, g, b, cen, sc) nothing special here, just does what the arguments say bigbprint(x, y, text, r, g, b, cen, sc) prints an outline, then just bigprint bigrprint(x, y, text, r, g, b, cen, sc) right-aligns text, unless cen is given in which case it just centers text like other functions already do? bigbrprint(x, y, text, r, g, b, cen, sc) prints an outline, then just bigrprint We need even more specifics with the new font system: we need to be able to specify whether CJK characters should be vertically centered or stick out on the top/bottom, and we sometimes need to pass in brightness variables for colored glyphs. And text printing functions now fit better in Font.cpp anyway. So there's now a big overhaul of print functions: all these functions will be replaced by font::print and font::print_wrap (the former of which now exists). These take flags as their first argument, which can be 0 for a basic left-aligned print, PR_CEN for centered text (set X to -1!!!) PR_BOR for a border (instead of functions like bprint and bigbprint), PR_2X, PR_3X etc for scaling, and these can be combined with |. Some text, for example [Press ESC to return to editor], fades in/out using the alpha value, which is passed to the print function. In some other places (like Press ENTER to teleport, textboxes, trophy text...) text can fade in or out by direct changes to the RGB values. This means regular color-adjusted white text can change color, but colored button glyphs can't, since there's no way to know in the print system what the maximum RGB values of a specific textbox are supposed to be, so the only thing it can do is draw the button glyphs at full brightness, which looks bad. Therefore, you can now also pass in the brightness value via the flags, with PR_COLORGLYPH_BRI(255).
2023-01-06 04:43:21 +01:00
-1,
graphics.flipmode ? 20 : 210,
final_string,
Replace PR_COLORGLYPH_BRI(a) and PR_ALPHA(a) with PR_BRIGHTNESS(a) There used to be two ways of fading in/out text in VVVVVV: - Local code that modifies the R, G and B values of the text - Keeping the RGB values the same and using the alpha channel The latter approach is only used once, for [Press ENTER to return to editor]. The former approach causes problems with colored (button) glyphs: there's no way for the print function to tell from the RGB values whether a color is "full Viridian-cyan" or "Viridian-cyan faded out 50%", so I added the flag PR_COLORGLYPH_BRI(value) to tell the print function that the color brightness is reduced to match the brightness of colored glyphs to the brightness of the rest of the text. However, there were already plans to make the single use of alpha consistent with the rest of the game and the style, so PR_ALPHA(value) could be removed, as well as the bit signifying whether the brightness or alpha value is used. For the editor text, I simply copied the "Press {button} to teleport" behavior of hiding the text completely if it becomes darker than 100/255. Another simplification is to make the print function handle not just the brightness of the color glyphs while local code handled the brightness of the normal text color, but to make the print function handle both. That way, the callsite can simply pass in the full colors and the brightness flag, and the flag name can be made a lot simpler as well: PR_BRIGHTNESS(value).
2023-01-31 02:22:43 +01:00
235 - (help.glow / 2),
235 - (help.glow / 2),
255
Implement first font::print function, fix most fading of colored glyphs There has always been a mess of different print functions that all had slightly different specifics and called each other: Print(x, y, text, r, g, b, cen) nothing special here, just does what the arguments say PrintAlpha(x, y, text, r, g, b, a, cen) just Print but with an alpha argument PrintWrap(x, y, text, r, g, b, cen, linespacing, maxwidth) added for wordwrapping, heavily used now bprint(x, y, text, r, g, b, cen) prints an outline, then just PrintAlpha bprintalpha(x, y, text, r, g, b, a, cen) just bprint but with an alpha argument bigprint(x, y, text, r, g, b, cen, sc) nothing special here, just does what the arguments say bigbprint(x, y, text, r, g, b, cen, sc) prints an outline, then just bigprint bigrprint(x, y, text, r, g, b, cen, sc) right-aligns text, unless cen is given in which case it just centers text like other functions already do? bigbrprint(x, y, text, r, g, b, cen, sc) prints an outline, then just bigrprint We need even more specifics with the new font system: we need to be able to specify whether CJK characters should be vertically centered or stick out on the top/bottom, and we sometimes need to pass in brightness variables for colored glyphs. And text printing functions now fit better in Font.cpp anyway. So there's now a big overhaul of print functions: all these functions will be replaced by font::print and font::print_wrap (the former of which now exists). These take flags as their first argument, which can be 0 for a basic left-aligned print, PR_CEN for centered text (set X to -1!!!) PR_BOR for a border (instead of functions like bprint and bigbprint), PR_2X, PR_3X etc for scaling, and these can be combined with |. Some text, for example [Press ESC to return to editor], fades in/out using the alpha value, which is passed to the print function. In some other places (like Press ENTER to teleport, textboxes, trophy text...) text can fade in or out by direct changes to the RGB values. This means regular color-adjusted white text can change color, but colored button glyphs can't, since there's no way to know in the print system what the maximum RGB values of a specific textbox are supposed to be, so the only thing it can do is draw the button glyphs at full brightness, which looks bad. Therefore, you can now also pass in the brightness value via the flags, with PR_COLORGLYPH_BRI(255).
2023-01-06 04:43:21 +01:00
);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
if (game.swnmode)
{
if (game.swngame == 0)
{
Move tempstring off of Graphics, Game, and UtilityClass Unlike, say, the scriptclass i/j/k stuff, these tempstrings are only purely visual, and there's no known glitches to manipulate them anyway. Thus I think it's safe to make this cleanup.
2020-04-03 00:05:41 +02:00
std::string tempstring = help.timestring(game.swntimer);
Completely remove Graphics::bigbprint, bigrprint and bigbrprint I migrated all of them to font::print, so they can now be removed. Six deprecated print functions left! (Of which some are used a whole lot, it's simpler if the lesser-used ones are gone first.)
2023-01-17 05:19:17 +01:00
font::print(PR_2X | PR_CEN | PR_BOR, -1, 20, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else if (game.swngame == 1)
{
if (game.swnmessage == 0)
{
Move tempstring off of Graphics, Game, and UtilityClass Unlike, say, the scriptclass i/j/k stuff, these tempstrings are only purely visual, and there's no known glitches to manipulate them anyway. Thus I think it's safe to make this cleanup.
2020-04-03 00:05:41 +02:00
std::string tempstring = help.timestring(game.swntimer);
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_BOR, 10, 10, loc::gettext("Current Time"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
Migrate more prints and graphics.len calls to font:: I especially focused on graphics.len and the print calls around them, because graphics.len calls appear a bit less often, might be overlooked when migrating print calls (thus possibly using different fonts by accident) and are often used for some kind of right-alignment or centering which can be changed into PR_RIGHT or PR_CEN with a different X anyway. Notably, I also added a new function to generate these kinds of sliders: ....[]............ Different languages means that the slider for analogue stick sensitivity needs to be longer to fit possibly long words for Low/Medium/High, and then different font sizes means that the longer slider won't fit onscreen in a language that needs a 12-wide font. So slider_get() can take a "target width", which dynamically changes the number of characters depending on the width of them in the interface font. I kinda forgot that I could force the 8x8 font instead of adapting the characters in the slider to the font, and other ideas (like using different characters or a more graphical progress bar) have been brought up on Discord, so this might all change again sooner or later.
2023-01-16 21:29:50 +01:00
font::print(PR_2X | PR_BOR | PR_FONT_8X8, 25, 24, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
tempstring = help.timestring(game.swnrecord);
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_BOR | PR_RIGHT, 320-8, 10, loc::gettext("Best Time"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
Migrate more prints and graphics.len calls to font:: I especially focused on graphics.len and the print calls around them, because graphics.len calls appear a bit less often, might be overlooked when migrating print calls (thus possibly using different fonts by accident) and are often used for some kind of right-alignment or centering which can be changed into PR_RIGHT or PR_CEN with a different X anyway. Notably, I also added a new function to generate these kinds of sliders: ....[]............ Different languages means that the slider for analogue stick sensitivity needs to be longer to fit possibly long words for Low/Medium/High, and then different font sizes means that the longer slider won't fit onscreen in a language that needs a 12-wide font. So slider_get() can take a "target width", which dynamically changes the number of characters depending on the width of them in the interface font. I kinda forgot that I could force the 8x8 font instead of adapting the characters in the slider to the font, and other ideas (like using different characters or a more graphical progress bar) have been brought up on Discord, so this might all change again sooner or later.
2023-01-16 21:29:50 +01:00
font::print(PR_2X | PR_BOR | PR_FONT_8X8 | PR_RIGHT, 300, 24, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
switch(game.swnbestrank)
{
case 0:
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print_wrap(PR_CEN, -1, 204, loc::gettext("Next Trophy at 5 seconds"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 1:
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print_wrap(PR_CEN, -1, 204, loc::gettext("Next Trophy at 10 seconds"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 2:
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print_wrap(PR_CEN, -1, 204, loc::gettext("Next Trophy at 15 seconds"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 3:
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print_wrap(PR_CEN, -1, 204, loc::gettext("Next Trophy at 20 seconds"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 4:
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print_wrap(PR_CEN, -1, 204, loc::gettext("Next Trophy at 30 seconds"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 5:
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print_wrap(PR_CEN, -1, 204, loc::gettext("Next Trophy at 1 minute"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 6:
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print_wrap(PR_CEN, -1, 204, loc::gettext("All Trophies collected!"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
}
}
else if (game.swnmessage == 1)
{
Move tempstring off of Graphics, Game, and UtilityClass Unlike, say, the scriptclass i/j/k stuff, these tempstrings are only purely visual, and there's no known glitches to manipulate them anyway. Thus I think it's safe to make this cleanup.
2020-04-03 00:05:41 +02:00
std::string tempstring = help.timestring(game.swntimer);
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_BOR, 10, 10, loc::gettext("Current Time"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
font::print(PR_2X | PR_BOR | PR_FONT_8X8, 25, 24, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
tempstring = help.timestring(game.swnrecord);
if (int(game.deathseq / 5) % 2 == 1)
{
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_BOR | PR_RIGHT, 320-8, 10, loc::gettext("Best Time"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
font::print(PR_2X | PR_BOR | PR_FONT_8X8 | PR_RIGHT, 300, 24, tempstring, 128 - (help.glow), 220 - (help.glow), 128 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_2X | PR_BOR | PR_CEN, -1, 200, loc::gettext("New Record!"), 128 - (help.glow), 220 - (help.glow), 128 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
else if (game.swnmessage >= 2)
{
game.swnmessage--;
if (game.swnmessage == 2) game.swnmessage = 0;
Move tempstring off of Graphics, Game, and UtilityClass Unlike, say, the scriptclass i/j/k stuff, these tempstrings are only purely visual, and there's no known glitches to manipulate them anyway. Thus I think it's safe to make this cleanup.
2020-04-03 00:05:41 +02:00
std::string tempstring = help.timestring(game.swntimer);
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_BOR, 10, 10, loc::gettext("Current Time"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
font::print(PR_2X | PR_BOR | PR_FONT_8X8, 25, 24, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
tempstring = help.timestring(game.swnrecord);
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_BOR | PR_RIGHT, 320-8, 10, loc::gettext("Best Time"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
font::print(PR_2X | PR_BOR | PR_FONT_8X8 | PR_RIGHT, 300, 24, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if (int(game.swnmessage / 5) % 2 == 1)
{
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_2X | PR_BOR | PR_CEN, -1, 200, loc::gettext("New Trophy!"), 220 - (help.glow), 128 - (help.glow), 128 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
Add support for button glyph display This adds a function that converts an action (such as interacting in-game) to the corresponding button text ("ENTER", "E") or button glyph (PlayStation triangle, Steam Deck Y, etc). This function currently only gives the existing ENTERs or Es, because I don't know how best to detect controller usage, or whether the game is running on a Steam Deck, or what buttons need to be displayed there. Still, it should now be really easy to adapt the rendering of keyboard keys to consoles, controllers, or rebound keys. To identify the actions that currently need to be displayed, this commit also adds the initial enums for action sets as described by Ethan in a comment in #834 (Jan 18, 2022).
2023-03-18 22:30:16 +01:00
char buffer[SCREEN_WIDTH_CHARS + 1];
vformat_buf(
buffer, sizeof(buffer),
loc::gettext("[Press {button} to stop]"),
"button:but",
vformat_button(ActionSet_InGame, Action_InGame_Map)
);
font::print(PR_BOR | PR_CEN, -1, 228, buffer, 160 - (help.glow/2), 160 - (help.glow/2), 160 - (help.glow/2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else if(game.swngame==2)
{
if (int(game.swndelay / 15) % 2 == 1 || game.swndelay >= 120)
{
De-duplicate Gravitron initial message Since the only difference is the y-positions, I've decided to remove the copy-pasted code. A better solution would be to have a function that draws multiline text and handles it accordingly in Flip Mode, but that could be done later.
2021-03-19 21:57:05 +01:00
int y1;
int y2;
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
if (graphics.flipmode)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
De-duplicate Gravitron initial message Since the only difference is the y-positions, I've decided to remove the copy-pasted code. A better solution would be to have a function that draws multiline text and handles it accordingly in Flip Mode, but that could be done later.
2021-03-19 21:57:05 +01:00
y1 = 30;
y2 = 10;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
De-duplicate Gravitron initial message Since the only difference is the y-positions, I've decided to remove the copy-pasted code. A better solution would be to have a function that draws multiline text and handles it accordingly in Flip Mode, but that could be done later.
2021-03-19 21:57:05 +01:00
y1 = 10;
y2 = 30;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Migrate more prints to font::, determine font for most textboxes Some textboxes need to be in the level font (like room names, cutscene dialogue, etc - even in the main game), and some need to be in the interface font (like when you collect a shiny trinket or crewmate). So most of these textboxes now have graphics.textboxprintflags(font_flag) as appropriate. RoomnameTranslator.cpp is now also migrated to the new print system - in room name translator mode, the room name is now displayed in the 8x8 font if it's untranslated and the level font if it is.
2023-01-13 05:11:39 +01:00
font::print(PR_2X | PR_CEN | PR_BOR | PR_CJK_HIGH, -1, y1, loc::gettext("Survive for"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
font::print(PR_2X | PR_CEN | PR_BOR, -1, y2, loc::gettext("60 seconds!"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
else if(game.swngame==7)
{
if (game.swndelay >= 60)
{
Completely remove Graphics::bigbprint, bigrprint and bigbrprint I migrated all of them to font::print, so they can now be removed. Six deprecated print functions left! (Of which some are used a whole lot, it's simpler if the lesser-used ones are gone first.)
2023-01-17 05:19:17 +01:00
font::print(PR_2X | PR_BOR | PR_CEN, -1, 20, loc::gettext("SUPER GRAVITRON"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Move tempstring off of Graphics, Game, and UtilityClass Unlike, say, the scriptclass i/j/k stuff, these tempstrings are only purely visual, and there's no known glitches to manipulate them anyway. Thus I think it's safe to make this cleanup.
2020-04-03 00:05:41 +02:00
std::string tempstring = help.timestring(game.swnrecord);
Completely remove Graphics::bigbprint, bigrprint and bigbrprint I migrated all of them to font::print, so they can now be removed. Six deprecated print functions left! (Of which some are used a whole lot, it's simpler if the lesser-used ones are gone first.)
2023-01-17 05:19:17 +01:00
font::print(PR_BOR | PR_CEN, -1, 190, loc::gettext("Best Time"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
font::print(PR_2X | PR_BOR | PR_CEN, -1, 205, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Completely remove Graphics::bigbprint, bigrprint and bigbrprint I migrated all of them to font::print, so they can now be removed. Six deprecated print functions left! (Of which some are used a whole lot, it's simpler if the lesser-used ones are gone first.)
2023-01-17 05:19:17 +01:00
else if (int(game.swndelay / 10) % 2 == 1)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::bigbprint, bigrprint and bigbrprint I migrated all of them to font::print, so they can now be removed. Six deprecated print functions left! (Of which some are used a whole lot, it's simpler if the lesser-used ones are gone first.)
2023-01-17 05:19:17 +01:00
font::print(PR_2X | PR_BOR | PR_CEN, -1, 20, loc::gettext("SUPER GRAVITRON"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
font::print(PR_3X | PR_BOR | PR_CEN, -1, 200, loc::gettext("GO!"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
Enumify all fade modes This removes the magic numbers previously used for controlling the fade mode, which are really not readable at all unless you already know what they mean. 0: FADE_NONE 1: FADE_FULLY_BLACK 2: FADE_START_FADEOUT 3: FADE_FADING_OUT 4: FADE_START_FADEIN 5: FADE_FADING_IN There is also the macro FADEMODE_IS_FADING, which indicates when the intention is to only check if the game is fading right now, which wasn't clearly conveyed previously. I also took the opportunity to clean up the style of any lines I touched. This included rewriting if-else chains into case-switches, turning one-liner if-then statements into proper blocks, fixing up comments, and even commenting the `fademode == FADE_NONE` on the tower spike checks (which, it was previously undocumented why that check was there, but I think I know why it's there). As for type safety, we already get some by transforming the variable types into the enum. Assignment is prohibited without a cast. But, apparently, comparison is perfectly legal and won't even give so much as a warning. To work around this and make absolutely sure I made all existing comparisons now use the enum, I temporarily changed it to be an `enum class`, which is a C++11 feature that makes it so all comparisons are illegal. Unfortunately, it scopes them in a namespace with the same name as a class, so I had to temporarily define macros to make sure my existing code worked. I also had to temporarily up the standard in CMakeLists.txt to get it to compile. But after all that was done, I found the rest of the places where a comparison to an integer was used, and fixed them.
2022-04-25 09:57:47 +02:00
if (game.intimetrial && graphics.fademode == FADE_NONE)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Draw countdown!
if (game.timetrialcountdown > 0)
{
if (game.timetrialcountdown < 30)
{
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
if (int(game.timetrialcountdown / 4) % 2 == 0)
{
font::print(PR_4X | PR_CEN | PR_BOR, -1, 100, loc::gettext("Go!"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else if (game.timetrialcountdown < 60)
{
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_4X | PR_CEN | PR_BOR, -1, 100, "1", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else if (game.timetrialcountdown < 90)
{
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_4X | PR_CEN | PR_BOR, -1, 100, "2", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else if (game.timetrialcountdown < 120)
{
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_4X | PR_CEN | PR_BOR, -1, 100, "3", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
Add level exploring menu for translators I would, of course, recommend translators to translate the roomnames while playing the full game (optionally in invincibility) so they can immediately get all the context and maybe the most inspiration. And if you want to go back into a specific level, then there's always the time trials and intermission replays which will give you full coverage of all the room names. However, the time trials weren't really made for room name translation. They have some annoying features like the instant restart when you press ENTER at the wrong time, they remove context clues like teleporters and companions, but the worst problem is that the last room in a level is often completely untranslatable inside the time trials because you immediately get sent to the results screen... So, I added a new menu in the translator options, "explore game", which gives you access to all the time trials and the two intermissions, from the same menu. All these time trials (which they're still based off of, under the hood) are stripped of the annoying features that come with time trials. These are the changes I made to time trial behavior in translator exploring mode: - No 3-2-1-Go! countdown - No on-screen time/death/shiny/par - ENTER doesn't restart, and the map menu works. The entire map is also revealed. - Prize for the Reckless is in its normal form - The teleporters in Entanglement Generator, Wheeler's Wormhole and Level Complete are restored as context for room names (actually, we should probably restore them in time trials anyway? Their "press to teleport" prompt is already blocked out in time trials and they do nothing other than being a checkpoint. I guess the reason they were removed was to stop people from opening the teleporter menu when that was not specifically blocked out in time trials yet.) - The companions are there at the end of levels, and behave like in no death mode (become happy and follow you to the teleporter). Also for context. - At the end of each level, you're not suddenly sent to the menu, but you can use the teleporter at your leisure just like in the intermission replays. In the Final Level, you do get sent to the menu automatically, but after a longer delay. I made another mark on VVVVVV: don't be startled, I added gamestates. I wanted all teleporters at the end of levels to behave like the ones at the end of the intermission replays, and all handling for teleporting with specific companions is already done in gamestates, so rather than adding conditional blocks across 5 or so different gamestates, it made more sense to make a single gamestate for "teleporting in translator exploring mode" (3090). I also added an alternative to having to use gamestate 3500 or 82 for the end of the final level: 3091-3092. One other thing I want to add to the "explore game" menu: a per-level count of how many room names are left to translate. That shouldn't be too difficult, and I'm planning that for the next commit.
2022-11-26 03:33:17 +01:00
else if (!roomname_translator::is_pausing() && !game.translator_exploring)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Simplify time formatting functions Here's my notes on all the existing functions and what kind of time formats they output: - Game::giventimestring(int hrs, int min, int sec) H:MM:SS MM:SS - Game::timestring() // uses game.hours/minutes/seconds H:MM:SS MM:SS - Game::partimestring() // uses game.timetrialpar (seconds) MM:SS - Game::resulttimestring() // uses game.timetrialresulttime (sec) + timetrialresultframes (1/30s) MM:SS.CC - Game::timetstring(int t) // t = seconds MM:SS - Game::timestringcenti(char* buffer, const size_t buffer_size) // uses game.hours/minutes/seconds/frames H:MM:SS.CC MM:SS.CC - UtilityClass::timestring(int t) // t = frames, 30 frames = 1 second S:CC M:SS:CC This is kind of a mess, and there's a lot of functions that do the same thing except using different variables. For localization, I also want translators to be able to localize all these time formats - many languages use the decimal comma instead of the decimal point (12:34,56) maybe some languages really prefer something like 1時02分11秒44瞬... Which I don't know to be correct, but it's good to be prepared for it and not restrict translators arbitrarily to only changing ":" and "." when we can start making the system better in the first place. I added a new function, UtilityClass::format_time. This is the place where all time formats come together, given the number of seconds and optionally frames. I have simplified the above-mentioned functions somewhat, but I haven't given them a complete refactor or renaming - I mainly made sure that they all use the same backend so I can make the formats consistent and properly localizable. (And before we start shoving more temporary char buffers everywhere just to get rid of the std::string's, maybe we need to think of a globally used working buffer of size SCREEN_WIDTH_CHARS+1, as a register of sorts, for when any line of text needs to be made or processed, then printed, and then goes unused. Maybe help.textrow, or something like that.) As for this commit, the available time formats are now more consistent and changed a little in some places. Leading zeroes for the first unit are now no longer included, time trial results and the Super Gravitron can now display hours when they went to 60 minutes before, and we now always use .CC instead of :CC. These are the formats: - H:MM:SS - H:MM:SS.CC - M:SS - M:SS.CC - S.CC (only used when always_minutes=false, for the Gravitrons) Here's what changes to the current functions: - Game::partimestring() is removed - it was used in two places, and could be replaced by game.timetstring(game.timetrialpar) - Game::giventimestring(h,m,s) and Game::timestring() are now wrappers for the other functions - The four remaining functions (Game::resulttimestring(), Game::timetstring(t), Game::timestringcenti(buffer, buffer_size) and UtilityClass::timestring(t)) are now wrappers for the "central function", UtilityClass::format_time. - UtilityClass::twodigits(int t) is now unused so it's also removed. - I also added int UtilityClass::hms_to_seconds(int h, int m, int s)
2021-12-25 17:13:46 +01:00
char buffer[SCREEN_WIDTH_CHARS + 1];
Add centiseconds to timer overlays This adds centiseconds to the in-game timer, as well as the time trial timer. This is to aid speedrun moderators in determining when exactly a run was completed, which they can't easily do if the timer only has a precision up to a second.
2021-12-21 02:32:12 +01:00
game.timestringcenti(buffer, sizeof(buffer));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//Draw OSD stuff
Render.cpp: make gamerender translatable This mainly adds loc::gettext calls. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-31 01:13:10 +01:00
const char* tempstring = loc::gettext("TIME:");
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
int label_len = font::len(0, tempstring);
font::print(PR_BOR, 6, 18, tempstring, 255,255,255);
Render.cpp: make gamerender translatable This mainly adds loc::gettext calls. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-31 01:13:10 +01:00
tempstring = loc::gettext("DEATH:");
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
label_len = SDL_max(label_len, font::len(0, tempstring));
font::print(PR_BOR, 6, 30, tempstring, 255,255,255);
Render.cpp: make gamerender translatable This mainly adds loc::gettext calls. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-31 01:13:10 +01:00
tempstring = loc::gettext("SHINY:");
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
label_len = SDL_max(label_len, font::len(0, tempstring));
font::print(PR_BOR, 6, 42, tempstring, 255,255,255);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if(game.timetrialparlost)
{
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_BOR, 8+label_len, 18, buffer, 196, 80, 80);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_BOR, 8+label_len, 18, buffer, 196, 196, 196);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
if(game.deathcounts>0)
{
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_BOR, 8+label_len, 30,help.String(game.deathcounts), 196, 80, 80);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_BOR, 8+label_len, 30,help.String(game.deathcounts), 196, 196, 196);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Render.cpp: make gamerender translatable This mainly adds loc::gettext calls. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-31 01:13:10 +01:00
vformat_buf(
buffer, sizeof(buffer),
loc::gettext("{n_trinkets} of {max_trinkets}"),
"n_trinkets:int, max_trinkets:int",
game.trinkets(), game.timetrialshinytarget
);
Don't use separate variable for number of collected trinkets game.trinkets is supposed to be correlated with obj.collect, however why not just count obj.collect directly? This turns game.trinkets into a function, game.trinkets(), which will directly count the number of collected trinkets and return it. This will fix a few corner cases where the number of trinkets can desync with the actual collection statuses of trinkets. In order to keep save compatibility with previous versions of VVVVVV, the game will still write the <trinkets> variable. However, it will not read the <trinkets> variable from a save file.
2020-04-07 08:46:27 +02:00
if(game.trinkets()<game.timetrialshinytarget)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_BOR, 8+label_len, 42, buffer, 196, 80, 80);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_BOR, 8+label_len, 42, buffer, 196, 196, 196);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
std::string time = game.timetstring(game.timetrialpar);
Change font::len text argument from std::string to const char* See the previous two commits, a lot of the time we don't need std::string objects to be passed to these functions because we already have C strings. Commit 1/3: font::print_wrap Commit 2/3: font::print -> Commit 3/3: font::len
2023-03-05 00:32:58 +01:00
label_len = font::len(0, time.c_str());
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if(game.timetrialparlost)
{
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_BOR | PR_RIGHT, 307-label_len-8, 214, loc::gettext("PAR TIME:"), 80, 80, 80);
font::print(PR_BOR, 307-label_len, 214, time, 80, 80, 80);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_BOR | PR_RIGHT, 307-label_len-8, 214, loc::gettext("PAR TIME:"), 255, 255, 255);
font::print(PR_BOR, 307-label_len, 214, time, 196, 196, 196);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
Interpolate activity zone prompt fading in and out To make it real smooth, just in case it was noticeable that it only updated at 1000/34 FPS before (well, except in slowmode, it's really noticeable THERE). Also this removes the re-typing out of (game.act_fade/10.0f) for every single R, G, and B in gamerender().
2020-04-29 06:58:19 +02:00
float act_alpha = graphics.lerp(game.prev_act_fade, game.act_fade) / 10.0f;
De-duplicate activity zone rendering, don't ignore act_fade This is a follow-up to #421. The game would draw the activity zone if there was one active at all, and would ignore game.act_fade. Normally this wouldn't be a problem, but since #421, it's possible that there could be an active activity zone but game.act_fade would still be 5. This would happen if you entered a new activity zone while a cutscene was running. To fix this, just make it so that the prompt gets drawn on its own and only depends on the state of game.act_fade (or game.prev_act_fade), and won't be unconditionally drawn if there's an active activity zone. As a bonus, this de-duplicates the drawing of the activity prompt, so it's no longer copy-pasted.
2020-08-25 03:13:57 +02:00
if(game.act_fade>5 || game.prev_act_fade>5)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Replace hardcoded temp buffer sizes with a named constant Constants.h will house constants like the screen size and others. But basically only the screen size for now. Now we don't have to type that "4 bytes per 40 chars (whole screen)" comment everywhere...
2021-09-13 06:39:07 +02:00
char buffer[SCREEN_WIDTH_CHARS + 1];
Separate pressing Enter to open map from pressing Enter to interact This is a lot of copy-pasted code, but a little bit of copy-pasting never hurt anyone... The keybind to interact with activity zones and teleporters is now separate from the keybind to open the map, or return to the editor from in-editor playtesting, or restart a time trial. The keybind is now E, and the default controller bind is X. No controller button prompts, but the game didn't have controller button prompts anyways, so whatever. Doing this now because if people's muscle memory are going to be broken by not being able to spam the map keybind anymore, at least we can help a bit by changing the keybind so they can keep spamming it - their muscle memory is going to be broken anyways. This option has to be enabled by going to the speedrunner menu options and selecting "interact button". It is disabled by default. All prompt text needs to be string-interpolated every time they are drawn, because it is possible for people to change which interact button they use in the middle of gameplay, via the in-game options. Closes #736.
2021-04-19 08:23:44 +02:00
const char* final_string = interact_prompt(
buffer,
sizeof(buffer),
game.activity_lastprompt.c_str()
);
Deduplicate font::print for activity zone prompts There were two print calls, one for the transparent case, and one for a regular textbox. The print calls were nearly the same except for the color, and for some reason the transparent case didn't have PR_CJK_LOW (that one is on me).
2023-02-21 03:05:45 +01:00
uint8_t text_r, text_g, text_b;
Allow multiple lines and wordwrapping in activity zone prompts Activity zone prompts have always been limited to a single line, because the text box had a hardcoded size. A translator requested for the possibility to add a subtitle under music names for the jukebox, and the easiest solution is to make it possible to translate a prompt with multiple lines. This is possible now, and the textbox even wordwraps automatically. (I wouldn't really like to see translations using multiple lines for stuff like "Press ENTER to talk to Vitellary", especially if it wraps with one name and not with another, but if a string is too long, wordwrapping will look better than text running out of the box.)
2023-02-21 03:26:16 +01:00
uint32_t text_flags = game.activity_print_flags | PR_BRIGHTNESS(act_alpha*255) | PR_CJK_LOW | PR_CEN;
Deduplicate font::print for activity zone prompts There were two print calls, one for the transparent case, and one for a regular textbox. The print calls were nearly the same except for the color, and for some reason the transparent case didn't have PR_CJK_LOW (that one is on me).
2023-02-21 03:05:45 +01:00
Add `setactivityposition(x,y)`, add new textbox color `transparent` (#847) * Add `setactivityposition(x,y)`, add new textbox color `transparent` This commit adds a new internal command as a part of the visual activity zone changes I've been making. This one allows the user to reposition the activity zone to anywhere on the screen. In addition, this commit adds the textbox color `transparent`, which just sets r, g and b to 0. rgb(0, 0, 0) normally creates the color black, however in VVVVVV textboxes, it makes the background of them invisible, and makes the text the off-white color which the game uses elsewhere. * add new variables to hardreset * Fix unwanted text centering; offset position by 16, 4 It makes sense for `setactivityposition(0, 0)` to place the activity zone in the default position, so the x has been offset by 16, and the y has been offset by 4. Text was being automatically centered, meaning any activity zone which wasn't centered had misplaced text. This has been fixed by calculating the center manually, and offsetting it by the passed value.
2021-10-14 00:38:51 +02:00
if (game.activity_r == 0 && game.activity_g == 0 && game.activity_b == 0)
{
Deduplicate font::print for activity zone prompts There were two print calls, one for the transparent case, and one for a regular textbox. The print calls were nearly the same except for the color, and for some reason the transparent case didn't have PR_CJK_LOW (that one is on me).
2023-02-21 03:05:45 +01:00
text_r = 196;
text_g = 196;
text_b = 255 - help.glow;
Add `setactivityposition(x,y)`, add new textbox color `transparent` (#847) * Add `setactivityposition(x,y)`, add new textbox color `transparent` This commit adds a new internal command as a part of the visual activity zone changes I've been making. This one allows the user to reposition the activity zone to anywhere on the screen. In addition, this commit adds the textbox color `transparent`, which just sets r, g and b to 0. rgb(0, 0, 0) normally creates the color black, however in VVVVVV textboxes, it makes the background of them invisible, and makes the text the off-white color which the game uses elsewhere. * add new variables to hardreset * Fix unwanted text centering; offset position by 16, 4 It makes sense for `setactivityposition(0, 0)` to place the activity zone in the default position, so the x has been offset by 16, and the y has been offset by 4. Text was being automatically centered, meaning any activity zone which wasn't centered had misplaced text. This has been fixed by calculating the center manually, and offsetting it by the passed value.
2021-10-14 00:38:51 +02:00
}
else
{
Allow multiple lines and wordwrapping in activity zone prompts Activity zone prompts have always been limited to a single line, because the text box had a hardcoded size. A translator requested for the possibility to add a subtitle under music names for the jukebox, and the easiest solution is to make it possible to translate a prompt with multiple lines. This is possible now, and the textbox even wordwraps automatically. (I wouldn't really like to see translations using multiple lines for stuff like "Press ENTER to talk to Vitellary", especially if it wraps with one name and not with another, but if a string is too long, wordwrapping will look better than text running out of the box.)
2023-02-21 03:26:16 +01:00
short lines;
font::string_wordwrap(text_flags, final_string, 37*8, &lines);
Print activity zone text in correct font, remove Graphics::drawtextbox Activity zones need to be in the interface font if the message is from the system (like Press ENTER to activate terminal, which may be in a different language) and in the level font if it's a customized message (setactivitytext). Graphics::drawtextbox was counting the textbox width and height in 8x8 characters, even including the borders as characters, so it'd need to be told what the font for the textbox is, and then probably only the height needs to be adapted to the font and not the width because that's adapted to the screen width... So just call Graphics::drawpixeltextbox directly instead. It was already weird enough how actual cutscene textboxes called Graphics::drawtextbox with x/8, y/8 before the previous commit, (when you already have the pixel width and height!) only to have that be a wrapper for drawpixeltextbox by doing x*8, y*8.
2023-01-13 20:32:05 +01:00
graphics.drawpixeltextbox(
Remove x-position from `setactivityposition` After discussing with Ally and Dav, we came to the agreement that this is basically useless since the prompt will always be centered and take up most of the horizontal space of the screen. And the x-position was only added as an offset because at some point, there was a missing space from the side of the "- Press ENTER to Teleport -" prompt, and the offset was there so people could mimic the prompt accordingly. But that was fixed at some point, so it's useless now.
2023-02-18 05:38:05 +01:00
4,
Implement first font::print function, fix most fading of colored glyphs There has always been a mess of different print functions that all had slightly different specifics and called each other: Print(x, y, text, r, g, b, cen) nothing special here, just does what the arguments say PrintAlpha(x, y, text, r, g, b, a, cen) just Print but with an alpha argument PrintWrap(x, y, text, r, g, b, cen, linespacing, maxwidth) added for wordwrapping, heavily used now bprint(x, y, text, r, g, b, cen) prints an outline, then just PrintAlpha bprintalpha(x, y, text, r, g, b, a, cen) just bprint but with an alpha argument bigprint(x, y, text, r, g, b, cen, sc) nothing special here, just does what the arguments say bigbprint(x, y, text, r, g, b, cen, sc) prints an outline, then just bigprint bigrprint(x, y, text, r, g, b, cen, sc) right-aligns text, unless cen is given in which case it just centers text like other functions already do? bigbrprint(x, y, text, r, g, b, cen, sc) prints an outline, then just bigrprint We need even more specifics with the new font system: we need to be able to specify whether CJK characters should be vertically centered or stick out on the top/bottom, and we sometimes need to pass in brightness variables for colored glyphs. And text printing functions now fit better in Font.cpp anyway. So there's now a big overhaul of print functions: all these functions will be replaced by font::print and font::print_wrap (the former of which now exists). These take flags as their first argument, which can be 0 for a basic left-aligned print, PR_CEN for centered text (set X to -1!!!) PR_BOR for a border (instead of functions like bprint and bigbprint), PR_2X, PR_3X etc for scaling, and these can be combined with |. Some text, for example [Press ESC to return to editor], fades in/out using the alpha value, which is passed to the print function. In some other places (like Press ENTER to teleport, textboxes, trophy text...) text can fade in or out by direct changes to the RGB values. This means regular color-adjusted white text can change color, but colored button glyphs can't, since there's no way to know in the print system what the maximum RGB values of a specific textbox are supposed to be, so the only thing it can do is draw the button glyphs at full brightness, which looks bad. Therefore, you can now also pass in the brightness value via the flags, with PR_COLORGLYPH_BRI(255).
2023-01-06 04:43:21 +01:00
game.activity_y + 4,
Print activity zone text in correct font, remove Graphics::drawtextbox Activity zones need to be in the interface font if the message is from the system (like Press ENTER to activate terminal, which may be in a different language) and in the level font if it's a customized message (setactivitytext). Graphics::drawtextbox was counting the textbox width and height in 8x8 characters, even including the borders as characters, so it'd need to be told what the font for the textbox is, and then probably only the height needs to be adapted to the font and not the width because that's adapted to the screen width... So just call Graphics::drawpixeltextbox directly instead. It was already weird enough how actual cutscene textboxes called Graphics::drawtextbox with x/8, y/8 before the previous commit, (when you already have the pixel width and height!) only to have that be a wrapper for drawpixeltextbox by doing x*8, y*8.
2023-01-13 20:32:05 +01:00
39*8,
Allow multiple lines and wordwrapping in activity zone prompts Activity zone prompts have always been limited to a single line, because the text box had a hardcoded size. A translator requested for the possibility to add a subtitle under music names for the jukebox, and the easiest solution is to make it possible to translate a prompt with multiple lines. This is possible now, and the textbox even wordwraps automatically. (I wouldn't really like to see translations using multiple lines for stuff like "Press ENTER to talk to Vitellary", especially if it wraps with one name and not with another, but if a string is too long, wordwrapping will look better than text running out of the box.)
2023-02-21 03:26:16 +01:00
16 + font::height(text_flags)*lines,
Implement first font::print function, fix most fading of colored glyphs There has always been a mess of different print functions that all had slightly different specifics and called each other: Print(x, y, text, r, g, b, cen) nothing special here, just does what the arguments say PrintAlpha(x, y, text, r, g, b, a, cen) just Print but with an alpha argument PrintWrap(x, y, text, r, g, b, cen, linespacing, maxwidth) added for wordwrapping, heavily used now bprint(x, y, text, r, g, b, cen) prints an outline, then just PrintAlpha bprintalpha(x, y, text, r, g, b, a, cen) just bprint but with an alpha argument bigprint(x, y, text, r, g, b, cen, sc) nothing special here, just does what the arguments say bigbprint(x, y, text, r, g, b, cen, sc) prints an outline, then just bigprint bigrprint(x, y, text, r, g, b, cen, sc) right-aligns text, unless cen is given in which case it just centers text like other functions already do? bigbrprint(x, y, text, r, g, b, cen, sc) prints an outline, then just bigrprint We need even more specifics with the new font system: we need to be able to specify whether CJK characters should be vertically centered or stick out on the top/bottom, and we sometimes need to pass in brightness variables for colored glyphs. And text printing functions now fit better in Font.cpp anyway. So there's now a big overhaul of print functions: all these functions will be replaced by font::print and font::print_wrap (the former of which now exists). These take flags as their first argument, which can be 0 for a basic left-aligned print, PR_CEN for centered text (set X to -1!!!) PR_BOR for a border (instead of functions like bprint and bigbprint), PR_2X, PR_3X etc for scaling, and these can be combined with |. Some text, for example [Press ESC to return to editor], fades in/out using the alpha value, which is passed to the print function. In some other places (like Press ENTER to teleport, textboxes, trophy text...) text can fade in or out by direct changes to the RGB values. This means regular color-adjusted white text can change color, but colored button glyphs can't, since there's no way to know in the print system what the maximum RGB values of a specific textbox are supposed to be, so the only thing it can do is draw the button glyphs at full brightness, which looks bad. Therefore, you can now also pass in the brightness value via the flags, with PR_COLORGLYPH_BRI(255).
2023-01-06 04:43:21 +01:00
game.activity_r*act_alpha,
game.activity_g*act_alpha,
game.activity_b*act_alpha
);
Deduplicate font::print for activity zone prompts There were two print calls, one for the transparent case, and one for a regular textbox. The print calls were nearly the same except for the color, and for some reason the transparent case didn't have PR_CJK_LOW (that one is on me).
2023-02-21 03:05:45 +01:00
text_r = game.activity_r;
text_g = game.activity_g;
text_b = game.activity_b;
Add `setactivityposition(x,y)`, add new textbox color `transparent` (#847) * Add `setactivityposition(x,y)`, add new textbox color `transparent` This commit adds a new internal command as a part of the visual activity zone changes I've been making. This one allows the user to reposition the activity zone to anywhere on the screen. In addition, this commit adds the textbox color `transparent`, which just sets r, g and b to 0. rgb(0, 0, 0) normally creates the color black, however in VVVVVV textboxes, it makes the background of them invisible, and makes the text the off-white color which the game uses elsewhere. * add new variables to hardreset * Fix unwanted text centering; offset position by 16, 4 It makes sense for `setactivityposition(0, 0)` to place the activity zone in the default position, so the x has been offset by 16, and the y has been offset by 4. Text was being automatically centered, meaning any activity zone which wasn't centered had misplaced text. This has been fixed by calculating the center manually, and offsetting it by the passed value.
2021-10-14 00:38:51 +02:00
}
Deduplicate font::print for activity zone prompts There were two print calls, one for the transparent case, and one for a regular textbox. The print calls were nearly the same except for the color, and for some reason the transparent case didn't have PR_CJK_LOW (that one is on me).
2023-02-21 03:05:45 +01:00
Allow multiple lines and wordwrapping in activity zone prompts Activity zone prompts have always been limited to a single line, because the text box had a hardcoded size. A translator requested for the possibility to add a subtitle under music names for the jukebox, and the easiest solution is to make it possible to translate a prompt with multiple lines. This is possible now, and the textbox even wordwraps automatically. (I wouldn't really like to see translations using multiple lines for stuff like "Press ENTER to talk to Vitellary", especially if it wraps with one name and not with another, but if a string is too long, wordwrapping will look better than text running out of the box.)
2023-02-21 03:26:16 +01:00
font::print_wrap(
text_flags,
Deduplicate font::print for activity zone prompts There were two print calls, one for the transparent case, and one for a regular textbox. The print calls were nearly the same except for the color, and for some reason the transparent case didn't have PR_CJK_LOW (that one is on me).
2023-02-21 03:05:45 +01:00
-1,
game.activity_y + 12,
final_string,
text_r,
text_g,
Allow multiple lines and wordwrapping in activity zone prompts Activity zone prompts have always been limited to a single line, because the text box had a hardcoded size. A translator requested for the possibility to add a subtitle under music names for the jukebox, and the easiest solution is to make it possible to translate a prompt with multiple lines. This is possible now, and the textbox even wordwraps automatically. (I wouldn't really like to see translations using multiple lines for stuff like "Press ENTER to talk to Vitellary", especially if it wraps with one name and not with another, but if a string is too long, wordwrapping will look better than text running out of the box.)
2023-02-21 03:26:16 +01:00
text_b,
8,
37*8
Deduplicate font::print for activity zone prompts There were two print calls, one for the transparent case, and one for a regular textbox. The print calls were nearly the same except for the color, and for some reason the transparent case didn't have PR_CJK_LOW (that one is on me).
2023-02-21 03:05:45 +01:00
);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Move tele/activity/trophytext conds to collision detection This moves the teleporter, activity prompt, and trophy text "don't draw" conditionals to the part where the game checks collision with them, instead of whenever the game draws them. This makes it so that the game smoothly does the fade-in/fade-out animation instead of suddenly stopping rendering them whenever their "don't draw" conditions apply. Now, the "Press ENTER to activate terminal" prompt will no longer suddenly disappear whenever you activate one, and the "- Press ENTER to Teleport -" prompt will smoothly fade back in after teleporting, instead of suddenly popping in on screen.
2020-08-03 06:02:27 +02:00
if (obj.trophytext > 0 || obj.oldtrophytext > 0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
graphics.drawtrophytext();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Put screen effects render handling inside a function This de-duplicates the screen effects rendering code by putting it inside a function, Graphics::renderwithscreeneffects(), and using that instead of copy-pasted code.
2020-04-27 04:24:50 +02:00
graphics.renderwithscreeneffects();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Unify drawing room name on map menus into one function Previously, it was copy-pasted and slightly different, when really, they ought to both be the exact same code. It kind of pains me that the room name, glitch name, and hidden name don't own their own memory, but, that's to be addressed later. What's a bit annoying is that the `temp` variable used in `teleporterrender` also ends up being reused later in the function. In this case, I opted to just redeclare them when they are used anyway, to make it clearer. Apart from `teleporterrender` no longer calling `map.area` or caring about `map.custommode`, it also no longer cares about `graphics.fademode` being 0. I could never actually get this condition to be false in practice, and I have absolutely no idea why it's there. I'm guessing it could be some weird edge case rendering issue if the screen is fully black? But I wouldn't know how to trigger that, and anyway it should probably be fixed elsewhere. So I'm just going to remove that conditional.
2022-04-25 09:53:13 +02:00
static void draw_roomname_menu(void)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Unify drawing room name on map menus into one function Previously, it was copy-pasted and slightly different, when really, they ought to both be the exact same code. It kind of pains me that the room name, glitch name, and hidden name don't own their own memory, but, that's to be addressed later. What's a bit annoying is that the `temp` variable used in `teleporterrender` also ends up being reused later in the function. In this case, I opted to just redeclare them when they are used anyway, to make it clearer. Apart from `teleporterrender` no longer calling `map.area` or caring about `map.custommode`, it also no longer cares about `graphics.fademode` being 0. I could never actually get this condition to be false in practice, and I have absolutely no idea why it's there. I'm guessing it could be some weird edge case rendering issue if the screen is fully black? But I wouldn't know how to trigger that, and anyway it should probably be fixed elsewhere. So I'm just going to remove that conditional.
2022-04-25 09:53:13 +02:00
const char* name;
Fix roomname being continuously drawn on top of itself This is only noticeable if you have a font with translucent pixels, like I do. But it gets really noticeable really quickly with this over-30-FPS patch because the render functions are continuously called every delta-timestep. To prevent this, just fill the backbuffer with black before rendering anything.
2020-05-02 21:18:54 +02:00
Avoid function call to check empty room name Instead, a simple comparison of the first element will do.
2021-09-13 06:54:47 +02:00
if (map.hiddenname[0] != '\0')
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
name = loc::gettext_roomname_special(map.hiddenname);
Unify drawing room name on map menus into one function Previously, it was copy-pasted and slightly different, when really, they ought to both be the exact same code. It kind of pains me that the room name, glitch name, and hidden name don't own their own memory, but, that's to be addressed later. What's a bit annoying is that the `temp` variable used in `teleporterrender` also ends up being reused later in the function. In this case, I opted to just redeclare them when they are used anyway, to make it clearer. Apart from `teleporterrender` no longer calling `map.area` or caring about `map.custommode`, it also no longer cares about `graphics.fademode` being 0. I could never actually get this condition to be false in practice, and I have absolutely no idea why it's there. I'm guessing it could be some weird edge case rendering issue if the screen is fully black? But I wouldn't know how to trigger that, and anyway it should probably be fixed elsewhere. So I'm just going to remove that conditional.
2022-04-25 09:53:13 +02:00
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
else
{
Add localization "foundation" (many code changes) This commit adds most of the code changes necessary for making the game translatable, but does not yet "unhardcode" nearly all of the strings (except in a few cases where it was hard to separate added loc::gettexts from foundational code changes, or all the localization- related menus which were also added by this commit.) This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 22:57:24 +01:00
name = loc::gettext_roomname(map.custommode, game.roomx, game.roomy, map.roomname, map.roomname_special);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_FONT_LEVEL | PR_CEN, -1, 2, name, 196, 196, 255 - help.glow);
Unify drawing room name on map menus into one function Previously, it was copy-pasted and slightly different, when really, they ought to both be the exact same code. It kind of pains me that the room name, glitch name, and hidden name don't own their own memory, but, that's to be addressed later. What's a bit annoying is that the `temp` variable used in `teleporterrender` also ends up being reused later in the function. In this case, I opted to just redeclare them when they are used anyway, to make it clearer. Apart from `teleporterrender` no longer calling `map.area` or caring about `map.custommode`, it also no longer cares about `graphics.fademode` being 0. I could never actually get this condition to be false in practice, and I have absolutely no idea why it's there. I'm guessing it could be some weird edge case rendering issue if the screen is fully black? But I wouldn't know how to trigger that, and anyway it should probably be fixed elsewhere. So I'm just going to remove that conditional.
2022-04-25 09:53:13 +02:00
}
/* Used to keep some graphics positions on the map screen
* the same in Flip Mode. */
#define FLIP(y, h) (graphics.flipmode ? 220 - (y) - (h) : (y))
Style: Fixup instances of `void` arguments The style we have here is that functions with no arguments are to have explicit `void` arguments, even though this doesn't apply in C++, because it does apply in C. Unfortunately, some have slipped through the cracks. This commit fixes them.
2023-03-18 23:24:14 +01:00
static MapRenderData getmaprenderdata(void)
Deduplicate map render data calcuations
2022-11-30 17:37:41 +01:00
{
MapRenderData data;
data.zoom = map.custommode ? map.customzoom : 1;
data.xoff = map.custommode ? map.custommmxoff : 0;
data.yoff = map.custommode ? map.custommmyoff : 0;
Fix legend positions
2022-11-30 20:02:05 +01:00
data.legendxoff = 40 + data.xoff;
data.legendyoff = 21 + data.yoff;
Deduplicate map render data calcuations
2022-11-30 17:37:41 +01:00
Fix legend positions
2022-11-30 20:02:05 +01:00
// Magic numbers for centering legend tiles.
Deduplicate map render data calcuations
2022-11-30 17:37:41 +01:00
switch (data.zoom)
{
case 4:
Fix legend positions
2022-11-30 20:02:05 +01:00
data.legendxoff += 21;
data.legendyoff += 16;
Deduplicate map render data calcuations
2022-11-30 17:37:41 +01:00
break;
case 2:
Fix legend positions
2022-11-30 20:02:05 +01:00
data.legendxoff += 9;
data.legendyoff += 5;
Deduplicate map render data calcuations
2022-11-30 17:37:41 +01:00
break;
default:
Fix legend positions
2022-11-30 20:02:05 +01:00
data.legendxoff += 3;
data.legendyoff += 1;
Deduplicate map render data calcuations
2022-11-30 17:37:41 +01:00
break;
}
return data;
}
Apply suggestions from code review Co-authored-by: Misa Elizabeth Kai <infoteddy@infoteddy.info>
2022-11-30 17:10:27 +01:00
static void rendermap(void)
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
{
#ifndef NO_CUSTOM_LEVELS
Fix small bug with map being off in custom levels The pixel border around the map fits to map size normally. However, when the map is off, it's always the dimensions of the full size map, and the border didn't reflect that, so if the custom minimap was off, and the map wasn't the full size, it wouldn't fit correctly. This bug was introduced in PR #898.
2023-01-26 20:52:29 +01:00
if (map.custommode && map.customshowmm)
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
{
graphics.drawpixeltextbox(35 + map.custommmxoff, 16 + map.custommmyoff, map.custommmxsize + 10, map.custommmysize + 10, 65, 185, 207);
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.drawpartimage(graphics.minimap_mounted ? IMAGE_MINIMAP : IMAGE_CUSTOMMINIMAP, 40 + map.custommmxoff, 21 + map.custommmyoff, map.custommmxsize, map.custommmysize);
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
return;
}
#endif /* NO_CUSTOM_LEVELS */
graphics.drawpixeltextbox(35, 16, 250, 190, 65, 185, 207);
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.drawimage(IMAGE_MINIMAP, 40, 21, false);
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
}
Apply suggestions from code review Co-authored-by: Misa Elizabeth Kai <infoteddy@infoteddy.info>
2022-11-30 17:10:27 +01:00
static void rendermapfog(void)
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
{
Apply suggestions from code review Co-authored-by: Misa Elizabeth Kai <infoteddy@infoteddy.info>
2022-11-30 19:31:36 +01:00
const MapRenderData data = getmaprenderdata();
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
Unify all queries to map size to `map.getwidth` and `map.getheight` It's becoming pretty clear that the size of the map is important enough to be queried a lot, but each time it's something like `map.custommode ? map.customwidth : 20` and `map.custommode ? map.customheight : 20` which is not ideal because of copy-pasting. Furthermore, even `map.customwidth` and `map.customheight` are just duplicates of `cl.mapwidth` and `cl.mapheight`, which are only set in `customlevelclass::generatecustomminimap`. This is a bit annoying if you want to, say, add checks that depend on the width and height of the custom map in `mapclass::initcustommapdata`, but `map.customwidth` and `map.customheight` are out of date because `generatecustomminimap` hasn't been called yet. And doing the ternary there requires a `#ifndef NO_CUSTOM_LEVELS` to reference `cl.mapwidth` and `cl.mapheight` which is just awful. So I'm axing `map.customwidth` and `map.customheight`, and I'm axing all the ternaries that are duplicating the source of truth in `MapRenderData`. Instead, there will just be one function to call for the width and height, `mapclass::getwidth` and `mapclass::getheight`, and everyone can simply call those without needing to do ternaries or duplication.
2022-11-30 22:35:14 +01:00
for (int j = 0; j < map.getheight(); j++)
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
{
Unify all queries to map size to `map.getwidth` and `map.getheight` It's becoming pretty clear that the size of the map is important enough to be queried a lot, but each time it's something like `map.custommode ? map.customwidth : 20` and `map.custommode ? map.customheight : 20` which is not ideal because of copy-pasting. Furthermore, even `map.customwidth` and `map.customheight` are just duplicates of `cl.mapwidth` and `cl.mapheight`, which are only set in `customlevelclass::generatecustomminimap`. This is a bit annoying if you want to, say, add checks that depend on the width and height of the custom map in `mapclass::initcustommapdata`, but `map.customwidth` and `map.customheight` are out of date because `generatecustomminimap` hasn't been called yet. And doing the ternary there requires a `#ifndef NO_CUSTOM_LEVELS` to reference `cl.mapwidth` and `cl.mapheight` which is just awful. So I'm axing `map.customwidth` and `map.customheight`, and I'm axing all the ternaries that are duplicating the source of truth in `MapRenderData`. Instead, there will just be one function to call for the width and height, `mapclass::getwidth` and `mapclass::getheight`, and everyone can simply call those without needing to do ternaries or duplication.
2022-11-30 22:35:14 +01:00
for (int i = 0; i < map.getwidth(); i++)
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
{
if (!map.isexplored(i, j))
{
// Draw the fog, depending on the custom zoom size
Deduplicate map render data calcuations
2022-11-30 17:37:41 +01:00
for (int x = 0; x < data.zoom; x++)
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
{
Deduplicate map render data calcuations
2022-11-30 17:37:41 +01:00
for (int y = 0; y < data.zoom; y++)
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
{
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.drawimage(IMAGE_COVERED, data.xoff + 40 + (x * 12) + (i * (12 * data.zoom)), data.yoff + 21 + (y * 9) + (j * (9 * data.zoom)), false);
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
}
}
}
}
}
}
Apply suggestions from code review Co-authored-by: Misa Elizabeth Kai <infoteddy@infoteddy.info>
2022-11-30 17:10:27 +01:00
static void rendermaplegend(void)
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
{
// Draw the map legend, aka teleports/targets/trinkets
Apply suggestions from code review Co-authored-by: Misa Elizabeth Kai <infoteddy@infoteddy.info>
2022-11-30 19:31:36 +01:00
const MapRenderData data = getmaprenderdata();
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
Apply suggestions from code review Co-authored-by: Misa Elizabeth Kai <infoteddy@infoteddy.info>
2022-11-30 17:10:27 +01:00
const int tile_offset = graphics.flipmode ? 3 : 0;
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
for (size_t i = 0; i < map.teleporters.size(); i++)
{
if (map.showteleporters && map.isexplored(map.teleporters[i].x, map.teleporters[i].y))
{
Deduplicate map render data calcuations
2022-11-30 17:37:41 +01:00
graphics.drawtile(data.legendxoff + (map.teleporters[i].x * 12 * data.zoom), data.legendyoff + (map.teleporters[i].y * 9 * data.zoom), 1127 + tile_offset);
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
}
else if (map.showtargets && !map.isexplored(map.teleporters[i].x, map.teleporters[i].y))
{
Deduplicate map render data calcuations
2022-11-30 17:37:41 +01:00
graphics.drawtile(data.legendxoff + (map.teleporters[i].x * 12 * data.zoom), data.legendyoff + (map.teleporters[i].y * 9 * data.zoom), 1126 + tile_offset);
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
}
}
if (map.showtrinkets)
{
for (size_t i = 0; i < map.shinytrinkets.size(); i++)
{
if (!obj.collect[i])
{
Deduplicate map render data calcuations
2022-11-30 17:37:41 +01:00
graphics.drawtile(data.legendxoff + (map.shinytrinkets[i].x * 12 * data.zoom), data.legendyoff + (map.shinytrinkets[i].y * 9 * data.zoom), 1086 + tile_offset);
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
}
}
}
}
Apply suggestions from code review Co-authored-by: Misa Elizabeth Kai <infoteddy@infoteddy.info>
2022-11-30 17:10:27 +01:00
static void rendermapcursor(const bool flashing)
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
{
Apply suggestions from code review Co-authored-by: Misa Elizabeth Kai <infoteddy@infoteddy.info>
2022-11-30 19:31:36 +01:00
const MapRenderData data = getmaprenderdata();
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
if (!map.custommode && game.roomx == 109)
{
// Draw the tower specially
Disable more flashing elements if a11y is on For some reason, the accessibility option that was meant to disable flashes doesn't disable ALL flashes, only screen flashes and screen shaking. This commit disables a lot more, most importantly randomness in colors, the player flashing on death/respawn, and teleporters flashing.
2023-04-06 01:45:40 +02:00
if (!flashing || game.noflashingmode)
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
{
graphics.drawrect(40 + ((game.roomx - 100) * 12) + 2, 21 + 2, 12 - 4, 180 - 4, 16, 245 - (help.glow * 2), 245 - (help.glow * 2));
}
else if (map.cursorstate == 1)
{
if (int(map.cursordelay / 4) % 2 == 0)
{
graphics.drawrect(40 + ((game.roomx - 100) * 12), 21, 12, 180, 255, 255, 255);
graphics.drawrect(40 + ((game.roomx - 100) * 12) + 2, 21 + 2, 12 - 4, 180 - 4, 255, 255, 255);
}
}
else if (map.cursorstate == 2 && (int(map.cursordelay / 15) % 2 == 0))
{
graphics.drawrect(40 + ((game.roomx - 100) * 12) + 2, 21 + 2, 12 - 4, 180 - 4, 16, 245 - (help.glow), 245 - (help.glow));
}
return;
}
Disable more flashing elements if a11y is on For some reason, the accessibility option that was meant to disable flashes doesn't disable ALL flashes, only screen flashes and screen shaking. This commit disables a lot more, most importantly randomness in colors, the player flashing on death/respawn, and teleporters flashing.
2023-04-06 01:45:40 +02:00
if (!flashing || ((map.cursorstate == 2 && int(map.cursordelay / 15) % 2 == 0) || game.noflashingmode))
dedupe another piece of code
2022-11-07 02:03:33 +01:00
{
Deduplicate map render data calcuations
2022-11-30 17:37:41 +01:00
graphics.drawrect(40 + ((game.roomx - 100) * 12 * data.zoom) + 2 + data.xoff, 21 + ((game.roomy - 100) * 9 * data.zoom) + 2 + data.yoff, (12 * data.zoom) - 4, (9 * data.zoom) - 4, 16, 245 - (help.glow), 245 - (help.glow));
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
}
Disable more flashing elements if a11y is on For some reason, the accessibility option that was meant to disable flashes doesn't disable ALL flashes, only screen flashes and screen shaking. This commit disables a lot more, most importantly randomness in colors, the player flashing on death/respawn, and teleporters flashing.
2023-04-06 01:45:40 +02:00
else if (map.cursorstate == 1 && int(map.cursordelay / 4) % 2 == 0)
dedupe another piece of code
2022-11-07 02:03:33 +01:00
{
Deduplicate map render data calcuations
2022-11-30 17:37:41 +01:00
graphics.drawrect(40 + ((game.roomx - 100) * 12 * data.zoom) + data.xoff, 21 + ((game.roomy - 100) * 9 * data.zoom) + data.yoff, 12 * data.zoom, 9 * data.zoom, 255, 255, 255);
graphics.drawrect(40 + ((game.roomx - 100) * 12 * data.zoom) + 2 + data.xoff, 21 + ((game.roomy - 100) * 9 * data.zoom) + 2 + data.yoff, (12 * data.zoom) - 4, (9 * data.zoom) - 4, 255, 255, 255);
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
}
}
Unify drawing room name on map menus into one function Previously, it was copy-pasted and slightly different, when really, they ought to both be the exact same code. It kind of pains me that the room name, glitch name, and hidden name don't own their own memory, but, that's to be addressed later. What's a bit annoying is that the `temp` variable used in `teleporterrender` also ends up being reused later in the function. In this case, I opted to just redeclare them when they are used anyway, to make it clearer. Apart from `teleporterrender` no longer calling `map.area` or caring about `map.custommode`, it also no longer cares about `graphics.fademode` being 0. I could never actually get this condition to be false in practice, and I have absolutely no idea why it's there. I'm guessing it could be some weird edge case rendering issue if the screen is fully black? But I wouldn't know how to trigger that, and anyway it should probably be fixed elsewhere. So I'm just going to remove that conditional.
2022-04-25 09:53:13 +02:00
void maprender(void)
{
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.set_render_target(graphics.menuTexture);
graphics.clear();
Unify drawing room name on map menus into one function Previously, it was copy-pasted and slightly different, when really, they ought to both be the exact same code. It kind of pains me that the room name, glitch name, and hidden name don't own their own memory, but, that's to be addressed later. What's a bit annoying is that the `temp` variable used in `teleporterrender` also ends up being reused later in the function. In this case, I opted to just redeclare them when they are used anyway, to make it clearer. Apart from `teleporterrender` no longer calling `map.area` or caring about `map.custommode`, it also no longer cares about `graphics.fademode` being 0. I could never actually get this condition to be false in practice, and I have absolutely no idea why it's there. I'm guessing it could be some weird edge case rendering issue if the screen is fully black? But I wouldn't know how to trigger that, and anyway it should probably be fixed elsewhere. So I'm just going to remove that conditional.
2022-04-25 09:53:13 +02:00
draw_roomname_menu();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//Background color
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.fill_rect(0, 12, 320, 240, 10, 24, 26 );
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//Menubar:
Print activity zone text in correct font, remove Graphics::drawtextbox Activity zones need to be in the interface font if the message is from the system (like Press ENTER to activate terminal, which may be in a different language) and in the level font if it's a customized message (setactivitytext). Graphics::drawtextbox was counting the textbox width and height in 8x8 characters, even including the borders as characters, so it'd need to be told what the font for the textbox is, and then probably only the height needs to be adapted to the font and not the width because that's adapted to the screen width... So just call Graphics::drawpixeltextbox directly instead. It was already weird enough how actual cutscene textboxes called Graphics::drawtextbox with x/8, y/8 before the previous commit, (when you already have the pixel width and height!) only to have that be a wrapper for drawpixeltextbox by doing x*8, y*8.
2023-01-13 20:32:05 +01:00
graphics.drawpixeltextbox( -10, 212, 43*8, 16 + font::height(PR_FONT_INTERFACE), 65, 185, 207);
De-duplicate menu tab rendering Previously, the code to print all tab names was copied to every single tab, resulting in 12 more superfluous print statements than needed. This commit uses graphics.map_tab to de-duplicate all the code.
2020-06-21 03:47:25 +02:00
Remove accidental comment change
2022-11-25 22:32:16 +01:00
// Draw the selected page name at the bottom
De-duplicate menu tab rendering Previously, the code to print all tab names was copied to every single tab, resulting in 12 more superfluous print statements than needed. This commit uses graphics.map_tab to de-duplicate all the code.
2020-06-21 03:47:25 +02:00
// menupage 0 - 3 is the pause screen
Visually remove all other tabs in SAVE-only enter screen This commit does this: > Yeah, it'd be better if all the other options were gone, and "[SAVE]" > would be re-centered in the middle of the screen.
2020-11-16 03:12:28 +01:00
if (script.running && game.menupage == 3)
{
// While in a cutscene, you can only save
Render.cpp: make maprender translatable This mainly adds loc::gettext calls. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-31 01:48:27 +01:00
char buffer[SCREEN_WIDTH_CHARS + 1];
vformat_buf(buffer, sizeof(buffer), loc::get_langmeta()->menu_select_tight.c_str(), "label:str", loc::gettext("SAVE"));
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN | PR_CJK_LOW, -1, 220, buffer, 196, 196, 255 - help.glow);
Visually remove all other tabs in SAVE-only enter screen This commit does this: > Yeah, it'd be better if all the other options were gone, and "[SAVE]" > would be re-centered in the middle of the screen.
2020-11-16 03:12:28 +01:00
}
else if (game.menupage <= 3)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Render.cpp: make maprender translatable This mainly adds loc::gettext calls. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-31 01:48:27 +01:00
const char* tab1;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if (game.insecretlab)
{
Render.cpp: make maprender translatable This mainly adds loc::gettext calls. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-31 01:48:27 +01:00
tab1 = loc::gettext("GRAV");
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Declare obj.flags a vector of bools instead of ints It's treated like a bool anyway, so might as well make it one. This also necessitates updating every single instance where it or an element inside it is used, too.
2020-04-09 08:34:26 +02:00
else if (obj.flags[67] && !map.custommode)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Render.cpp: make maprender translatable This mainly adds loc::gettext calls. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-31 01:48:27 +01:00
tab1 = loc::gettext("SHIP");
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Render.cpp: make maprender translatable This mainly adds loc::gettext calls. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-31 01:48:27 +01:00
tab1 = loc::gettext("CREW");
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
De-duplicate menu tab rendering Previously, the code to print all tab names was copied to every single tab, resulting in 12 more superfluous print statements than needed. This commit uses graphics.map_tab to de-duplicate all the code.
2020-06-21 03:47:25 +02:00
#define TAB(opt, text) graphics.map_tab(opt, text, game.menupage == opt)
Render.cpp: make maprender translatable This mainly adds loc::gettext calls. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-31 01:48:27 +01:00
TAB(0, loc::gettext("MAP"));
De-duplicate menu tab rendering Previously, the code to print all tab names was copied to every single tab, resulting in 12 more superfluous print statements than needed. This commit uses graphics.map_tab to de-duplicate all the code.
2020-06-21 03:47:25 +02:00
TAB(1, tab1);
Render.cpp: make maprender translatable This mainly adds loc::gettext calls. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-31 01:48:27 +01:00
TAB(2, loc::gettext("STATS"));
TAB(3, loc::gettext("SAVE"));
De-duplicate menu tab rendering Previously, the code to print all tab names was copied to every single tab, resulting in 12 more superfluous print statements than needed. This commit uses graphics.map_tab to de-duplicate all the code.
2020-06-21 03:47:25 +02:00
#undef TAB
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Add start of better Esc menu It's not functional yet, but here are the options: return to game quit to menu graphic options game options
2020-06-23 00:24:18 +02:00
// Draw menu header
switch (game.menupage)
{
case 30:
case 31:
case 32:
case 33:
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN | PR_CJK_LOW, -1, 220, loc::gettext("[ PAUSE ]"), 196, 196, 255 - help.glow);
Add start of better Esc menu It's not functional yet, but here are the options: return to game quit to menu graphic options game options
2020-06-23 00:24:18 +02:00
}
// Draw menu options
if (game.menupage >= 30 && game.menupage <= 33)
{
#define OPTION(opt, text) graphics.map_option(opt, 4, text, game.menupage - 30 == opt)
Render.cpp: make maprender translatable This mainly adds loc::gettext calls. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-31 01:48:27 +01:00
OPTION(0, loc::gettext("return to game"));
OPTION(1, loc::gettext("options"));
OPTION(2, loc::gettext("quit to menu"));
Add start of better Esc menu It's not functional yet, but here are the options: return to game quit to menu graphic options game options
2020-06-23 00:24:18 +02:00
#undef OPTION
}
De-duplicate menu tab rendering Previously, the code to print all tab names was copied to every single tab, resulting in 12 more superfluous print statements than needed. This commit uses graphics.map_tab to de-duplicate all the code.
2020-06-21 03:47:25 +02:00
// Draw the actual menu
switch(game.menupage)
{
case 0:
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
rendermap();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if (map.finalmode || (map.custommode&&!map.customshowmm))
{
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
// Cover the whole map
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
for (int j = 0; j < 20; j++)
{
for (int i = 0; i < 20; i++)
{
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.drawimage(IMAGE_COVERED, 40 + (i * 12), 21 + (j * 9), false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
Completely remove Graphics::bprint Only three deprecated functions remain: - Graphics::Print - Graphics::PrintWrap - Graphics::bigprint I also fixed multiline transparent textboxes having their outlines overlap the text itself, and fixed textboxclass::padtowidth assuming glyph widths of 8 (it made the hints at the start of intermission 1 run offscreen for example)
2023-01-17 22:18:39 +01:00
font::print(PR_CEN | PR_BOR, -1, 105, loc::gettext("NO SIGNAL"), 245, 245, 245);
Apply suggestions from code review Co-authored-by: Misa Elizabeth Kai <infoteddy@infoteddy.info>
2022-11-30 17:10:27 +01:00
}
else
{
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
rendermapfog();
rendermapcursor(true);
rendermaplegend();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
break;
case 1:
if (game.insecretlab)
{
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
if (graphics.flipmode)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 174, loc::gettext("SUPER GRAVITRON HIGHSCORE"), 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Move tempstring off of Graphics, Game, and UtilityClass Unlike, say, the scriptclass i/j/k stuff, these tempstrings are only purely visual, and there's no known glitches to manipulate them anyway. Thus I think it's safe to make this cleanup.
2020-04-03 00:05:41 +02:00
std::string tempstring = help.timestring(game.swnrecord);
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN, -1, 124, loc::gettext("Best Time"), 196, 196, 255 - help.glow);
Completely remove Graphics::bigbprint, bigrprint and bigbrprint I migrated all of them to font::print, so they can now be removed. Six deprecated print functions left! (Of which some are used a whole lot, it's simpler if the lesser-used ones are gone first.)
2023-01-17 05:19:17 +01:00
font::print(PR_2X | PR_CEN, -1, 102, tempstring, 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
switch(game.swnbestrank)
{
case 0:
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print_wrap(PR_CEN, -1, 40, loc::gettext("Next Trophy at 5 seconds"), 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 1:
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print_wrap(PR_CEN, -1, 40, loc::gettext("Next Trophy at 10 seconds"), 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 2:
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print_wrap(PR_CEN, -1, 40, loc::gettext("Next Trophy at 15 seconds"), 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 3:
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print_wrap(PR_CEN, -1, 40, loc::gettext("Next Trophy at 20 seconds"), 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 4:
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print_wrap(PR_CEN, -1, 40, loc::gettext("Next Trophy at 30 seconds"), 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 5:
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print_wrap(PR_CEN, -1, 40, loc::gettext("Next Trophy at 1 minute"), 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 6:
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print_wrap(PR_CEN, -1, 40, loc::gettext("All Trophies collected!"), 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
}
}
else
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 40, loc::gettext("SUPER GRAVITRON HIGHSCORE"), 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Move tempstring off of Graphics, Game, and UtilityClass Unlike, say, the scriptclass i/j/k stuff, these tempstrings are only purely visual, and there's no known glitches to manipulate them anyway. Thus I think it's safe to make this cleanup.
2020-04-03 00:05:41 +02:00
std::string tempstring = help.timestring(game.swnrecord);
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN, -1, 90, loc::gettext("Best Time"), 196, 196, 255 - help.glow);
Completely remove Graphics::bigbprint, bigrprint and bigbrprint I migrated all of them to font::print, so they can now be removed. Six deprecated print functions left! (Of which some are used a whole lot, it's simpler if the lesser-used ones are gone first.)
2023-01-17 05:19:17 +01:00
font::print(PR_2X | PR_CEN, -1, 104, tempstring, 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
switch(game.swnbestrank)
{
case 0:
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print_wrap(PR_CEN, -1, 174, loc::gettext("Next Trophy at 5 seconds"), 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 1:
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print_wrap(PR_CEN, -1, 174, loc::gettext("Next Trophy at 10 seconds"), 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 2:
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print_wrap(PR_CEN, -1, 174, loc::gettext("Next Trophy at 15 seconds"), 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 3:
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print_wrap(PR_CEN, -1, 174, loc::gettext("Next Trophy at 20 seconds"), 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 4:
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print_wrap(PR_CEN, -1, 174, loc::gettext("Next Trophy at 30 seconds"), 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 5:
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print_wrap(PR_CEN, -1, 174, loc::gettext("Next Trophy at 1 minute"), 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 6:
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print_wrap(PR_CEN, -1, 174, loc::gettext("All Trophies collected!"), 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
}
}
}
Declare obj.flags a vector of bools instead of ints It's treated like a bool anyway, so might as well make it one. This also necessitates updating every single instance where it or an element inside it is used, too.
2020-04-09 08:34:26 +02:00
else if (obj.flags[67] && !map.custommode)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Replace ACTION in texts by {button} placeholders Gamepads and the Steam Deck need "ACTION" to be replaced by a controller glyph, so that's now possible.
2023-03-18 22:32:26 +01:00
char buffer[SCREEN_WIDTH_CHARS + 1];
vformat_buf(
buffer, sizeof(buffer),
loc::gettext("Press {button} to warp to the ship."),
"button:but",
vformat_button(ActionSet_InGame, Action_InGame_ACTION)
);
font::print_wrap(PR_CEN, -1, 105, buffer, 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Fix mixed indentation in titlerender.cpp There's a lot, looks like mainly because of the person who added MMMMMM and M&P.
2020-04-02 23:19:15 +02:00
#if !defined(NO_CUSTOM_LEVELS)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
else if(map.custommode){
Move all editor-specific attributes to a new editorclass This is a pretty hefty commit! But essentially, I made a new editorclass object, and moved all functions and variables that only get used in the in-game level editor to that class. This cleanly demarcates which things are in the editor and which things are just general custom level stuff. Then I fixed up all the callers. I also fixed up some NO_CUSTOM_LEVELS and NO_EDITOR ifdefs, too, in several places.
2021-02-21 00:40:11 +01:00
LevelMetaData& meta = cl.ListOfMetaData[game.playcustomlevel];
De-duplicate 'ed.ListOfMetaData[game.playcustomlevel]' Whoa, that's a long identifier! Better to replace it with something short, like 'meta', to save on typing and improve readability.
2020-06-21 04:27:32 +02:00
Improve level metadata display and font handling - If the level font is higher than 10 pixels, the third description line (Desc3) is disabled and unavailable. CJK languages require less characters to convey the same message (140 characters caused people to cram tweets in all languages except CJK) and this gives us enough room in the levels list without having to cram the metadata even more than it already was or showing less levels per page. - The "Untitled Level" and "by Unknown" now selectively show up in the interface font instead of the level font.
2023-01-19 20:15:17 +01:00
uint32_t title_flags = meta.title_is_gettext ? PR_FONT_INTERFACE : PR_FONT_LEVEL;
uint32_t creator_flags = meta.creator_is_gettext ? PR_FONT_INTERFACE : PR_FONT_LEVEL;
font::print(title_flags | PR_2X | PR_CEN, -1, FLIP(45, 8), meta.title, 196, 196, 255 - help.glow);
int sp = SDL_max(10, font::height(PR_FONT_LEVEL));
Replace "by" for level authors with happy face "by {author}" is a string that will cause a lot of localization-related problems, which then become much worse when different languages and levels can also need different fonts: - If the author name is set to something in English instead of a name, then it'll come out a bit weird if your VVVVVV is set to a different language: "de various people", "por various people", etc. It's the same problem with Discord bots completing "playing" or "watching" in their statuses. - Translators can't always fit "by" in two letters, and level creators have understandably always assumed, and will continue to assume, that "by" is two letters. So if you have your VVVVVV set to a language that translates "by" as something long, then: | by Various People and Others | ...may suddenly show up as something like: |thorer Various People and Othe| - "by" and author may need mutually incompatible fonts. For example, a Japanese level in a Korean VVVVVV needs to be displayed with "by" in Korean characters and the author name with Japanese characters, which would need some very special code since languages may want to add text both before and after the name. - It's very possible that some languages can't translate "by" without knowing the gender of the name, and I know some languages even inflect names in really interesting ways (adding and even replacing letters in first names, surnames, and anything in between, depending on gender and what else is in the sentence). So to solve all of this, the "by" is now replaced by a 10x10 face from sprites.png, like a :viridian: emote. See it as a kind of avatar next to a username, to clarify and assert that this line is for the author's name. It should be a fairly obvious/recognizable icon, it fixes all the above problems, and it's a bonus that we now have more happy faces in VVVVVV.
2023-01-31 00:41:46 +01:00
graphics.print_level_creator(creator_flags, FLIP(70, 8), meta.creator, 196, 196, 255 - help.glow);
Improve level metadata display and font handling - If the level font is higher than 10 pixels, the third description line (Desc3) is disabled and unavailable. CJK languages require less characters to convey the same message (140 characters caused people to cram tweets in all languages except CJK) and this gives us enough room in the levels list without having to cram the metadata even more than it already was or showing less levels per page. - The "Untitled Level" and "by Unknown" now selectively show up in the interface font instead of the level font.
2023-01-19 20:15:17 +01:00
font::print(PR_FONT_LEVEL | PR_CEN, -1, FLIP(70+sp, 8), meta.website, 196, 196, 255 - help.glow);
font::print(PR_FONT_LEVEL | PR_CEN, -1, FLIP(70+sp*3, 8), meta.Desc1, 196, 196, 255 - help.glow);
font::print(PR_FONT_LEVEL | PR_CEN, -1, FLIP(70+sp*4, 8), meta.Desc2, 196, 196, 255 - help.glow);
if (sp <= 10)
{
font::print(PR_FONT_LEVEL | PR_CEN, -1, FLIP(70+sp*5, 8), meta.Desc3, 196, 196, 255 - help.glow);
}
De-duplicate Flip Mode code for custom levels' CREW page Instead of copy-pasting everything and changing a few parts, just have something that handles that tiny part. This reduces the amount of code size the custom level CREW page takes up by half.
2020-06-21 04:14:40 +02:00
Move all editor-specific attributes to a new editorclass This is a pretty hefty commit! But essentially, I made a new editorclass object, and moved all functions and variables that only get used in the in-game level editor to that class. This cleanly demarcates which things are in the editor and which things are just general custom level stuff. Then I fixed up all the callers. I also fixed up some NO_CUSTOM_LEVELS and NO_EDITOR ifdefs, too, in several places.
2021-02-21 00:40:11 +01:00
int remaining = cl.numcrewmates() - game.crewmates();
De-duplicate 'ed.numcrewmates() - game.crewmates()' Any decent compiler will optimize this so that it's still only two function calls (or it gets inlined). However, it's still not very readable, so I've assigned the result to a variable and used that instead.
2020-06-21 04:29:50 +02:00
Replace "by" for level authors with happy face "by {author}" is a string that will cause a lot of localization-related problems, which then become much worse when different languages and levels can also need different fonts: - If the author name is set to something in English instead of a name, then it'll come out a bit weird if your VVVVVV is set to a different language: "de various people", "por various people", etc. It's the same problem with Discord bots completing "playing" or "watching" in their statuses. - Translators can't always fit "by" in two letters, and level creators have understandably always assumed, and will continue to assume, that "by" is two letters. So if you have your VVVVVV set to a language that translates "by" as something long, then: | by Various People and Others | ...may suddenly show up as something like: |thorer Various People and Othe| - "by" and author may need mutually incompatible fonts. For example, a Japanese level in a Korean VVVVVV needs to be displayed with "by" in Korean characters and the author name with Japanese characters, which would need some very special code since languages may want to add text both before and after the name. - It's very possible that some languages can't translate "by" without knowing the gender of the name, and I know some languages even inflect names in really interesting ways (adding and even replacing letters in first names, surnames, and anything in between, depending on gender and what else is in the sentence). So to solve all of this, the "by" is now replaced by a 10x10 face from sprites.png, like a :viridian: emote. See it as a kind of avatar next to a username, to clarify and assert that this line is for the author's name. It should be a fairly obvious/recognizable icon, it fixes all the above problems, and it's a bonus that we now have more happy faces in VVVVVV.
2023-01-31 00:41:46 +01:00
char buffer[SCREEN_WIDTH_CHARS + 1];
Render.cpp: make maprender translatable This mainly adds loc::gettext calls. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-31 01:48:27 +01:00
loc::gettext_plural_fill(
buffer, sizeof(buffer),
"{n_crew|wordy} crewmates remain",
"{n_crew|wordy} crewmate remains",
"n_crew:int",
remaining
);
Completely remove Graphics::bigprint The last two deprecated functions are: - Graphics::Print - Graphics::PrintWrap These are used a lot, but they're relatively easy to replace, since the only flag I probably have to immediately worry about is PR_CEN. I do often need to add PR_FONT_* flags but I don't need to add any PR_2X/PR_3X/PR_4X anymore.
2023-01-18 23:04:47 +01:00
font::print(PR_CEN, -1, FLIP(165, 8), buffer, 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Fix mixed indentation in titlerender.cpp There's a lot, looks like mainly because of the person who added MMMMMM and M&P.
2020-04-02 23:19:15 +02:00
#endif
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
else
{
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
if (graphics.flipmode)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
for (int i = 0; i < 3; i++)
{
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
graphics.drawcrewman(16, 32 + (i * 64), 2-i, game.crewstats[2-i]);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if (game.crewstats[(2-i)])
{
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
graphics.printcrewname(44, 32 + (i * 64)+4+10, 2-i);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
graphics.printcrewnamedark(44, 32 + (i * 64)+4+10, 2-i);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Add support for string cases in strings.xml (gendered Rescued/Missing) I wanted to not complicate the system with different string cases (like cgettext) if possible, and I have been able to keep the main strings a simple English=Translation mapping thus far, but apparently strings like "Rescued!" (which are one string in English), have to be translated for the correct gender in some languages. So this was a good time to add support for string cases anyway. It's a number that can be given to a string to specify the specific case it's used, to disambiguate identical English keys. In the case of "Rescued!" and "Missing...", male versions of the string are case 1, female versions are case 2, and Viridian being missing is case 3. Of course, if a language doesn't need to use different variants, it can simply fill in the same string for the different cases. If any other string needs to switch to different cases: distinguish them in the English strings.xml with the case="N" attribute (N=1 and higher), sync language files from the translator menu (existing translations for the uncased string will simply be copied to all cases) and change loc::gettext("...") to loc::gettext_case("...", 1), loc::gettext_case("...", 2), etc.
2022-12-01 01:27:30 +01:00
graphics.printcrewnamestatus(44, 32 + (i * 64)+4, 2-i, game.crewstats[(2-i)]);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
graphics.drawcrewman(16+160, 32 + (i * 64), (2-i)+3, game.crewstats[(2-i)+3]);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if (game.crewstats[(2-i)+3])
{
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
graphics.printcrewname(44+160, 32 + (i * 64)+4+10, (2-i)+3);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
graphics.printcrewnamedark(44+160, 32 + (i * 64)+4+10, (2-i)+3);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Add support for string cases in strings.xml (gendered Rescued/Missing) I wanted to not complicate the system with different string cases (like cgettext) if possible, and I have been able to keep the main strings a simple English=Translation mapping thus far, but apparently strings like "Rescued!" (which are one string in English), have to be translated for the correct gender in some languages. So this was a good time to add support for string cases anyway. It's a number that can be given to a string to specify the specific case it's used, to disambiguate identical English keys. In the case of "Rescued!" and "Missing...", male versions of the string are case 1, female versions are case 2, and Viridian being missing is case 3. Of course, if a language doesn't need to use different variants, it can simply fill in the same string for the different cases. If any other string needs to switch to different cases: distinguish them in the English strings.xml with the case="N" attribute (N=1 and higher), sync language files from the translator menu (existing translations for the uncased string will simply be copied to all cases) and change loc::gettext("...") to loc::gettext_case("...", 1), loc::gettext_case("...", 2), etc.
2022-12-01 01:27:30 +01:00
graphics.printcrewnamestatus(44+160, 32 + (i * 64)+4, (2-i)+3, game.crewstats[(2-i)+3]);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
else
{
for (int i = 0; i < 3; i++)
{
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
graphics.drawcrewman(16, 32 + (i * 64), i, game.crewstats[i]);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if (game.crewstats[i])
{
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
graphics.printcrewname(44, 32 + (i * 64)+4, i);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
graphics.printcrewnamedark(44, 32 + (i * 64)+4, i);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Add support for string cases in strings.xml (gendered Rescued/Missing) I wanted to not complicate the system with different string cases (like cgettext) if possible, and I have been able to keep the main strings a simple English=Translation mapping thus far, but apparently strings like "Rescued!" (which are one string in English), have to be translated for the correct gender in some languages. So this was a good time to add support for string cases anyway. It's a number that can be given to a string to specify the specific case it's used, to disambiguate identical English keys. In the case of "Rescued!" and "Missing...", male versions of the string are case 1, female versions are case 2, and Viridian being missing is case 3. Of course, if a language doesn't need to use different variants, it can simply fill in the same string for the different cases. If any other string needs to switch to different cases: distinguish them in the English strings.xml with the case="N" attribute (N=1 and higher), sync language files from the translator menu (existing translations for the uncased string will simply be copied to all cases) and change loc::gettext("...") to loc::gettext_case("...", 1), loc::gettext_case("...", 2), etc.
2022-12-01 01:27:30 +01:00
graphics.printcrewnamestatus(44, 32 + (i * 64)+4+10, i, game.crewstats[i]);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
graphics.drawcrewman(16+160, 32 + (i * 64), i+3, game.crewstats[i+3]);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if (game.crewstats[i+3])
{
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
graphics.printcrewname(44+160, 32 + (i * 64)+4, i+3);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
graphics.printcrewnamedark(44+160, 32 + (i * 64)+4, i+3);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Add support for string cases in strings.xml (gendered Rescued/Missing) I wanted to not complicate the system with different string cases (like cgettext) if possible, and I have been able to keep the main strings a simple English=Translation mapping thus far, but apparently strings like "Rescued!" (which are one string in English), have to be translated for the correct gender in some languages. So this was a good time to add support for string cases anyway. It's a number that can be given to a string to specify the specific case it's used, to disambiguate identical English keys. In the case of "Rescued!" and "Missing...", male versions of the string are case 1, female versions are case 2, and Viridian being missing is case 3. Of course, if a language doesn't need to use different variants, it can simply fill in the same string for the different cases. If any other string needs to switch to different cases: distinguish them in the English strings.xml with the case="N" attribute (N=1 and higher), sync language files from the translator menu (existing translations for the uncased string will simply be copied to all cases) and change loc::gettext("...") to loc::gettext_case("...", 1), loc::gettext_case("...", 2), etc.
2022-12-01 01:27:30 +01:00
graphics.printcrewnamestatus(44+160, 32 + (i * 64)+4+10, i+3, game.crewstats[i+3]);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
break;
case 2:
De-duplicate map menu stats screen rendering code Between accounting for Flip Mode and custom levels, this code was copy-pasted three times, leading to _four_ instances of one code! Anyways, I've cleaned it up. The position of the text in Flip Mode is going to differ by 4 pixels from how it was previously, but that really shouldn't matter.
2021-09-26 02:16:52 +02:00
{
Render.cpp: make maprender translatable This mainly adds loc::gettext calls. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-31 01:48:27 +01:00
int max_trinkets;
De-duplicate map menu stats screen rendering code Between accounting for Flip Mode and custom levels, this code was copy-pasted three times, leading to _four_ instances of one code! Anyways, I've cleaned it up. The position of the text in Flip Mode is going to differ by 4 pixels from how it was previously, but that really shouldn't matter.
2021-09-26 02:16:52 +02:00
#ifndef NO_CUSTOM_LEVELS
if (map.custommode)
Remove map.customtrinkets This variable's sole purpose is to copy ed.numtrinkets, even though ed has always been a name that's been accessible globally. So let's not dupe cope.
2020-04-09 06:56:47 +02:00
{
Render.cpp: make maprender translatable This mainly adds loc::gettext calls. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-31 01:48:27 +01:00
max_trinkets = cl.numtrinkets();
Remove map.customtrinkets This variable's sole purpose is to copy ed.numtrinkets, even though ed has always been a name that's been accessible globally. So let's not dupe cope.
2020-04-09 06:56:47 +02:00
}
else
#endif
{
Render.cpp: make maprender translatable This mainly adds loc::gettext calls. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-31 01:48:27 +01:00
max_trinkets = 20;
De-duplicate map menu stats screen rendering code Between accounting for Flip Mode and custom levels, this code was copy-pasted three times, leading to _four_ instances of one code! Anyways, I've cleaned it up. The position of the text in Flip Mode is going to differ by 4 pixels from how it was previously, but that really shouldn't matter.
2021-09-26 02:16:52 +02:00
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
De-duplicate map menu stats screen rendering code Between accounting for Flip Mode and custom levels, this code was copy-pasted three times, leading to _four_ instances of one code! Anyways, I've cleaned it up. The position of the text in Flip Mode is going to differ by 4 pixels from how it was previously, but that really shouldn't matter.
2021-09-26 02:16:52 +02:00
/* Stats. */
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN | PR_CJK_HIGH, -1, FLIP(52, 8), loc::gettext("[Trinkets found]"), 196, 196, 255 - help.glow);
Render.cpp: make maprender translatable This mainly adds loc::gettext calls. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-31 01:48:27 +01:00
char buffer[SCREEN_WIDTH_CHARS + 1];
vformat_buf(
buffer, sizeof(buffer),
loc::gettext("{n_trinkets|wordy} out of {max_trinkets|wordy}"),
"n_trinkets:int, max_trinkets:int",
game.trinkets(), max_trinkets
);
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN | PR_CJK_LOW, -1, FLIP(64, 8), buffer, 96, 96, 96);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN | PR_CJK_HIGH, -1, FLIP(102, 8), loc::gettext("[Number of Deaths]"), 196, 196, 255 - help.glow);
font::print(PR_CEN | PR_CJK_LOW, -1, FLIP(114, 8), help.String(game.deathcounts), 96, 96, 96);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN | PR_CJK_HIGH, -1, FLIP(152, 8), loc::gettext("[Time Taken]"), 196, 196, 255 - help.glow);
font::print(PR_CEN | PR_CJK_LOW, -1, FLIP(164, 8), game.timestring(), 96, 96, 96);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
De-duplicate map menu stats screen rendering code Between accounting for Flip Mode and custom levels, this code was copy-pasted three times, leading to _four_ instances of one code! Anyways, I've cleaned it up. The position of the text in Flip Mode is going to differ by 4 pixels from how it was previously, but that really shouldn't matter.
2021-09-26 02:16:52 +02:00
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
case 3:
De-duplicate map menu quicksave screen As is typical, the code was copy-pasted to account for Flip Mode, and then copy-pasted again to account for custom levels, leading to four instances of the same code. I clean this up while also improving code style. This is where the new FLIP macro and the fixed PrintWrap help a lot - otherwise the "Game saved ok!" screen would look really wrong without the height corrections.
2021-10-02 06:06:31 +02:00
{
Add level exploring menu for translators I would, of course, recommend translators to translate the roomnames while playing the full game (optionally in invincibility) so they can immediately get all the context and maybe the most inspiration. And if you want to go back into a specific level, then there's always the time trials and intermission replays which will give you full coverage of all the room names. However, the time trials weren't really made for room name translation. They have some annoying features like the instant restart when you press ENTER at the wrong time, they remove context clues like teleporters and companions, but the worst problem is that the last room in a level is often completely untranslatable inside the time trials because you immediately get sent to the results screen... So, I added a new menu in the translator options, "explore game", which gives you access to all the time trials and the two intermissions, from the same menu. All these time trials (which they're still based off of, under the hood) are stripped of the annoying features that come with time trials. These are the changes I made to time trial behavior in translator exploring mode: - No 3-2-1-Go! countdown - No on-screen time/death/shiny/par - ENTER doesn't restart, and the map menu works. The entire map is also revealed. - Prize for the Reckless is in its normal form - The teleporters in Entanglement Generator, Wheeler's Wormhole and Level Complete are restored as context for room names (actually, we should probably restore them in time trials anyway? Their "press to teleport" prompt is already blocked out in time trials and they do nothing other than being a checkpoint. I guess the reason they were removed was to stop people from opening the teleporter menu when that was not specifically blocked out in time trials yet.) - The companions are there at the end of levels, and behave like in no death mode (become happy and follow you to the teleporter). Also for context. - At the end of each level, you're not suddenly sent to the menu, but you can use the teleporter at your leisure just like in the intermission replays. In the Final Level, you do get sent to the menu automatically, but after a longer delay. I made another mark on VVVVVV: don't be startled, I added gamestates. I wanted all teleporters at the end of levels to behave like the ones at the end of the intermission replays, and all handling for teleporting with specific companions is already done in gamestates, so rather than adding conditional blocks across 5 or so different gamestates, it made more sense to make a single gamestate for "teleporting in translator exploring mode" (3090). I also added an alternative to having to use gamestate 3500 or 82 for the end of the final level: 3091-3092. One other thing I want to add to the "explore game" menu: a per-level count of how many room names are left to translate. That shouldn't be too difficult, and I'm planning that for the next commit.
2022-11-26 03:33:17 +01:00
if (game.inintermission || game.translator_exploring)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 115, loc::gettext("Cannot Save in Level Replay"), 146, 146, 180);
De-duplicate map menu quicksave screen As is typical, the code was copy-pasted to account for Flip Mode, and then copy-pasted again to account for custom levels, leading to four instances of the same code. I clean this up while also improving code style. This is where the new FLIP macro and the fixed PrintWrap help a lot - otherwise the "Game saved ok!" screen would look really wrong without the height corrections.
2021-10-02 06:06:31 +02:00
break;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
De-duplicate map menu quicksave screen As is typical, the code was copy-pasted to account for Flip Mode, and then copy-pasted again to account for custom levels, leading to four instances of the same code. I clean this up while also improving code style. This is where the new FLIP macro and the fixed PrintWrap help a lot - otherwise the "Game saved ok!" screen would look really wrong without the height corrections.
2021-10-02 06:06:31 +02:00
if (game.nodeathmode)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 115, loc::gettext("Cannot Save in No Death Mode"), 146, 146, 180);
De-duplicate map menu quicksave screen As is typical, the code was copy-pasted to account for Flip Mode, and then copy-pasted again to account for custom levels, leading to four instances of the same code. I clean this up while also improving code style. This is where the new FLIP macro and the fixed PrintWrap help a lot - otherwise the "Game saved ok!" screen would look really wrong without the height corrections.
2021-10-02 06:06:31 +02:00
break;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
De-duplicate map menu quicksave screen As is typical, the code was copy-pasted to account for Flip Mode, and then copy-pasted again to account for custom levels, leading to four instances of the same code. I clean this up while also improving code style. This is where the new FLIP macro and the fixed PrintWrap help a lot - otherwise the "Game saved ok!" screen would look really wrong without the height corrections.
2021-10-02 06:06:31 +02:00
if (game.intimetrial)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 115, loc::gettext("How'd you get here?"), 146, 146, 180);
De-duplicate map menu quicksave screen As is typical, the code was copy-pasted to account for Flip Mode, and then copy-pasted again to account for custom levels, leading to four instances of the same code. I clean this up while also improving code style. This is where the new FLIP macro and the fixed PrintWrap help a lot - otherwise the "Game saved ok!" screen would look really wrong without the height corrections.
2021-10-02 06:06:31 +02:00
break;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
De-duplicate map menu quicksave screen As is typical, the code was copy-pasted to account for Flip Mode, and then copy-pasted again to account for custom levels, leading to four instances of the same code. I clean this up while also improving code style. This is where the new FLIP macro and the fixed PrintWrap help a lot - otherwise the "Game saved ok!" screen would look really wrong without the height corrections.
2021-10-02 06:06:31 +02:00
if (game.insecretlab)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 115, loc::gettext("Cannot Save in Secret Lab"), 146, 146, 180);
De-duplicate map menu quicksave screen As is typical, the code was copy-pasted to account for Flip Mode, and then copy-pasted again to account for custom levels, leading to four instances of the same code. I clean this up while also improving code style. This is where the new FLIP macro and the fixed PrintWrap help a lot - otherwise the "Game saved ok!" screen would look really wrong without the height corrections.
2021-10-02 06:06:31 +02:00
break;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
De-duplicate map menu quicksave screen As is typical, the code was copy-pasted to account for Flip Mode, and then copy-pasted again to account for custom levels, leading to four instances of the same code. I clean this up while also improving code style. This is where the new FLIP macro and the fixed PrintWrap help a lot - otherwise the "Game saved ok!" screen would look really wrong without the height corrections.
2021-10-02 06:06:31 +02:00
if (game.gamesavefailed)
Add error message if quicksave fails
2020-11-04 03:45:33 +01:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 115, loc::gettext("ERROR: Could not save game!"), 146, 146, 180);
De-duplicate map menu quicksave screen As is typical, the code was copy-pasted to account for Flip Mode, and then copy-pasted again to account for custom levels, leading to four instances of the same code. I clean this up while also improving code style. This is where the new FLIP macro and the fixed PrintWrap help a lot - otherwise the "Game saved ok!" screen would look really wrong without the height corrections.
2021-10-02 06:06:31 +02:00
break;
Add error message if quicksave fails
2020-11-04 03:45:33 +01:00
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
De-duplicate map menu quicksave screen As is typical, the code was copy-pasted to account for Flip Mode, and then copy-pasted again to account for custom levels, leading to four instances of the same code. I clean this up while also improving code style. This is where the new FLIP macro and the fixed PrintWrap help a lot - otherwise the "Game saved ok!" screen would look really wrong without the height corrections.
2021-10-02 06:06:31 +02:00
/* We are not in a special case, so draw the save screen now... */
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
De-duplicate map menu quicksave screen As is typical, the code was copy-pasted to account for Flip Mode, and then copy-pasted again to account for custom levels, leading to four instances of the same code. I clean this up while also improving code style. This is where the new FLIP macro and the fixed PrintWrap help a lot - otherwise the "Game saved ok!" screen would look really wrong without the height corrections.
2021-10-02 06:06:31 +02:00
if (!map.custommode)
{
Render.cpp: make maprender translatable This mainly adds loc::gettext calls. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-31 01:48:27 +01:00
/* FIXME: The text here should be automatically "balance-wrapped" instead of hardcoding the width.
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
* In fact, maybe print_wrap should balance-wrap by default. */
font::print_wrap(PR_CEN, -1, 174, loc::gettext("(Note: The game is autosaved at every teleporter.)"), 146, 146, 180, 12);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
De-duplicate map menu quicksave screen As is typical, the code was copy-pasted to account for Flip Mode, and then copy-pasted again to account for custom levels, leading to four instances of the same code. I clean this up while also improving code style. This is where the new FLIP macro and the fixed PrintWrap help a lot - otherwise the "Game saved ok!" screen would look really wrong without the height corrections.
2021-10-02 06:06:31 +02:00
if (!game.gamesaved)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Replace ACTION in texts by {button} placeholders Gamepads and the Steam Deck need "ACTION" to be replaced by a controller glyph, so that's now possible.
2023-03-18 22:32:26 +01:00
char buffer[SCREEN_WIDTH_CHARS + 1];
vformat_buf(
buffer, sizeof(buffer),
loc::gettext("[Press {button} to save your game]"),
"button:but",
vformat_button(ActionSet_InGame, Action_InGame_ACTION)
);
font::print(PR_CEN, -1, 80, buffer, 255 - help.glow*2, 255 - help.glow*2, 255 - help.glow);
De-duplicate map menu quicksave screen As is typical, the code was copy-pasted to account for Flip Mode, and then copy-pasted again to account for custom levels, leading to four instances of the same code. I clean this up while also improving code style. This is where the new FLIP macro and the fixed PrintWrap help a lot - otherwise the "Game saved ok!" screen would look really wrong without the height corrections.
2021-10-02 06:06:31 +02:00
if (map.custommode || game.quicksummary == "")
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
De-duplicate map menu quicksave screen As is typical, the code was copy-pasted to account for Flip Mode, and then copy-pasted again to account for custom levels, leading to four instances of the same code. I clean this up while also improving code style. This is where the new FLIP macro and the fixed PrintWrap help a lot - otherwise the "Game saved ok!" screen would look really wrong without the height corrections.
2021-10-02 06:06:31 +02:00
break;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN, -1, FLIP(100, 8), loc::gettext("Last Save:"), 164 - help.glow/4, 164 - help.glow/4, 164);
font::print(PR_CEN, -1, FLIP(112, 8), game.quicksummary, 164 - help.glow/4, 164 - help.glow/4, 164);
De-duplicate map menu quicksave screen As is typical, the code was copy-pasted to account for Flip Mode, and then copy-pasted again to account for custom levels, leading to four instances of the same code. I clean this up while also improving code style. This is where the new FLIP macro and the fixed PrintWrap help a lot - otherwise the "Game saved ok!" screen would look really wrong without the height corrections.
2021-10-02 06:06:31 +02:00
break;
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
De-duplicate map menu quicksave screen As is typical, the code was copy-pasted to account for Flip Mode, and then copy-pasted again to account for custom levels, leading to four instances of the same code. I clean this up while also improving code style. This is where the new FLIP macro and the fixed PrintWrap help a lot - otherwise the "Game saved ok!" screen would look really wrong without the height corrections.
2021-10-02 06:06:31 +02:00
/* We are only still here if the game has been quicksaved... */
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 36, loc::gettext("Game saved ok!"), 255 - help.glow/2, 255 - help.glow/2, 255 - help.glow/2);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
De-duplicate map menu quicksave screen As is typical, the code was copy-pasted to account for Flip Mode, and then copy-pasted again to account for custom levels, leading to four instances of the same code. I clean this up while also improving code style. This is where the new FLIP macro and the fixed PrintWrap help a lot - otherwise the "Game saved ok!" screen would look really wrong without the height corrections.
2021-10-02 06:06:31 +02:00
graphics.drawpixeltextbox(17, 65, 286, 90, 65, 185, 207);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
De-duplicate map menu quicksave screen As is typical, the code was copy-pasted to account for Flip Mode, and then copy-pasted again to account for custom levels, leading to four instances of the same code. I clean this up while also improving code style. This is where the new FLIP macro and the fixed PrintWrap help a lot - otherwise the "Game saved ok!" screen would look really wrong without the height corrections.
2021-10-02 06:06:31 +02:00
if (map.custommode)
{
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN | PR_FONT_LEVEL, -1, FLIP(90, 8), game.customleveltitle, 25, 255 - help.glow/2, 255 - help.glow/2);
De-duplicate map menu quicksave screen As is typical, the code was copy-pasted to account for Flip Mode, and then copy-pasted again to account for custom levels, leading to four instances of the same code. I clean this up while also improving code style. This is where the new FLIP macro and the fixed PrintWrap help a lot - otherwise the "Game saved ok!" screen would look really wrong without the height corrections.
2021-10-02 06:06:31 +02:00
}
else
{
size_t i;
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN, -1, FLIP(80, 8), game.savearea, 25, 255 - help.glow/2, 255 - help.glow/2);
De-duplicate map menu quicksave screen As is typical, the code was copy-pasted to account for Flip Mode, and then copy-pasted again to account for custom levels, leading to four instances of the same code. I clean this up while also improving code style. This is where the new FLIP macro and the fixed PrintWrap help a lot - otherwise the "Game saved ok!" screen would look really wrong without the height corrections.
2021-10-02 06:06:31 +02:00
for (i = 0; i < SDL_arraysize(game.crewstats); ++i)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
De-duplicate map menu quicksave screen As is typical, the code was copy-pasted to account for Flip Mode, and then copy-pasted again to account for custom levels, leading to four instances of the same code. I clean this up while also improving code style. This is where the new FLIP macro and the fixed PrintWrap help a lot - otherwise the "Game saved ok!" screen would look really wrong without the height corrections.
2021-10-02 06:06:31 +02:00
/* Crewmates are annoying. Their height is 21 pixels, but to flip them,
* we also have to account for their 2-pixel y-offset (and multiply it by 2). */
graphics.drawcrewman(169 - 3*42 + i*42, FLIP(95, 21 + 2*2), i, game.crewstats[i], true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
De-duplicate map menu quicksave screen As is typical, the code was copy-pasted to account for Flip Mode, and then copy-pasted again to account for custom levels, leading to four instances of the same code. I clean this up while also improving code style. This is where the new FLIP macro and the fixed PrintWrap help a lot - otherwise the "Game saved ok!" screen would look really wrong without the height corrections.
2021-10-02 06:06:31 +02:00
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(0, 59, FLIP(132, 8), game.savetime, 255 - help.glow/2, 255 - help.glow/2, 255 - help.glow/2);
Render.cpp: make maprender translatable This mainly adds loc::gettext calls. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-31 01:48:27 +01:00
char buffer[SCREEN_WIDTH_CHARS + 1];
vformat_buf(buffer, sizeof(buffer),
loc::gettext("{savebox_n_trinkets|wordy}"),
"savebox_n_trinkets:int",
game.savetrinkets
);
Completely remove Graphics::len I migrated all graphics.len calls over to font::len (and also migrated prints mainly surrounding those graphics.len's) so the old len function is now completely removed.
2023-01-17 04:41:12 +01:00
font::print(PR_RIGHT, 262, FLIP(132, 8), buffer, 255 - help.glow/2, 255 - help.glow/2, 255 - help.glow/2);
De-duplicate map menu quicksave screen As is typical, the code was copy-pasted to account for Flip Mode, and then copy-pasted again to account for custom levels, leading to four instances of the same code. I clean this up while also improving code style. This is where the new FLIP macro and the fixed PrintWrap help a lot - otherwise the "Game saved ok!" screen would look really wrong without the height corrections.
2021-10-02 06:06:31 +02:00
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.draw_sprite(34, FLIP(126, 17), 50, graphics.col_clock);
graphics.draw_sprite(270, FLIP(126, 17), 22, graphics.col_trinket);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
De-duplicate map menu quicksave screen As is typical, the code was copy-pasted to account for Flip Mode, and then copy-pasted again to account for custom levels, leading to four instances of the same code. I clean this up while also improving code style. This is where the new FLIP macro and the fixed PrintWrap help a lot - otherwise the "Game saved ok!" screen would look really wrong without the height corrections.
2021-10-02 06:06:31 +02:00
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
case 10:
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN | PR_CJK_LOW, -1, 220, loc::gettext("[ QUIT ]"), 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
if (graphics.flipmode)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Use game.inspecial() for special mode checks in maprender() This basically adds an extra '|| game.inintermission' because it seems like the original code forgot about that conditional. You can't save in level replays, so there's no need to say "You will lose any unsaved progress." in intermission replays.
2020-06-22 23:40:12 +02:00
if (game.inspecial())
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 135, loc::gettext("Return to main menu?"), 196, 196, 255 - help.glow, 12);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 142, loc::gettext("Do you want to quit? You will lose any unsaved progress."), 196, 196, 255 - help.glow, 12);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(0, 80-16, 88, loc::gettext("[ NO, KEEP PLAYING ]"), 196, 196, 255 - help.glow);
font::print(0, 80 + 32, 76, loc::gettext("yes, quit to menu"), 96, 96, 96);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Use game.inspecial() for special mode checks in maprender() This basically adds an extra '|| game.inintermission' because it seems like the original code forgot about that conditional. You can't save in level replays, so there's no need to say "You will lose any unsaved progress." in intermission replays.
2020-06-22 23:40:12 +02:00
if (game.inspecial())
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 80, loc::gettext("Return to main menu?"), 196, 196, 255 - help.glow, 12);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 76, loc::gettext("Do you want to quit? You will lose any unsaved progress."), 196, 196, 255 - help.glow, 12);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(0, 80-16, 130, loc::gettext("[ NO, KEEP PLAYING ]"), 196, 196, 255 - help.glow);
font::print(0, 80 + 32, 142, loc::gettext("yes, quit to menu"), 96, 96, 96);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
break;
case 11:
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN | PR_CJK_LOW, -1, 220, loc::gettext("[ QUIT ]"), 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
if (graphics.flipmode)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Use game.inspecial() for special mode checks in maprender() This basically adds an extra '|| game.inintermission' because it seems like the original code forgot about that conditional. You can't save in level replays, so there's no need to say "You will lose any unsaved progress." in intermission replays.
2020-06-22 23:40:12 +02:00
if (game.inspecial())
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 135, loc::gettext("Return to main menu?"), 196, 196, 255 - help.glow, 12);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 142, loc::gettext("Do you want to quit? You will lose any unsaved progress."), 196, 196, 255 - help.glow, 12);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(0, 80, 88, loc::gettext("no, keep playing"), 96,96,96);
font::print(0, 80+32-16, 76, loc::gettext("[ YES, QUIT TO MENU ]"), 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Use game.inspecial() for special mode checks in maprender() This basically adds an extra '|| game.inintermission' because it seems like the original code forgot about that conditional. You can't save in level replays, so there's no need to say "You will lose any unsaved progress." in intermission replays.
2020-06-22 23:40:12 +02:00
if (game.inspecial())
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 80, loc::gettext("Return to main menu?"), 196, 196, 255 - help.glow, 12);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 76, loc::gettext("Do you want to quit? You will lose any unsaved progress."), 196, 196, 255 - help.glow, 12);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(0, 80, 130, loc::gettext("no, keep playing"), 96,96,96);
font::print(0, 80+32-16, 142, loc::gettext("[ YES, QUIT TO MENU ]"), 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
break;
case 20:
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN | PR_CJK_LOW, -1, 220, loc::gettext("[ GRAVITRON ]"), 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
if (graphics.flipmode)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 88, loc::gettext("Do you want to return to the secret laboratory?"), 196, 196, 255 - help.glow, 12);
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(0, 80-16, 142, loc::gettext("[ NO, KEEP PLAYING ]"), 196, 196, 255 - help.glow);
font::print(0, 80 + 32, 130, loc::gettext("yes, return"), 96, 96, 96);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 76, loc::gettext("Do you want to return to the secret laboratory?"), 196, 196, 255 - help.glow, 12);
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(0, 80-16, 130, loc::gettext("[ NO, KEEP PLAYING ]"), 196, 196, 255 - help.glow);
font::print(0, 80 + 32, 142, loc::gettext("yes, return"), 96, 96, 96);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
break;
case 21:
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN | PR_CJK_LOW, -1, 220, loc::gettext("[ GRAVITRON ]"), 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
if (graphics.flipmode)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 88, loc::gettext("Do you want to return to the secret laboratory?"), 196, 196, 255 - help.glow, 12);
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(0, 80, 142, loc::gettext("no, keep playing"), 96, 96, 96);
font::print(0, 80 + 32-16, 130, loc::gettext("[ YES, RETURN ]"), 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Completely remove Graphics::PrintWrap All print calls are font:: ones now and all the old Graphics:: print functions have been removed, the migration is complete!
2023-01-20 21:11:18 +01:00
font::print_wrap(PR_CEN, -1, 76, loc::gettext("Do you want to return to the secret laboratory?"), 196, 196, 255 - help.glow, 12);
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(0, 80, 130, loc::gettext("no, keep playing"), 96, 96, 96);
font::print(0, 80 + 32-16, 142, loc::gettext("[ YES, RETURN ]"), 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.set_render_target(graphics.gameTexture);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
if (graphics.resumegamemode || graphics.menuoffset > 0 || graphics.oldmenuoffset > 0)
{
graphics.menuoffrender();
}
else
{
graphics.copy_texture(graphics.menuTexture, NULL, NULL);
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Restore janky gamestate-based quit-to-title system in glitchrunnermode This was fixed in 2.3 because one of the side effects of this janky system was being able to accidentally immediately quit to the title if the screen was black during a cutscene, which is something very likely to happen to casual players. Anyway, credits warp uses this gamestate-based system because it utilizes quitting to the title screen doing gamestate 80. From there, you increment the gamestate to gamestate 94 to use the Space Station 2 expo script.
2020-06-25 23:41:44 +02:00
// We need to draw the black screen above the menu in order to disguise it
// being jankily brought down in glitchrunner mode when exiting to the title
// Otherwise, there's no reason to obscure the menu
Fix frame flickers when fading during loads/exits This is because the fade delay did not last long enough. I was under the mistaken impression that the fade animation lasts for 15 frames. However, this does not account for the fact that the offset of each fade bar is dependent on RNG, and the worst case scenario is that they have an offset of 96 pixels (in the opposite direction of the fade). The actual fade animation timer accounts for the worst case scenario, so the fade animation actually lasts for (320 pixels plus 96 pixels is 416 pixels, 416 pixels divided by 24 pixels per frame equals 17.333... frames, but since the actual timer keeps adding/subtracting 24 pixels per frame until it passes the 416-pixel threshold, that gets rounded up to...) 18 frames. And an extra frame to make it so deltaframe interpolation doesn't suddenly stop on the last deltaframes before the screen is completely black. I also need to draw the screen black on the map screen when glitchrunner mode is off, if there's a fadeout going on. Else that would introduce yet another frame flicker.
2021-08-06 00:05:14 +02:00
if (GlitchrunnerMode_less_than_or_equal(Glitchrunner2_2)
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
|| FADEMODE_IS_FADING(graphics.fademode)
|| game.fadetomenu
|| game.fadetolab)
Only draw fading-in and fading-out animations in MAPMODE This makes it so if you bring up the quit screen during a faded-out screen, you will at least see the screen and won't see black. And also the fade-in and fade-out animations will still work on the quit screen. And more importantly, I tested and there's no 1-frame flicker or anything.
2020-05-08 00:53:12 +02:00
{
graphics.drawfade();
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.renderwithscreeneffects();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
De-duplicate map menu quicksave screen As is typical, the code was copy-pasted to account for Flip Mode, and then copy-pasted again to account for custom levels, leading to four instances of the same code. I clean this up while also improving code style. This is where the new FLIP macro and the fixed PrintWrap help a lot - otherwise the "Game saved ok!" screen would look really wrong without the height corrections.
2021-10-02 06:06:31 +02:00
#undef FLIP
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 23:23:59 +01:00
void teleporterrender(void)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.set_render_target(graphics.menuTexture);
graphics.clear();
Fix up temporary variables being in topmost scope and bad style This makes it so temporary variables have their scopes reduced (if possible). I also didn't hesitate to fix style issues, such as their names ("temp" is such a bad name), making them const if possible, and any code it touched too.
2022-12-30 07:23:48 +01:00
const int telex = map.teleporters[game.teleport_to_teleporter].x;
const int teley = map.teleporters[game.teleport_to_teleporter].y;
Unify drawing room name on map menus into one function Previously, it was copy-pasted and slightly different, when really, they ought to both be the exact same code. It kind of pains me that the room name, glitch name, and hidden name don't own their own memory, but, that's to be addressed later. What's a bit annoying is that the `temp` variable used in `teleporterrender` also ends up being reused later in the function. In this case, I opted to just redeclare them when they are used anyway, to make it clearer. Apart from `teleporterrender` no longer calling `map.area` or caring about `map.custommode`, it also no longer cares about `graphics.fademode` being 0. I could never actually get this condition to be false in practice, and I have absolutely no idea why it's there. I'm guessing it could be some weird edge case rendering issue if the screen is fully black? But I wouldn't know how to trigger that, and anyway it should probably be fixed elsewhere. So I'm just going to remove that conditional.
2022-04-25 09:53:13 +02:00
draw_roomname_menu();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//Background color
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.fill_rect(0, 12, 320, 240, 10, 24, 26);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
rendermap();
rendermapfog();
rendermapcursor(false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
// Draw a box around the currently selected teleporter
Apply suggestions from code review Co-authored-by: Misa Elizabeth Kai <infoteddy@infoteddy.info>
2022-11-30 19:31:36 +01:00
const MapRenderData data = getmaprenderdata();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if (game.useteleporter)
{
//Draw the chosen destination coordinate!
Fix mixed indentation in titlerender.cpp There's a lot, looks like mainly because of the person who added MMMMMM and M&P.
2020-04-02 23:19:15 +02:00
//TODO
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//draw the coordinates //destination
Fix up temporary variables being in topmost scope and bad style This makes it so temporary variables have their scopes reduced (if possible). I also didn't hesitate to fix style issues, such as their names ("temp" is such a bad name), making them const if possible, and any code it touched too.
2022-12-30 07:23:48 +01:00
graphics.drawrect(40 + data.xoff + (telex * 12 * data.zoom) + 1, 21 + data.yoff + (teley * 9 * data.zoom) + 1, 12 * data.zoom - 2, 9 * data.zoom - 2, 245 - (help.glow * 2), 16, 16);
graphics.drawrect(40 + data.xoff + (telex * 12 * data.zoom) + 3, 21 + data.yoff + (teley * 9 * data.zoom) + 3, 12 * data.zoom - 6, 9 * data.zoom - 6, 245 - (help.glow * 2), 16, 16);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
// Draw the legend itself
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
deduplicate a lot of map code
2022-11-07 01:51:07 +01:00
rendermaplegend();
// Highlight the currently selected teleporter
Disable more flashing elements if a11y is on For some reason, the accessibility option that was meant to disable flashes doesn't disable ALL flashes, only screen flashes and screen shaking. This commit disables a lot more, most importantly randomness in colors, the player flashing on death/respawn, and teleporters flashing.
2023-04-06 01:45:40 +02:00
if (game.useteleporter && (help.slowsine % 16 > 8 || game.noflashingmode))
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Fix up temporary variables being in topmost scope and bad style This makes it so temporary variables have their scopes reduced (if possible). I also didn't hesitate to fix style issues, such as their names ("temp" is such a bad name), making them const if possible, and any code it touched too.
2022-12-30 07:23:48 +01:00
graphics.drawtile(data.legendxoff + data.xoff + (telex * 12 * data.zoom), data.legendyoff + data.yoff + (teley * 9 * data.zoom), 1128 + (graphics.flipmode ? 3 : 0));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
graphics.cutscenebars();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if (game.useteleporter)
{
Replace hardcoded temp buffer sizes with a named constant Constants.h will house constants like the screen size and others. But basically only the screen size for now. Now we don't have to type that "4 bytes per 40 chars (whole screen)" comment everywhere...
2021-09-13 06:39:07 +02:00
char buffer[SCREEN_WIDTH_CHARS + 1];
Separate pressing Enter to open map from pressing Enter to interact This is a lot of copy-pasted code, but a little bit of copy-pasting never hurt anyone... The keybind to interact with activity zones and teleporters is now separate from the keybind to open the map, or return to the editor from in-editor playtesting, or restart a time trial. The keybind is now E, and the default controller bind is X. No controller button prompts, but the game didn't have controller button prompts anyways, so whatever. Doing this now because if people's muscle memory are going to be broken by not being able to spam the map keybind anymore, at least we can help a bit by changing the keybind so they can keep spamming it - their muscle memory is going to be broken anyways. This option has to be enabled by going to the speedrunner menu options and selecting "interact button". It is disabled by default. All prompt text needs to be string-interpolated every time they are drawn, because it is possible for people to change which interact button they use in the middle of gameplay, via the in-game options. Closes #736.
2021-04-19 08:23:44 +02:00
const char* final_string = interact_prompt(
buffer,
sizeof(buffer),
Entity.cpp: make all activity prompts translatable This adds loc::gettext for all "Press {button} to explode" and friends, and also changes the interact_prompt function in Render.cpp to expect {button} instead of %s. This commit is part of rewritten history of the localization branch. The original (unsquashed) commit history can be found here: https://github.com/Dav999-v/VVVVVV/tree/localization-orig
2022-12-30 23:26:51 +01:00
loc::gettext("Press {button} to Teleport")
Separate pressing Enter to open map from pressing Enter to interact This is a lot of copy-pasted code, but a little bit of copy-pasting never hurt anyone... The keybind to interact with activity zones and teleporters is now separate from the keybind to open the map, or return to the editor from in-editor playtesting, or restart a time trial. The keybind is now E, and the default controller bind is X. No controller button prompts, but the game didn't have controller button prompts anyways, so whatever. Doing this now because if people's muscle memory are going to be broken by not being able to spam the map keybind anymore, at least we can help a bit by changing the keybind so they can keep spamming it - their muscle memory is going to be broken anyways. This option has to be enabled by going to the speedrunner menu options and selecting "interact button". It is disabled by default. All prompt text needs to be string-interpolated every time they are drawn, because it is possible for people to change which interact button they use in the middle of gameplay, via the in-game options. Closes #736.
2021-04-19 08:23:44 +02:00
);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//Instructions!
Completely remove Graphics::Print, make many CJK positioning fixes Only Graphics::PrintWrap is left of the old print functions!
2023-01-20 20:24:41 +01:00
font::print(PR_CEN, -1, 210, loc::gettext("Press Left/Right to choose a Teleporter"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
font::print(PR_CEN, -1, 225, final_string, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
graphics.drawgui();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Replace ACTION in texts by {button} placeholders Gamepads and the Steam Deck need "ACTION" to be replaced by a controller glyph, so that's now possible.
2023-03-18 22:32:26 +01:00
if (game.advancetext)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Replace ACTION in texts by {button} placeholders Gamepads and the Steam Deck need "ACTION" to be replaced by a controller glyph, so that's now possible.
2023-03-18 22:32:26 +01:00
char buffer_adv[SCREEN_WIDTH_CHARS + 1];
vformat_buf(
buffer_adv, sizeof(buffer_adv),
loc::gettext("- Press {button} to advance text -"),
"button:but",
vformat_button(ActionSet_InGame, Action_InGame_ACTION)
);
font::print(PR_CEN | PR_BOR, -1, graphics.flipmode ? 228 : 5, buffer_adv, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.set_render_target(graphics.gameTexture);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Fix off-by-one in menuoffrender interpolation Otherwise, when you brought down the quit/pause/teleporter screen, it would appear to cut off too early.
2020-05-02 01:49:10 +02:00
if (graphics.resumegamemode || graphics.menuoffset > 0 || graphics.oldmenuoffset > 0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Remove global args from titlerender.cpp This removes all global args in all functions in titlerender.cpp. Additionally, all 'dwgfx' has been renamed to 'graphics' in that file (there are a lot of them, as you might guess).
2020-04-01 23:59:19 +02:00
graphics.menuoffrender();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.copy_texture(graphics.menuTexture, NULL, NULL);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Move from surfaces to the SDL render system Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
2023-01-07 19:28:07 +01:00
graphics.render();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Reference in a new issue Copy permalink