mpo
/
VVVVVV
mirror of https://github.com/TerryCavanagh/VVVVVV.git
1
0
Fork 0
Code Issues Releases Wiki Activity
VVVVVV/desktop_version/src/Render.cpp

2599 lines
106 KiB
C++
Raw Normal View History

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"
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 "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"
#include "Graphics.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"
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"
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"
Don't recompile all files when the commit hash is changed The previous implementation of showing the commit hash on the title screen used a preprocessor definition added at CMake time to pass the hash and date. This was passed for every file compiled, so if the date or hash changed, then every file would be recompiled. This is especially annoying if you're working on the game and switching branches all the time - the game has at least 50 source files to recompile! To fix this, we'll switch to using a generated file, named Version.h.out, that only gets included by the necessary files (which there is only one of - Render.cpp). It will be autogenerated by CMake (by using CONFIGURE_FILE(), which takes a templated file and does a find-and-replace on it, not unlike C macros), and since there's only one file that includes it, only one file will need to be recompiled when it changes. And also to prevent Version.h.out being a required file, it will only be included if necessary (i.e. OFFICIAL_BUILD is off). Since the C preprocessor can't ignore non-existing include files and will always error on them, I wrapped the #include in an #ifdef VERSION_H_EXISTS, and CMake will add the VERSION_H_OUT_EXISTS define when generating Version.h.out. The wrapper is named Version.h, so any file that #includes the commit hash and date should #include Version.h instead of Version.h.out. As an added bonus, I've also made it so CMake will print "This is interim commit [HASH] (committed [DATE])" at configure time if the game is going to be compiled with an interim commit hash. Now, there is also the issue that the commit hash change will only be noticed in the first place if CMake needs to be re-ran for anything, but that's a less severe issue than requiring recompilation of 50(!) or so files.
2020-12-26 00:24:48 +01:00
#include "Version.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
Add macro-like inline func FLIP() This will be used to keep some text positions the same when in Flip Mode, instead of having to copy and paste code. This function being at the very top of the file kind of violates locality, but it has to be done because it can't be a macro.
2020-06-21 04:12:27 +02:00
// Macro-like inline function used in maprender()
// Used to keep some text positions the same in Flip Mode
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 inline FLIP(int ypos)
Add macro-like inline func FLIP() This will be used to keep some text positions the same when in Flip Mode, instead of having to copy and paste code. This function being at the very top of the file kind of violates locality, but it has to be done because it can't be a macro.
2020-06-21 04:12:27 +02:00
{
if (graphics.flipmode)
{
return 220 - ypos;
}
return ypos;
}
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
static inline void drawslowdowntext()
{
switch (game.slowdown)
{
case 30:
graphics.Print( -1, 105, "Game speed is normal.", tr/2, tg/2, tb/2, true);
break;
case 24:
graphics.Print( -1, 105, "Game speed is at 80%", tr, tg, tb, true);
break;
case 18:
graphics.Print( -1, 105, "Game speed is at 60%", tr, tg, tb, true);
break;
case 12:
graphics.Print( -1, 105, "Game speed is at 40%", tr, tg, tb, true);
break;
}
}
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 void menurender()
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 temp = 50;
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:
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.drawsprite((160 - 96) + 0 * 32, temp, 23, tr, tg, tb);
graphics.drawsprite((160 - 96) + 1 * 32, temp, 23, tr, tg, tb);
graphics.drawsprite((160 - 96) + 2 * 32, temp, 23, tr, tg, tb);
graphics.drawsprite((160 - 96) + 3 * 32, temp, 23, tr, tg, tb);
graphics.drawsprite((160 - 96) + 4 * 32, temp, 23, tr, tg, tb);
graphics.drawsprite((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)
graphics.Print(-1,temp+35," MAKE AND PLAY EDITION",tr, tg, tb, true);
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
#ifdef COMMIT_DATE
graphics.Print( 310 - (10*8), 210, COMMIT_DATE, tr/2, tg/2, tb/2);
#endif
#ifdef INTERIM_COMMIT
Use SDL_arraysize() - 1 to take length of INTERIM_COMMIT Since INTERIM_COMMIT is a char array whose size we know for sure at compile time, and which we also know is an array (instead of being a pointer), we can take the SDL_arraysize() of it. However, SDL_arraysize() doesn't account for the null terminator unlike SDL_strlen(), so we'll have to do it ourselves. But at least we are guaranteed to get a constant value at compile time, unlike if we use SDL_strlen(), which would be repeatedly evaluating a constant value at runtime. To my knowledge, there's no equivalent SDL_arraysize() for constant strings, and a quick `rg` (ripgrep) for "sizeof" in the SDL include/ folder doesn't show anything like that. So we'll just have to use the SDL_arraysize() - 1 and deal with it.
2020-12-26 06:45:24 +01:00
graphics.Print( 310 - (SDL_arraysize(INTERIM_COMMIT) - 1) * 8, 220, INTERIM_COMMIT, 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
Bump version number in bottom-right to 2.3 I think it's about time that this number be updated, yeah? This isn't to say that 2.3 is finished or almost finished or anything, this is just to clearly differentiate that this isn't 2.2.
2020-04-16 05:41:26 +02:00
graphics.Print( 310 - (4*8), 230, "v2.3", 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){
graphics.Print( 10, 230, "[MMMMMM Mod Installed]", tr/2, tg/2, tb/2);
}
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
#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
{
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(ed.ListOfMetaData.size()==0){
graphics.Print( -1, 100, "ERROR: No levels found.", tr, tg, tb, true);
}
int tmp=game.currentmenuoption+(game.levelpage*8);
Don't manually write out INBOUNDS_VEC() checks This is because if they are manually written out, they are more likely to contain mistakes. In fact, after further review, there are several functions with incorrect manually-written bounds checks: * entityclass::entitycollide() * entityclass::removeentity() * entityclass::removeblock() * entityclass::copylinecross() * entityclass::revertlinecross() All of those functions forgot to do 'greater than or equal to' instead of 'greater than' when comparing against the size of the vector. So they were erroneous. But they are now fixed.
2020-09-10 06:58:59 +02:00
if(INBOUNDS_VEC(tmp, ed.ListOfMetaData)){
Add a "previous page" option to the levels list This makes it more convenient if you have a large levels directory, as some people in the VVVVVV custom levels community do. On the first page, this option will change to be "last page" instead. Since the addition of another menu option pushes up the list of levels too close to the selected level data itself, I've had to move the list of levels down by 4 pixels (but "next page"/"previous page"/"return to menu" are still in their same position). This feature was already added to VCE but hasn't been upstreamed until now.
2020-04-17 08:05:49 +02:00
//Don't show next/previous page or return to menu options here!
if(game.menuoptions.size() - game.currentmenuoption<=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
}else{
graphics.bigprint( -1, 15, ed.ListOfMetaData[tmp].title, tr, tg, tb, true);
graphics.Print( -1, 40, "by " + ed.ListOfMetaData[tmp].creator, tr, tg, tb, true);
graphics.Print( -1, 50, ed.ListOfMetaData[tmp].website, tr, tg, tb, true);
graphics.Print( -1, 70, ed.ListOfMetaData[tmp].Desc1, tr, tg, tb, true);
graphics.Print( -1, 80, ed.ListOfMetaData[tmp].Desc2, tr, tg, tb, true);
graphics.Print( -1, 90, ed.ListOfMetaData[tmp].Desc3, 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;
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:
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.Print( -1, 65, "ERROR: This level has", tr, tg, tb, true);
graphics.Print( -1, 75, "no start point!", 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::options:
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
{
#if defined(MAKEANDPLAY)
int flipmode_offset = 0;
#else
int flipmode_offset = game.ingame_titlemode && game.unlock[18] ? 0 : -1;
#endif
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)
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
int unlockmode_offset = -1;
De-duplicate copy-pasted input/render code in menus This removes duplicate code that came about as a result of various possible permutations of menu options, depending on being M&P, having no custom level support, having no editor support, and having MMMMMM. The menus with such permutations are the following: - main menu - "start game" is gone in MAKEANDPLAY - "player levels" is gone in NO_CUSTOM_LEVELS - "view credits" is gone in MAKEANDPLAY - "game options" - "unlock play data" is gone in MAKEANDPLAY - "soundtrack" is gone if you don't have an mmmmmm.vvv file - "player levels" - "level editor" is gone in NO_EDITOR I achieve this de-duplication by clever use of calculating offsets, which I feel is the best way to de-duplicate the code with the least amount of work, if a little brittle. The other options are to (1) put function pointers on each MenuOption object, which is pretty verbose and would inflate Game::createmenu() by a lot, (2) switch all game.currentmenuoption checks to instead check for the text of the currently-selected menu option, which is very error-prone because if you make a typo it won't be caught at compile-time, (3) add a unique ID to each MenuOption object that represents a text but will error at compile-time if you make a typo, however this just duplicates all the menu option text, which is more code than was duplicated previously. So I just went with this one.
2020-04-16 02:59:03 +02:00
#else
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
int unlockmode_offset = 0;
De-duplicate copy-pasted input/render code in menus This removes duplicate code that came about as a result of various possible permutations of menu options, depending on being M&P, having no custom level support, having no editor support, and having MMMMMM. The menus with such permutations are the following: - main menu - "start game" is gone in MAKEANDPLAY - "player levels" is gone in NO_CUSTOM_LEVELS - "view credits" is gone in MAKEANDPLAY - "game options" - "unlock play data" is gone in MAKEANDPLAY - "soundtrack" is gone if you don't have an mmmmmm.vvv file - "player levels" - "level editor" is gone in NO_EDITOR I achieve this de-duplication by clever use of calculating offsets, which I feel is the best way to de-duplicate the code with the least amount of work, if a little brittle. The other options are to (1) put function pointers on each MenuOption object, which is pretty verbose and would inflate Game::createmenu() by a lot, (2) switch all game.currentmenuoption checks to instead check for the text of the currently-selected menu option, which is very error-prone because if you make a typo it won't be caught at compile-time, (3) add a unique ID to each MenuOption object that represents a text but will error at compile-time if you make a typo, however this just duplicates all the menu option text, which is more code than was duplicated previously. So I just went with this one.
2020-04-16 02:59:03 +02:00
#endif
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
int offset = 0;
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:
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.bigprint( -1, 30, "Accessibility", tr, tg, tb, true);
graphics.Print( -1, 65, "Disable screen effects, enable", tr, tg, tb, true);
graphics.Print( -1, 75, "slowdown modes or invincibility", tr, tg, tb, true);
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 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
graphics.bigprint( -1, 30, "Advanced Options", tr, tg, tb, true);
graphics.Print( -1, 65, "Hide the mouse cursor, remove", tr, tg, tb, true);
graphics.Print( -1, 75, "the loading screen, turn on", tr, tg, tb, true);
graphics.Print( -1, 85, "glitchrunner mode and more", tr, tg, tb, true);
Add glitchrunner mode, in game options Glitchrunner mode is intended to re-enable glitches that existed in older versions of VVVVVV. These glitches were removed because they could legitimately affect a casual player's experience. Glitches like various R-pressing screwery, Space Station 1 skip, telejumping, Gravitron out-of-bounds, etc. will not be patched.
2020-06-25 23:31:37 +02:00
break;
case 2:
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
#if !defined(MAKEANDPLAY)
if (game.ingame_titlemode && game.unlock[18])
#endif
{
graphics.bigprint( -1, 30, "Flip Mode", tr, tg, tb, true);
graphics.Print( -1, 65, "Flip the entire game vertically.", tr, tg, tb, true);
if (graphics.setflipmode)
{
graphics.Print( -1, 85, "Currently ENABLED!", tr, tg, tb, true);
}
else
{
graphics.Print( -1, 85, "Currently Disabled.", tr/2, tg/2, tb/2, true);
}
}
break;
}
offset += flipmode_offset;
#if !defined(MAKEANDPLAY)
if (game.currentmenuoption == 3+offset)
{
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.bigprint( -1, 30, "Unlock Play Modes", tr, tg, tb, true);
graphics.Print( -1, 65, "Unlock parts of the game normally", tr, tg, tb, true);
graphics.Print( -1, 75, "unlocked as you progress", tr, tg, tb, true);
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
}
De-duplicate copy-pasted input/render code in menus This removes duplicate code that came about as a result of various possible permutations of menu options, depending on being M&P, having no custom level support, having no editor support, and having MMMMMM. The menus with such permutations are the following: - main menu - "start game" is gone in MAKEANDPLAY - "player levels" is gone in NO_CUSTOM_LEVELS - "view credits" is gone in MAKEANDPLAY - "game options" - "unlock play data" is gone in MAKEANDPLAY - "soundtrack" is gone if you don't have an mmmmmm.vvv file - "player levels" - "level editor" is gone in NO_EDITOR I achieve this de-duplication by clever use of calculating offsets, which I feel is the best way to de-duplicate the code with the least amount of work, if a little brittle. The other options are to (1) put function pointers on each MenuOption object, which is pretty verbose and would inflate Game::createmenu() by a lot, (2) switch all game.currentmenuoption checks to instead check for the text of the currently-selected menu option, which is very error-prone because if you make a typo it won't be caught at compile-time, (3) add a unique ID to each MenuOption object that represents a text but will error at compile-time if you make a typo, however this just duplicates all the menu option text, which is more code than was duplicated previously. So I just went with this one.
2020-04-16 02:59:03 +02:00
#endif
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
offset += unlockmode_offset;
if (game.currentmenuoption == 4+offset)
{
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.bigprint( -1, 30, "Game Pad Options", tr, tg, tb, true);
graphics.Print( -1, 65, "Rebind your controller's buttons", tr, tg, tb, true);
graphics.Print( -1, 75, "and adjust sensitivity", tr, tg, tb, true);
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
}
else if (game.currentmenuoption == 5+offset)
{
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.bigprint( -1, 30, "Clear Data", tr, tg, tb, true);
graphics.Print( -1, 65, "Delete your save data", tr, tg, tb, true);
graphics.Print( -1, 75, "and unlocked play modes", tr, tg, tb, true);
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
}
else if (game.currentmenuoption == 6+offset && music.mmmmmm)
{
graphics.bigprint( -1, 30, "Soundtrack", tr, tg, tb, true);
graphics.Print( -1, 65, "Toggle between MMMMMM and PPPPPP", tr, tg, tb, true);
if(music.usingmmmmmm){
graphics.Print( -1, 85, "Current soundtrack: MMMMMM", tr, tg, tb, true);
}else{
graphics.Print( -1, 85, "Current soundtrack: PPPPPP", tr, tg, tb, true);
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;
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;
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
}
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:
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 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
{
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:
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
graphics.bigprint( -1, 30, "Toggle Fullscreen", tr, tg, tb, true);
graphics.Print( -1, 65, "Change to fullscreen/windowed mode.", tr, tg, tb, true);
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
if (graphics.screenbuffer->isWindowed)
{
graphics.Print( -1, 85, "Current mode: WINDOWED", tr, tg, tb, true);
}
else
{
graphics.Print( -1, 85, "Current mode: FULLSCREEN", tr, tg, tb, true);
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;
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
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:
Change "toggle letterbox" to "scaling mode" This change was half-backported from the localization branch, except I just came up with "scaling mode" as a better term than the more generic "graphics mode". It doesn't make sense to still have the option be called "toggle letterbox" because a third option (integer mode) was added at some point.
2020-06-30 22:36:57 +02:00
graphics.bigprint( -1, 30, "Scaling Mode", tr, tg, tb, true);
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
graphics.Print( -1, 65, "Choose letterbox/stretch/integer mode.", tr, tg, tb, true);
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
switch (graphics.screenbuffer->stretchMode)
{
case 2:
graphics.Print( -1, 85, "Current mode: INTEGER", tr, tg, tb, true);
break;
case 1:
graphics.Print( -1, 85, "Current mode: STRETCH", tr, tg, tb, true);
break;
default:
graphics.Print( -1, 85, "Current mode: LETTERBOX", tr, tg, tb, true);
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
}
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 "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
graphics.bigprint(-1, 30, "Resize to Nearest", tr, tg, tb, true);
graphics.Print(-1, 65, "Resize to the nearest window size", tr, tg, tb, true);
graphics.Print(-1, 75, "that is of an integer multiple.", tr, tg, tb, true);
if (!graphics.screenbuffer->isWindowed)
{
graphics.Print(-1, 95, "You must be in windowed mode", tr, tg, tb, true);
graphics.Print(-1, 105, "to use this option.", tr, tg, tb, true);
}
break;
case 3:
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
graphics.bigprint( -1, 30, "Toggle Filter", tr, tg, tb, true);
graphics.Print( -1, 65, "Change to nearest/linear filter.", tr, tg, tb, true);
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
if (graphics.screenbuffer->isFiltered)
{
graphics.Print( -1, 85, "Current mode: LINEAR", tr, tg, tb, true);
}
else
{
graphics.Print( -1, 85, "Current mode: NEAREST", tr, tg, tb, true);
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
}
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;
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
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
case 4:
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
graphics.bigprint( -1, 30, "Analogue Mode", tr, tg, tb, true);
graphics.Print( -1, 65, "There is nothing wrong with your", tr, tg, tb, true);
graphics.Print( -1, 75, "television set. Do not attempt to", tr, tg, tb, true);
graphics.Print( -1, 85, "adjust the picture.", tr, tg, tb, true);
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 "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
case 5:
Add being able to toggle over/fixed-30-FPS, off by default There is now an option in "graphic options" named "toggle fps", which toggles whether the game visually runs at 1000/34 FPS or over 1000/34 FPS. It is off by default. I've had to put the entire game loop in yet another set of braces, I'll indent it next commit.
2020-05-04 21:52:57 +02:00
graphics.bigprint(-1, 30, "Toggle 30+ FPS", tr, tg, tb, true);
graphics.Print(-1, 65, "Change whether the game", tr, tg, tb, true);
graphics.Print(-1, 75, "runs at 30 or over 30 FPS.", tr, tg, tb, true);
if (!game.over30mode)
{
graphics.Print(-1, 95, "Current mode: 30 FPS", tr/2, tg/2, tb/2, true);
}
else
{
graphics.Print(-1, 95, "Current mode: Over 30 FPS", tr, tg, tb, true);
}
break;
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
case 6:
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
graphics.bigprint(-1, 30, "Toggle VSync", tr, tg, tb, true);
Haiku: Keep the option visible, but note the bug
2020-07-08 20:43:04 +02:00
#ifdef __HAIKU__ // FIXME: Remove after SDL VSync bug is fixed! -flibit
graphics.Print(-1, 65, "Edit the config file on Haiku!", tr, tg, tb, true);
#else
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
graphics.Print(-1, 65, "Turn VSync on or off.", tr, tg, tb, true);
Haiku: Keep the option visible, but note the bug
2020-07-08 20:43:04 +02:00
#endif
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
Move the VSync work to Screen. The problem we're running into is entirely contained in the Screen - we need to either decouple graphics context init from Screen::init or we need to take out the screenbuffer interaction from loadstats (which I'm more in favor of since we can just pull the config values and pass them to Screen::init later).
2020-07-02 06:19:40 +02:00
if (!graphics.screenbuffer->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
{
graphics.Print(-1, 95, "Current mode: VSYNC OFF", tr/2, tg/2, tb/2, true);
}
else
{
graphics.Print(-1, 95, "Current mode: VSYNC ON", tr, tg, tb, true);
}
Add "resize to nearest" graphics option If you want your game window to simply be exactly 320x240, or 640x480, or 960x720 etc. then it's really annoying that there's no easy way to do this (to clarify, this is different from integer mode, which controls the size of the game INSIDE the window). The easiest way would be having to close the game, go into unlock.vvv, and edit the window size manually. VCE has a 1x/2x/3x/4x graphics option to solve this, although it does not account for actual monitor size (those 1x/2x/3x/4x modes are all you get, whether or not you have a monitor too small for some of them or too big for any of them to be what you want). I discussed this with flibit, and he said that VCE's approach (if it accounted for monitor size) wouldn't work on high-retina displays or high DPIs, because getting the actual multiplier to account for those monitors is kind of a pain. So the next best thing would be to add an option that resizes to the nearest perfect multiple of 320x240. That way you could simply resize the window and let the game correct any imperfect dimensions automatically.
2020-06-30 07:02:21 +02: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
}
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::credits:
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.Print( -1, 50, "VVVVVV is a game by", tr, tg, tb, true);
graphics.bigprint( 40, 65, "Terry Cavanagh", tr, tg, tb, true, 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
graphics.drawimagecol(7, -1, 86, tr *0.75, tg *0.75, tb *0.75, true);
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.Print( -1, 120, "and features music by", tr, tg, tb, true);
graphics.bigprint( 40, 135, "Magnus P~lsson", tr, tg, tb, true, 2);
graphics.drawimagecol(8, -1, 156, tr *0.75, tg *0.75, tb *0.75, 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:
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.Print( -1, 50, "Roomnames are by", tr, tg, tb, true);
graphics.bigprint( 40, 65, "Bennett Foddy", tr, tg, tb, true);
graphics.drawimagecol(9, -1, 86, tr*0.75, tg *0.75, tb *0.75, true);
graphics.Print( -1, 110, "C++ version by", tr, tg, tb, true);
graphics.bigprint( 40, 125, "Simon Roth", tr, tg, tb, true);
graphics.bigprint( 40, 145, "Ethan Lee", 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::credits25:
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.Print( -1, 40, "Beta Testing by", tr, tg, tb, true);
graphics.bigprint( 40, 55, "Sam Kaplan", tr, tg, tb, true);
graphics.bigprint( 40, 75, "Pauli Kohberger", tr, tg, tb, true);
graphics.Print( -1, 130, "Ending Picture by", tr, tg, tb, true);
graphics.bigprint( 40, 145, "Pauli Kohberger", 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::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
{
graphics.Print( -1, 20, "VVVVVV is supported by", tr, tg, tb, true);
graphics.Print( 40, 30, "the following patrons", tr, tg, tb, true);
int startidx = game.current_credits_list_index;
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
int endidx = std::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
{
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
graphics.Print(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
{
graphics.Print( -1, 20, "and also by", tr, tg, tb, true);
int startidx = game.current_credits_list_index;
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
int endidx = std::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
{
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
graphics.Print(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
{
graphics.Print( -1, 20, "With contributions on", tr, tg, tb, true);
graphics.Print( 40, 30, "GitHub from", tr, tg, tb, true);
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;
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
int endidx = std::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
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 + (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)
{
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
graphics.Print(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:
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.Print( -1, 20, "and thanks also to:", tr, tg, tb, true);
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.bigprint(80, 60, "You!", tr, tg, tb, true);
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.Print( 80, 100, "Your support makes it possible", tr, tg, tb,true);
graphics.Print( 80, 110,"for me to continue making the", tr, tg, tb,true);
graphics.Print( 80, 120,"games I want to make, now", tr, tg, tb,true);
graphics.Print( 80, 130, "and into the future.", tr, tg, tb, true);
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
graphics.Print( 80, 150,"Thank you!", 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::setinvincibility:
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.Print( -1, 100, "Are you sure you want to ", tr, tg, tb, true);
graphics.Print( -1, 110, "enable invincibility?", 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;
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:
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.bigprint( -1, 40, "Game Speed", tr, tg, tb, true);
graphics.Print( -1, 75, "Select a new game speed below.", tr, tg, tb, true);
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
drawslowdowntext();
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::newgamewarning:
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.Print( -1, 100, "Are you sure? This will", tr, tg, tb, true);
graphics.Print( -1, 110, "delete your current saves...", 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::cleardatamenu:
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.Print( -1, 100, "Are you sure you want to", tr, tg, tb, true);
graphics.Print( -1, 110, "delete all your saved data?", 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::startnodeathmode:
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.Print( -1, 45, "Good luck!", tr, tg, tb, true);
graphics.Print( -1, 80, "You cannot save in this mode.", tr, tg, tb, true);
graphics.Print( -1, 100, "Would you like to disable the", tr, tg, tb, true);
graphics.Print( -1, 112, "cutscenes during the game?", 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::controller:
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.bigprint( -1, 30, "Game Pad", tr, tg, tb, true);
graphics.Print( -1, 55, "Change controller options.", tr, tg, tb, true);
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:
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
switch(key.sensitivity)
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
case 0:
graphics.Print( -1, 85, " Low Medium High", tr, tg, tb, true);
graphics.Print( -1, 95, "[]..................", tr, tg, tb, true);
break;
case 1:
graphics.Print( -1, 85, " Low Medium High", tr, tg, tb, true);
graphics.Print( -1, 95, ".....[].............", tr, tg, tb, true);
break;
case 2:
graphics.Print( -1, 85, " Low Medium High", tr, tg, tb, true);
graphics.Print( -1, 95, ".........[].........", tr, tg, tb, true);
break;
case 3:
graphics.Print( -1, 85, " Low Medium High", tr, tg, tb, true);
graphics.Print( -1, 95, ".............[].....", tr, tg, tb, true);
break;
case 4:
graphics.Print( -1, 85, " Low Medium High", tr, tg, tb, true);
graphics.Print( -1, 95, "..................[]", tr, tg, tb, true);
break;
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
}
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:
case 2:
case 3:
Added ability to bind restart to a controller.
2020-08-09 00:41:59 +02:00
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
graphics.Print( -1, 85, "Flip is bound to: " + std::string(help.GCString(game.controllerButton_flip)) , tr, tg, tb, true);
graphics.Print( -1, 95, "Enter is bound to: " + std::string(help.GCString(game.controllerButton_map)), tr, tg, tb, true);
graphics.Print( -1, 105, "Menu is bound to: " + std::string(help.GCString(game.controllerButton_esc)) , tr, tg, tb, true);
Added ability to bind restart to a controller.
2020-08-09 00:41:59 +02:00
graphics.Print( -1, 115, "Restart is bound to: " + std::string(help.GCString(game.controllerButton_restart)) , tr, tg, tb, true);
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
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 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;
case Menu::advancedoptions:
switch (game.currentmenuoption)
{
case 0:
graphics.bigprint(-1, 30, "Toggle Mouse Cursor", tr, tg, tb, true);
graphics.Print(-1, 65, "Show/hide the system mouse cursor.", tr, tg, tb, true);
if (graphics.showmousecursor) {
graphics.Print(-1, 95, "Current mode: SHOW", tr, tg, tb, true);
}
else {
graphics.Print(-1, 95, "Current mode: HIDE", tr/2, tg/2, tb/2, true);
}
break;
case 1:
graphics.bigprint( -1, 30, "Unfocus Pause", tr, tg, tb, true);
graphics.Print( -1, 65, "Toggle if the game will pause", tr, tg, tb, true);
graphics.Print( -1, 75, "when the window is unfocused.", tr, tg, tb, true);
if (game.disablepause)
{
graphics.Print(-1, 95, "Unfocus pause is OFF", tr/2, tg/2, tb/2, true);
}
else
{
graphics.Print(-1, 95, "Unfocus pause is ON", tr, tg, tb, true);
}
break;
case 2:
graphics.bigprint(-1, 30, "Fake Load Screen", tr, tg, tb, true);
if (game.skipfakeload)
graphics.Print(-1, 65, "Fake loading screen is OFF", tr/2, tg/2, tb/2, true);
else
graphics.Print(-1, 65, "Fake loading screen is ON", tr, tg, tb, true);
break;
case 3:
graphics.bigprint(-1, 30, "Room Name BG", tr, tg, tb, true);
graphics.Print( -1, 65, "Lets you see through what is behind", tr, tg, tb, true);
graphics.Print( -1, 75, "the name at the bottom of the screen.", tr, tg, tb, true);
if (graphics.translucentroomname)
graphics.Print(-1, 95, "Room name background is TRANSLUCENT", tr/2, tg/2, tb/2, true);
else
graphics.Print(-1, 95, "Room name background is OPAQUE", tr, tg, tb, true);
break;
case 4:
graphics.bigprint( -1, 30, "Glitchrunner Mode", tr, tg, tb, true);
graphics.Print( -1, 65, "Re-enable glitches that existed", tr, tg, tb, true);
graphics.Print( -1, 75, "in previous versions of the game", tr, tg, tb, true);
if (game.glitchrunnermode)
{
graphics.Print( -1, 95, "Glitchrunner mode is ON", tr, tg, tb, true);
}
else
{
graphics.Print( -1, 95, "Glitchrunner mode is OFF", tr/2, tg/2, tb/2, true);
}
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:
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:
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.bigprint( -1, 40, "Backgrounds", tr, tg, tb, true);
if (!game.colourblindmode)
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
graphics.Print( -1, 75, "Backgrounds are ON.", tr, tg, tb, true);
}
else
{
graphics.Print( -1, 75, "Backgrounds are OFF.", tr/2, tg/2, tb/2, true);
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
}
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
graphics.bigprint( -1, 40, "Screen Effects", tr, tg, tb, true);
graphics.Print( -1, 75, "Disables screen shakes and flashes.", tr, tg, tb, true);
if (!game.noflashingmode)
{
graphics.Print( -1, 85, "Screen Effects are ON.", tr, tg, tb, true);
}
else
{
graphics.Print( -1, 85, "Screen Effects are OFF.", tr/2, tg/2, tb/2, true);
}
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
graphics.bigprint( -1, 40, "Text Outline", tr, tg, tb, true);
graphics.Print( -1, 75, "Disables outline on game text", tr, tg, tb, true);
// FIXME: Maybe do an outlined print instead? -flibit
if (!graphics.notextoutline)
{
graphics.Print( -1, 85, "Text outlines are ON.", tr, tg, tb, true);
}
else
{
graphics.Print( -1, 85, "Text outlines are OFF.", tr/2, tg/2, tb/2, true);
}
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
graphics.bigprint( -1, 40, "Invincibility", tr, tg, tb, true);
graphics.Print( -1, 75, "Provided to help disabled gamers", tr, tg, tb, true);
graphics.Print( -1, 85, "explore the game. Can cause glitches.", tr, tg, tb, true);
if (map.invincibility)
{
graphics.Print( -1, 105, "Invincibility is ON.", tr, tg, tb, true);
}
else
{
graphics.Print( -1, 105, "Invincibility is off.", tr/2, tg/2, tb/2, true);
}
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:
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.bigprint( -1, 40, "Game Speed", tr, tg, tb, 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
graphics.Print( -1, 75, "May be useful for disabled gamers", tr, tg, tb, true);
graphics.Print( -1, 85, "using one switch devices.", tr, tg, tb, true);
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
drawslowdowntext();
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::playint1:
case Menu::playint2:
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.Print( -1, 65, "Who do you want to play", tr, tg, tb, true);
graphics.Print( -1, 75, "the level with?", 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::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:
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.bigprint( -1, 30, "Time Trials", tr, tg, tb, true);
graphics.Print( -1, 65, "Replay any level in the game in", tr, tg, tb, true);
graphics.Print( -1, 75, "a competitive time trial mode.", tr, tg, tb, true);
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
if (game.slowdown < 30 || map.invincibility)
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
{
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.Print( -1, 105, "Time Trials are not available", tr, tg, tb, true);
graphics.Print( -1, 115, "with slowdown or invincibility.", tr, tg, tb, true);
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;
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
graphics.bigprint( -1, 30, "Intermissions", tr, tg, tb, true);
graphics.Print( -1, 65, "Replay the intermission levels.", tr, tg, tb, true);
if (!game.unlock[15] && !game.unlock[16])
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.Print( -1, 95, "TO UNLOCK: Complete the", tr, tg, tb, true);
graphics.Print( -1, 105, "intermission levels in-game.", tr, tg, tb, true);
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 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
graphics.bigprint( -1, 30, "No Death Mode", tr, tg, tb, true);
graphics.Print( -1, 65, "Play the entire game", tr, tg, tb, true);
graphics.Print( -1, 75, "without dying once.", tr, tg, tb, true);
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
if (game.slowdown < 30 || map.invincibility)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Capitalize "No Death Mode" in "not available" message It's fully capitalized everywhere else, so why not here?
2020-04-16 05:45:43 +02:00
graphics.Print( -1, 105, "No Death Mode is not available", tr, tg, tb, 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
graphics.Print( -1, 115, "with slowdown or invincibility.", tr, tg, tb, true);
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
{
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.Print( -1, 105, "TO UNLOCK: Achieve an S-rank or", tr, tg, tb, true);
graphics.Print( -1, 115, "above in at least 4 time trials.", tr, tg, tb, true);
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;
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
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.bigprint( -1, 30, "Flip Mode", tr, tg, tb, true);
graphics.Print( -1, 65, "Flip the entire game vertically.", tr, tg, tb, true);
graphics.Print( -1, 75, "Compatible with other game modes.", tr, tg, tb, true);
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
{
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.Print( -1, 105, "Currently ENABLED!", tr, tg, tb, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
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.Print( -1, 105, "Currently Disabled.", tr/2, tg/2, tb/2, true);
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
{
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.Print( -1, 105, "TO UNLOCK: Complete the game.", tr, tg, tb, true);
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:
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.Print( -1, 75, "Are you sure you want to quit?", 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::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
Make game save box 16 pixels wider While I'm going to fix #376 anyway to make longer numbers (like Seventy Eight) fit, I decided to also make the box a little wider in advance of the game being localized, those extra chars could be a lifesaver, while you wouldn't really notice the difference if you play the game in English.
2020-08-02 23:38:40 +02:00
graphics.drawpixeltextbox(17, 65-20, 286, 90, 36,12, 65, 185, 207,0,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
graphics.bigprint(-1, 20, "Tele Save", tr, tg, tb, true);
graphics.Print(0, 80-20, game.tele_currentarea, 25, 255 - (help.glow / 2), 255 - (help.glow / 2), true);
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
}
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
graphics.Print(59, 132-20, game.tele_gametime, 255 - (help.glow / 2), 255 - (help.glow / 2), 255 - (help.glow / 2));
const std::string& trinketcount = help.number(game.tele_trinkets);
graphics.Print(262-graphics.len(trinketcount), 132-20, trinketcount, 255 - (help.glow / 2), 255 - (help.glow / 2), 255 - (help.glow / 2));
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
graphics.drawsprite(34, 126-20, 50, graphics.col_clock);
graphics.drawsprite(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
Make game save box 16 pixels wider While I'm going to fix #376 anyway to make longer numbers (like Seventy Eight) fit, I decided to also make the box a little wider in advance of the game being localized, those extra chars could be a lifesaver, while you wouldn't really notice the difference if you play the game in English.
2020-08-02 23:38:40 +02:00
graphics.drawpixeltextbox(17, 65-20, 286, 90, 36,12, 65, 185, 207,0,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
graphics.bigprint(-1, 20, "Quick Save", tr, tg, tb, true);
graphics.Print(0, 80-20, game.quick_currentarea, 25, 255 - (help.glow / 2), 255 - (help.glow / 2), true);
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
}
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
graphics.Print(59, 132-20, game.quick_gametime, 255 - (help.glow / 2), 255 - (help.glow / 2), 255 - (help.glow / 2));
const std::string& trinketcount = help.number(game.quick_trinkets);
graphics.Print(262-graphics.len(trinketcount), 132-20, trinketcount, 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
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
graphics.drawsprite(34, 126-20, 50, graphics.col_clock);
graphics.drawsprite(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
{
graphics.bigprint( -1, 25, "GAME OVER", tr, tg, tb, true, 3);
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), 68, i, game.crewstats[i], true);
}
std::string tempstring;
Add check for singular trinkets and crewmates in NDM game over screen
2020-07-29 02:03:48 +02:00
tempstring = "You rescued " + help.number(game.crewrescued()) + (game.crewrescued() == 1 ? " crewmate" : " crewmates");
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.Print(0, 100, tempstring, tr, tg, tb, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Add check for singular trinkets and crewmates in NDM game over screen
2020-07-29 02:03:48 +02:00
tempstring = "and found " + help.number(game.trinkets()) + (game.trinkets() == 1 ? " trinket." : " trinkets.");
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.Print(0, 110, tempstring, tr, tg, tb, true);
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
tempstring = "You managed to reach:";
graphics.Print(0, 145, tempstring, tr, tg, tb, true);
graphics.Print(0, 155, game.hardestroom, tr, tg, tb, true);
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
switch (game.crewrescued())
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:
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
tempstring = "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:
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
tempstring = "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:
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
tempstring = "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:
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
tempstring = "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:
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
tempstring = "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;
case 6:
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
tempstring = "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
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.Print(0, 190, tempstring, 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;
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
{
graphics.bigprint( -1, 8, "WOW", tr, tg, tb, true, 4);
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), 68, i, game.crewstats[i], true);
}
std::string tempstring = "You rescued all the crewmates!";
graphics.Print(0, 100, tempstring, tr, tg, tb, true);
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
tempstring = "And you found " + help.number(game.trinkets()) + " trinkets.";
graphics.Print(0, 110, tempstring, tr, tg, tb, true);
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.Print(0, 160, "A new trophy has been awarded and", tr, tg, tb, true);
graphics.Print(0, 170, "placed in the secret lab to", tr, tg, tb, true);
graphics.Print(0, 180, "acknowledge your achievement!", 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;
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
{
graphics.bigprint( -1, 20, "Results", tr, tg, tb, true, 3);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Display centiseconds on time trial result and Game Complete Centiseconds won't be saved to any save file or anything. This is just to make speedrunning a bit more competitive, being able to know the precise time of a time trial or full game run. The time trial par time on the result screen always has ".99" after it. This is basically due to the game comparing the number of seconds to the par number of seconds using less-than-or-equal-to instead of simply less-than.
2020-06-30 00:53:19 +02:00
std::string tempstring = game.resulttimestring() + " / " + game.partimestring() + ".99";
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.drawspritesetcol(30, 80-15, 50, 22);
graphics.Print(65, 80-15, "TIME TAKEN:", 255, 255, 255);
graphics.Print(65, 90-15, tempstring, tr, tg, tb);
if (game.timetrialresulttime <= game.timetrialpar)
{
graphics.Print(220, 85-15, "+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
tempstring = help.String(game.deathcounts);
graphics.drawspritesetcol(30-4, 80+20-4, 12, 22);
graphics.Print(65, 80+20, "NUMBER OF DEATHS:", 255, 255, 255);
graphics.Print(65, 90+20, tempstring, tr, tg, tb);
if (game.deathcounts == 0)
{
graphics.Print(220, 85+20, "+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
tempstring = help.String(game.trinkets()) + " of " + help.String(game.timetrialshinytarget);
graphics.drawspritesetcol(30, 80+55, 22, 22);
graphics.Print(65, 80+55, "SHINY TRINKETS:", 255, 255, 255);
graphics.Print(65, 90+55, tempstring, tr, tg, tb);
if (game.trinkets() >= game.timetrialshinytarget)
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.Print(220, 85+55, "+1 Rank!", 255, 255, 255);
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01: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::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
{
graphics.bigprint( 100, 175, "Rank:", tr, tg, tb, false, 2);
}
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
{
switch(game.timetrialrank)
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
case 0:
graphics.bigprint( 195, 165, "B", 255, 255, 255, false, 4);
break;
case 1:
graphics.bigprint( 195, 165, "A", 255, 255, 255, false, 4);
break;
case 2:
graphics.bigprint( 195, 165, "S", 255, 255, 255, false, 4);
break;
case 3:
graphics.bigprint( 195, 165, "V", 255, 255, 255, false, 4);
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;
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:
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.bigprint( -1, 30, "Unlock Time Trials", tr, tg, tb, true);
graphics.Print( -1, 65, "You can unlock each time", tr, tg, tb, true);
graphics.Print( -1, 75, "trial separately.", 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::timetrials:
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
{
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.bigprint( -1, 30, "Space Station 1", tr, tg, tb, true);
if (game.besttimes[0] == -1)
{
graphics.Print( -1, 75, "Not yet attempted", tr, tg, tb, true);
}
else
{
graphics.Print( 16, 65, "BEST TIME ", tr, tg, tb);
graphics.Print( 16, 75, "BEST SHINY ", tr, tg, tb);
graphics.Print( 16, 85, "BEST LIVES ", tr, tg, tb);
graphics.Print( 110, 65, game.timetstring(game.besttimes[0]), tr, tg, tb);
graphics.Print( 110, 75, help.String(game.besttrinkets[0])+"/2", tr, tg, tb);
graphics.Print( 110, 85,help.String(game.bestlives[0]), 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
graphics.Print( 170, 65, "PAR TIME 1:15", tr, tg, tb);
graphics.Print( 170, 85, "Best Rank", tr, tg, tb);
switch(game.bestrank[0])
{
case 0:
graphics.bigprint( 275, 82, "B", 225, 225, 225);
break;
case 1:
graphics.bigprint( 275, 82, "A", 225, 225, 225);
break;
case 2:
graphics.bigprint( 275, 82, "S", 225, 225, 225);
break;
case 3:
graphics.bigprint( 275, 82, "V", 225, 225, 225);
break;
}
}
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
{
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.bigprint( -1, 30, "???", tr, tg, tb, true);
graphics.Print( -1, 60, "TO UNLOCK:", tr, tg, tb, true);
graphics.Print( -1, 75, "Rescue Violet", tr, tg, tb, true);
graphics.Print( -1, 85, "Find three trinkets", tr, tg, tb, true);
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
{
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.bigprint( -1, 30, "The Laboratory", tr, tg, tb, true);
if (game.besttimes[1] == -1)
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.Print( -1, 75, "Not yet attempted", tr, tg, tb, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
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.Print( 16, 65, "BEST TIME ", tr, tg, tb);
graphics.Print( 16, 75, "BEST SHINY ", tr, tg, tb);
graphics.Print( 16, 85, "BEST LIVES ", tr, tg, tb);
graphics.Print( 110, 65, game.timetstring(game.besttimes[1]), tr, tg, tb);
graphics.Print( 110, 75, help.String(game.besttrinkets[1])+"/4", tr, tg, tb);
graphics.Print( 110, 85, help.String(game.bestlives[1]), tr, tg, tb);
graphics.Print( 170, 65, "PAR TIME 2:45", tr, tg, tb);
graphics.Print( 170, 85, "Best Rank", tr, tg, tb);
switch(game.bestrank[1])
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
case 0:
graphics.bigprint( 275, 82, "B", 225, 225, 225);
break;
case 1:
graphics.bigprint( 275, 82, "A", 225, 225, 225);
break;
case 2:
graphics.bigprint( 275, 82, "S", 225, 225, 225);
break;
case 3:
graphics.bigprint( 275, 82, "V", 225, 225, 225);
break;
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
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
{
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.bigprint( -1, 30, "???", tr, tg, tb, true);
graphics.Print( -1, 60, "TO UNLOCK:", tr, tg, tb, true);
graphics.Print( -1, 75, "Rescue Victoria", tr, tg, tb, true);
graphics.Print( -1, 85, "Find six trinkets", tr, tg, tb, true);
}
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])
{
graphics.bigprint( -1, 30, "The Tower", tr, tg, tb, true);
if (game.besttimes[2] == -1)
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.Print( -1, 75, "Not yet attempted", tr, tg, tb, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
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.Print( 16, 65, "BEST TIME ", tr, tg, tb);
graphics.Print( 16, 75, "BEST SHINY ", tr, tg, tb);
graphics.Print( 16, 85, "BEST LIVES ", tr, tg, tb);
graphics.Print( 110, 65, game.timetstring(game.besttimes[2]), tr, tg, tb);
graphics.Print( 110, 75, help.String(game.besttrinkets[2])+"/2", tr, tg, tb);
graphics.Print( 110, 85, help.String(game.bestlives[2]), tr, tg, tb);
graphics.Print( 170, 65, "PAR TIME 1:45", tr, tg, tb);
graphics.Print( 170, 85, "Best Rank", tr, tg, tb);
switch(game.bestrank[2])
{
case 0:
graphics.bigprint( 275, 82, "B", 225, 225, 225);
break;
case 1:
graphics.bigprint( 275, 82, "A", 225, 225, 225);
break;
case 2:
graphics.bigprint( 275, 82, "S", 225, 225, 225);
break;
case 3:
graphics.bigprint( 275, 82, "V", 225, 225, 225);
break;
}
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
{
graphics.bigprint( -1, 30, "???", tr, tg, tb, true);
graphics.Print( -1, 60, "TO UNLOCK:", tr, tg, tb, true);
graphics.Print( -1, 75, "Rescue Vermilion", tr, tg, tb, true);
graphics.Print( -1, 85, "Find nine trinkets", tr, tg, tb, true);
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
{
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.bigprint( -1, 30, "Space Station 2", tr, tg, tb, true);
if (game.besttimes[3] == -1)
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.Print( -1, 75, "Not yet attempted", tr, tg, tb, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
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.Print( 16, 65, "BEST TIME ", tr, tg, tb);
graphics.Print( 16, 75, "BEST SHINY ", tr, tg, tb);
graphics.Print( 16, 85, "BEST LIVES ", tr, tg, tb);
graphics.Print( 110, 65, game.timetstring(game.besttimes[3]), tr, tg, tb);
graphics.Print( 110, 75, help.String(game.besttrinkets[3])+"/5", tr, tg, tb);
graphics.Print( 110, 85, help.String(game.bestlives[3]), tr, tg, tb);
graphics.Print( 170, 65, "PAR TIME 3:20", tr, tg, tb);
graphics.Print( 170, 85, "Best Rank", tr, tg, tb);
switch(game.bestrank[3])
{
case 0:
graphics.bigprint( 275, 82, "B", 225, 225, 225);
break;
case 1:
graphics.bigprint( 275, 82, "A", 225, 225, 225);
break;
case 2:
graphics.bigprint( 275, 82, "S", 225, 225, 225);
break;
case 3:
graphics.bigprint( 275, 82, "V", 225, 225, 225);
break;
}
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
{
graphics.bigprint( -1, 30, "???", tr, tg, tb, true);
graphics.Print( -1, 60, "TO UNLOCK:", tr, tg, tb, true);
graphics.Print( -1, 75, "Rescue Vitellary", tr, tg, tb, true);
graphics.Print( -1, 85, "Find twelve trinkets", tr, tg, tb, true);
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
{
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.bigprint( -1, 30, "The Warp Zone", tr, tg, tb, true);
if (game.besttimes[4] == -1)
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.Print( -1, 75, "Not yet attempted", tr, tg, tb, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
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.Print( 16, 65, "BEST TIME ", tr, tg, tb);
graphics.Print( 16, 75, "BEST SHINY ", tr, tg, tb);
graphics.Print( 16, 85, "BEST LIVES ", tr, tg, tb);
graphics.Print( 110, 65, game.timetstring(game.besttimes[4]), tr, tg, tb);
graphics.Print( 110, 75, help.String(game.besttrinkets[4])+"/1", tr, tg, tb);
graphics.Print( 110, 85, help.String(game.bestlives[4]), tr, tg, tb);
graphics.Print( 170, 65, "PAR TIME 2:00", tr, tg, tb);
graphics.Print( 170, 85, "Best Rank", tr, tg, tb);
switch(game.bestrank[4])
{
case 0:
graphics.bigprint( 275, 82, "B", 225, 225, 225);
break;
case 1:
graphics.bigprint( 275, 82, "A", 225, 225, 225);
break;
case 2:
graphics.bigprint( 275, 82, "S", 225, 225, 225);
break;
case 3:
graphics.bigprint( 275, 82, "V", 225, 225, 225);
break;
}
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
{
graphics.bigprint( -1, 30, "???", tr, tg, tb, true);
graphics.Print( -1, 60, "TO UNLOCK:", tr, tg, tb, true);
graphics.Print( -1, 75, "Rescue Verdigris", tr, tg, tb, true);
graphics.Print( -1, 85, "Find fifteen trinkets", tr, tg, tb, true);
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
{
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.bigprint( -1, 30, "The Final Level", tr, tg, tb, true);
if (game.besttimes[5] == -1)
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.Print( -1, 75, "Not yet attempted", tr, tg, tb, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
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.Print( 16, 65, "BEST TIME ", tr, tg, tb);
graphics.Print( 16, 75, "BEST SHINY ", tr, tg, tb);
graphics.Print( 16, 85, "BEST LIVES ", tr, tg, tb);
graphics.Print( 110, 65, game.timetstring(game.besttimes[5]), tr, tg, tb);
graphics.Print( 110, 75, help.String(game.besttrinkets[5])+"/1", tr, tg, tb);
graphics.Print( 110, 85, help.String(game.bestlives[5]), tr, tg, tb);
graphics.Print( 170, 65, "PAR TIME 2:15", tr, tg, tb);
graphics.Print( 170, 85, "Best Rank", tr, tg, tb);
switch(game.bestrank[5])
{
case 0:
graphics.bigprint( 275, 82, "B", 225, 225, 225);
break;
case 1:
graphics.bigprint( 275, 82, "A", 225, 225, 225);
break;
case 2:
graphics.bigprint( 275, 82, "S", 225, 225, 225);
break;
case 3:
graphics.bigprint( 275, 82, "V", 225, 225, 225);
break;
}
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
{
graphics.bigprint( -1, 30, "???", tr, tg, tb, true);
graphics.Print( -1, 60, "TO UNLOCK:", tr, tg, tb, true);
graphics.Print( -1, 75, "Complete the game", tr, tg, tb, true);
graphics.Print( -1, 85, "Find eighteen trinkets", tr, tg, tb, true);
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;
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::gamecompletecontinue:
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.bigprint( -1, 25, "Congratulations!", tr, tg, tb, true, 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
graphics.Print( -1, 45, "Your save files have been updated.", tr, tg, tb, true);
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.Print( -1, 110, "If you want to keep exploring", tr, tg, tb, true);
graphics.Print( -1, 120, "the game, select CONTINUE", tr, tg, tb, true);
graphics.Print( -1, 130, "from the play menu.", 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::unlockmenu:
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.bigprint( -1, 25, "Unlock Play Modes", tr, tg, tb, true, 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
graphics.Print( -1, 55, "From here, you may unlock parts", tr, tg, tb, true);
graphics.Print( -1, 65, "of the game that are normally", tr, tg, tb, true);
graphics.Print( -1, 75, "unlocked as you play.", 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::unlocktimetrial:
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.bigprint( -1, 45, "Congratulations!", tr, tg, tb, true, 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
graphics.Print( -1, 125, "You have unlocked", tr, tg, tb, true);
graphics.Print( -1, 135, "a new Time Trial.", 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::unlocktimetrials:
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.bigprint( -1, 45, "Congratulations!", tr, tg, tb, true, 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
graphics.Print( -1, 125, "You have unlocked some", tr, tg, tb, true);
graphics.Print( -1, 135, "new Time Trials.", 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::unlocknodeathmode:
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.bigprint( -1, 45, "Congratulations!", tr, tg, tb, true, 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
graphics.Print( -1, 125, "You have unlocked", tr, tg, tb, true);
graphics.Print( -1, 135, "No Death Mode.", 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::unlockflipmode:
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.bigprint( -1, 45, "Congratulations!", tr, tg, tb, true, 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
graphics.Print( -1, 125, "You have unlocked", tr, tg, tb, true);
graphics.Print( -1, 135, "Flip Mode.", 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::unlockintermission:
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.bigprint( -1, 45, "Congratulations!", tr, tg, tb, true, 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
graphics.Print( -1, 125, "You have unlocked", tr, tg, tb, true);
graphics.Print( -1, 135, "the intermission levels.", 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::playerworlds:
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
{
std::string tempstring = FILESYSTEM_getUserLevelDirectory();
if(tempstring.length()>80){
graphics.Print( -1, 160, "To install new player levels, copy", tr, tg, tb, true);
graphics.Print( -1, 170, "the .vvvvvv files to this folder:", tr, tg, tb, true);
graphics.Print( 320-((tempstring.length()-80)*8), 190, tempstring.substr(0,tempstring.length()-80), tr, tg, tb);
graphics.Print( 0, 200, tempstring.substr(tempstring.length()-80,40), tr, tg, tb);
graphics.Print( 0, 210, tempstring.substr(tempstring.length()-40,40), tr, tg, tb);
}else if(tempstring.length()>40){
graphics.Print( -1, 170, "To install new player levels, copy", tr, tg, tb, true);
graphics.Print( -1, 180, "the .vvvvvv files to this folder:", tr, tg, tb, true);
graphics.Print( 320-((tempstring.length()-40)*8), 200, tempstring.substr(0,tempstring.length()-40), tr, tg, tb);
graphics.Print( 0, 210, tempstring.substr(tempstring.length()-40,40), tr, tg, tb);
}else{
graphics.Print( -1, 180, "To install new player levels, copy", tr, tg, tb, true);
graphics.Print( -1, 190, "the .vvvvvv files to this folder:", tr, tg, tb, true);
graphics.Print( 320-(tempstring.length()*8), 210, tempstring, tr, tg, tb);
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;
}
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:
Make indentation in settings saving error consistent with rest of cases
2020-11-22 04:14:52 +01:00
graphics.Print( -1, 95, "ERROR: Could not save settings file!", tr, tg, tb, true);
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
}
}
void titlerender()
{
FillRect(graphics.backBuffer, 0,0,graphics.backBuffer->w, graphics.backBuffer->h, 0x00000000 );
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;
graphics.drawsprite((160 - 96) + 0 * 32, temp, 23, tr, tg, tb);
graphics.drawsprite((160 - 96) + 1 * 32, temp, 23, tr, tg, tb);
graphics.drawsprite((160 - 96) + 2 * 32, temp, 23, tr, tg, tb);
graphics.drawsprite((160 - 96) + 3 * 32, temp, 23, tr, tg, tb);
graphics.drawsprite((160 - 96) + 4 * 32, temp, 23, tr, tg, tb);
graphics.drawsprite((160 - 96) + 5 * 32, temp, 23, tr, tg, tb);
#if defined(MAKEANDPLAY)
graphics.Print(-1,temp+35," MAKE AND PLAY EDITION",tr, tg, tb, true);
#endif
graphics.Print(5, 175, "[ Press ACTION to Start ]", tr, tg, tb, true);
graphics.Print(5, 195, "ACTION = Space, Z, or V", int(tr*0.5f), int(tg*0.5f), int(tb*0.5f), true);
}
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;
De-duplicate Graphics::drawmenu() and Graphics::drawlevelmenu() Graphics::drawmenu() no longer has copy-pasted code for each individual case. Instead, the individual cases have their own adding on to common code, which is far easier to maintain. Also, the only difference Graphics::drawlevelmenu() does is in some y-positioning stuff. There's no reason to make it a whole separate function and duplicate everything AGAIN. So it's been consolidated into Graphics::drawmenu() as well, and I've added a boolean to draw a menu this way if it's the level menu.
2020-07-04 23:53:05 +02:00
graphics.drawmenu(tr, tg, tb, game.currentmenuname == Menu::levellist);
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
}
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
void gamecompleterender()
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
FillRect(graphics.backBuffer, 0x000000);
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;
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.drawsprite((160 - 96) + 0 * 32, temp, 23, tr, tg, tb);
graphics.drawsprite((160 - 96) + 1 * 32, temp, 23, tr, tg, tb);
graphics.drawsprite((160 - 96) + 2 * 32, temp, 23, tr, tg, tb);
graphics.drawsprite((160 - 96) + 3 * 32, temp, 23, tr, tg, tb);
graphics.drawsprite((160 - 96) + 4 * 32, temp, 23, tr, tg, tb);
graphics.drawsprite((160 - 96) + 5 * 32, temp, 23, 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(290 + position)) graphics.bigprint( -1, 290 + position, "Starring", tr, tg, tb, true, 2);
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);
graphics.Print(100, 330 + position, "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);
graphics.Print(100, 360 + position, "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);
graphics.Print(100, 390 + position, "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);
graphics.Print(100, 420 + position, "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);
graphics.Print(100, 450 + position, "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);
graphics.Print(100, 480 + position, "Doctor Victoria", 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(520 + position)) graphics.bigprint( -1, 520 + position, "Credits", tr, tg, tb, true, 3);
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
{
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.Print(40, 560 + position, "Created by", tr, tg, tb);
graphics.bigprint(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
{
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.Print(40, 600 + position, "With Music by", tr, tg, tb);
graphics.bigprint(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
{
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.Print(40, 640 + position, "Rooms Named by", tr, tg, tb);
graphics.bigprint(60, 650 + position, "Bennett Foddy", 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(680 + 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.Print(40, 680 + position, "C++ Port by", tr, tg, tb);
graphics.bigprint(60, 690 + position, "Simon Roth", tr, tg, tb);
graphics.bigprint(60, 710 + position, "Ethan Lee", 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(740 + 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.Print(40, 740 + position, "Beta Testing by", tr, tg, tb);
graphics.bigprint(60, 750 + position, "Sam Kaplan", tr, tg, tb);
graphics.bigprint(60, 770 + position, "Pauli Kohberger", 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(800 + 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.Print(40, 800 + position, "Ending Picture by", tr, tg, tb);
graphics.bigprint(60, 810 + position, "Pauli Kohberger", 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(890 + position)) graphics.bigprint( -1, 870 + position, "Patrons", tr, tg, tb, true, 3);
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
int creditOffset = 930;
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
{
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
graphics.Print(-1, creditOffset + position, Credits::superpatrons[i], tr, tg, tb, true);
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;
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)) graphics.Print( -1, creditOffset + position, "and", tr, tg, tb, true);
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
{
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
graphics.Print(-1, creditOffset + position, Credits::patrons[i], tr, tg, tb, true);
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;
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)) graphics.bigprint(40, creditOffset + position, "GitHub Contributors", tr, tg, tb, true);
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
{
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
graphics.Print(-1, creditOffset + position, Credits::githubfriends[i], tr, tg, tb, true);
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;
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)) graphics.bigprint( -1, creditOffset + position, "Thanks for playing!", tr, tg, tb, true, 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.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
}
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
void gamecompleterender2()
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
FillRect(graphics.backBuffer, 0x000000);
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.drawimage(10, 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)
{
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
FillRect(graphics.backBuffer, i * 8, j * 8, 8, 8, 0, 0, 0);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
if (j > game.creditposy)
{
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
FillRect(graphics.backBuffer, i * 8, j * 8, 8, 8, 0, 0, 0);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
Interpolate end picture reveal scroll This is so it looks smooth at framerates above 30.
2020-05-02 03:23:52 +02:00
FillRect(graphics.backBuffer, graphics.lerp(game.oldcreditposx * 8, game.creditposx * 8) + 8, game.creditposy * 8, 8, 8, 0, 0, 0);
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
}
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
void gamerender()
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
{
FillRect(graphics.backBuffer,0x00000);
}
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
{
FillRect(graphics.backBuffer,0x00000);
}
if (map.final_colormode)
{
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
}
if(map.extrarow==0 || (map.custommode && map.roomname!=""))
{
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.footerrect.y = 230;
if (graphics.translucentroomname)
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
{
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
SDL_BlitSurface(graphics.footerbuffer, NULL, graphics.backBuffer, &graphics.footerrect);
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
}
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
FillRect(graphics.backBuffer, graphics.footerrect, 0);
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
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if (map.finalmode)
{
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
graphics.bprint(5, 231, map.glitchname, 196, 196, 255 - help.glow, true);
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
graphics.bprint(5, 231, map.roomname, 196, 196, 255 - help.glow, true);
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
{
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.Print(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
}
}
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
#if !defined(NO_CUSTOM_LEVELS)
Don't render press ENTER to return to editor if advancetext is on This prevents a visual clash that can happen if both are on and there are no cutscene bars.
2020-01-17 08:33:12 +01:00
if(map.custommode && !map.custommodeforreal && !game.advancetext){
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//Return to level editor
Smoothly interpolate "[Press ENTER to return to editor]" fadeout Now it'll be real smooth at 60 FPS. Or above. Or whichever one you want above 30.
2020-05-02 19:49:41 +02:00
int alpha = graphics.lerp(ed.oldreturneditoralpha, ed.returneditoralpha);
graphics.bprintalpha(5, 5, "[Press ENTER to return to editor]", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), alpha, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +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();
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
BlitSurfaceStandard(graphics.backBuffer, NULL, graphics.tempBuffer, NULL);
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();
if (graphics.flipmode)
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 (game.advancetext) graphics.bprint(5, 228, "- Press ACTION to advance text -", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true);
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 (game.advancetext) graphics.bprint(5, 5, "- Press ACTION to advance text -", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true);
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
{
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);
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
{
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
graphics.bprint(5, 20, "- Press ENTER to Teleport -", alpha - 20 - (help.glow / 2), alpha - 20 - (help.glow / 2), alpha, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
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
graphics.bprint(5, 210, "- Press ENTER to Teleport -", alpha - 20 - (help.glow / 2), alpha - 20 - (help.glow / 2), alpha, true);
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);
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.bigprint( -1, 20, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true, 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);
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.Print( 10, 10, "Current Time", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), false);
graphics.bigprint( 25, 24, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), false, 2);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
tempstring = help.timestring(game.swnrecord);
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.Print( 240, 10, "Best Time", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), false);
graphics.bigrprint( 300, 24, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), false, 2);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
switch(game.swnbestrank)
{
case 0:
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.Print( -1, 204, "Next Trophy at 5 seconds", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 1:
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.Print( -1, 204, "Next Trophy at 10 seconds", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 2:
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.Print( -1, 204, "Next Trophy at 15 seconds", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 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.Print( -1, 204, "Next Trophy at 20 seconds", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 4:
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.Print( -1, 204, "Next Trophy at 30 seconds", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 5:
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.Print( -1, 204, "Next Trophy at 1 minute", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 6:
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.Print( -1, 204, "All Trophies collected!", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true);
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);
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.Print( 10, 10, "Current Time", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), false);
graphics.bigprint( 25, 24, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), false, 2);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
tempstring = help.timestring(game.swnrecord);
if (int(game.deathseq / 5) % 2 == 1)
{
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.Print( 240, 10, "Best Time", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), false);
graphics.bigrprint( 300, 24, tempstring, 128 - (help.glow), 220 - (help.glow), 128 - (help.glow / 2), false, 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.bigprint( -1, 200, "New Record!", 128 - (help.glow), 220 - (help.glow), 128 - (help.glow / 2), true, 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);
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.Print( 10, 10, "Current Time", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), false);
graphics.bigprint( 25, 24, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), false, 2);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
tempstring = help.timestring(game.swnrecord);
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.Print( 240, 10, "Best Time", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), false);
graphics.bigrprint( 300, 24, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), false, 2);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if (int(game.swnmessage / 5) % 2 == 1)
{
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.bigprint( -1, 200, "New Trophy!", 220 - (help.glow), 128 - (help.glow), 128 - (help.glow / 2), true, 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.Print( 20, 228, "[Press ENTER to stop]", 160 - (help.glow/2), 160 - (help.glow/2), 160 - (help.glow/2), true);
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)
{
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
{
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.bigprint( -1, 30, "Survive for", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true, 2);
graphics.bigprint( -1, 10, "60 seconds!", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true, 2);
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.bigprint( -1, 10, "Survive for", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true, 2);
graphics.bigprint( -1, 30, "60 seconds!", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true, 2);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
else if(game.swngame==7)
{
if (game.swndelay >= 60)
{
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.bigprint( -1, 20, "SUPER GRAVITRON", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true, 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);
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.Print( 240, 190, "Best Time", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true);
graphics.bigrprint( 300, 205, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true, 2);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else if (int(game.swndelay / 10) % 2 == 1)
{
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.bigprint( -1, 20, "SUPER GRAVITRON", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true, 2);
graphics.bigprint( -1, 200, "GO!", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true, 3);
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 (game.intimetrial && graphics.fademode==0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Draw countdown!
if (game.timetrialcountdown > 0)
{
if (game.timetrialcountdown < 30)
{
game.resetgameclock();
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 (int(game.timetrialcountdown / 4) % 2 == 0) graphics.bigprint( -1, 100, "Go!", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true, 4);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else if (game.timetrialcountdown < 60)
{
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.bigprint( -1, 100, "1", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true, 4);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else if (game.timetrialcountdown < 90)
{
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.bigprint( -1, 100, "2", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true, 4);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else if (game.timetrialcountdown < 120)
{
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.bigprint( -1, 100, "3", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true, 4);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
else
{
//Draw OSD stuff
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.bprint(6, 18, "TIME :", 255,255,255);
graphics.bprint(6, 30, "DEATH:", 255, 255, 255);
graphics.bprint(6, 42, "SHINY:", 255,255,255);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if(game.timetrialparlost)
{
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.bprint(56, 18, game.timestring(), 196, 80, 80);
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.bprint(56, 18, game.timestring(), 196, 196, 196);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
if(game.deathcounts>0)
{
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.bprint(56, 30,help.String(game.deathcounts), 196, 80, 80);
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.bprint(56, 30,help.String(game.deathcounts), 196, 196, 196);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
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
{
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
graphics.bprint(56, 42,help.String(game.trinkets()) + " of " +help.String(game.timetrialshinytarget), 196, 80, 80);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
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
graphics.bprint(56, 42,help.String(game.trinkets()) + " of " +help.String(game.timetrialshinytarget), 196, 196, 196);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
if(game.timetrialparlost)
{
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.bprint(195, 214, "PAR TIME:", 80, 80, 80);
graphics.bprint(275, 214, game.partimestring(), 80, 80, 80);
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.bprint(195, 214, "PAR TIME:", 255, 255, 255);
graphics.bprint(275, 214, game.partimestring(), 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;
Use explicit INBOUNDS_VEC() instead of checking sentinel -1 It's better to do INBOUNDS_VEC(i, obj.entities) instead of 'i > -1'. 'i > -1' is used in cases like obj.getplayer(), which COULD return a sentinel value of -1 and so correct code will have to check that value. However, I am now of the opinion that INBOUNDS_VEC() should be used and isn't unnecessary. Consider the case of the face() script command: it's not enough to check i > -1, you should read the routine carefully. Because if you look closely, you'll see that it's not guaranteed that 'i' will be initialized at all in that command. Indeed, if you call face() with invalid arguments, it won't be. And so, 'i' could be something like 215, and that would index out-of-bounds, and that wouldn't be good. Therefore, it's better to have the full bounds check instead of checking only one bounds. Many commands are like this, after some searching I can also name position(), changemood(), changetile(), changegravity(), etc. It also makes the code more explicit. Now you don't have to wonder what -1 means or why it's being checked, you can just read the 'INBOUNDS' and go "oh, that checks if it's actually inbounds or not".
2020-09-09 13:15:14 +02:00
if (INBOUNDS_VEC(game.activeactivity, obj.entities))
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
game.activity_lastprompt = obj.blocks[game.activeactivity].prompt;
game.activity_r = obj.blocks[game.activeactivity].r;
game.activity_g = obj.blocks[game.activeactivity].g;
game.activity_b = obj.blocks[game.activeactivity].b;
}
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
{
Simplify "else if" braces and indentation in activity prompt rendering No need for it to be inside another whole indented block if it's just an "else if".
2020-04-29 07:00:16 +02:00
graphics.drawtextbox(16, 4, 36, 3, game.activity_r*act_alpha, game.activity_g*act_alpha, game.activity_b*act_alpha);
graphics.Print(5, 12, game.activity_lastprompt, game.activity_r*act_alpha, game.activity_g*act_alpha, game.activity_b*act_alpha, true);
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
}
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
void maprender()
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
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
FillRect(graphics.backBuffer, 0x000000);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//draw screen alliteration
//Roomname:
Refactor how "hidden names" work By "hidden names", I'm referring to "Dimension VVVVVV" and "The Ship" popping up on the quit/pause/teleporter screens, even though those rooms don't have any roomnames. Apparently my commit to fix roomname re-draw bleed on the quit/pause/teleporter screens exposed yet another hardreset()-caused bug. The issue here is that since hardreset() sets game.roomx and game.roomy to 0, map.area() will no longer work properly, and since the hidden roomname check is based on map.area(), it will no longer display "Dimension VVVVVV" or "The Ship" once you press ACTION to quit. It used to do this due to the re-draw bleed, but now it doesn't. I saw that roomnames didn't get reset in hardreset(), so the solution here is to re-factor hidden names to be an actual variable, instead of being implicit. map.hiddenname is a variable that's set in mapclass::loadlevel(), and if isn't empty, it will be drawn on the quit/pause/teleporter screens. That way it will still display "Dimension VVVVVV" and "The Ship" when you press ACTION to quit to the menu. EDIT: Since PR #230 got merged, this commit is no longer strictly necessary, but it's still good to refactor hidden names like this.
2020-05-02 23:10:22 +02:00
if (map.hiddenname != "")
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor how "hidden names" work By "hidden names", I'm referring to "Dimension VVVVVV" and "The Ship" popping up on the quit/pause/teleporter screens, even though those rooms don't have any roomnames. Apparently my commit to fix roomname re-draw bleed on the quit/pause/teleporter screens exposed yet another hardreset()-caused bug. The issue here is that since hardreset() sets game.roomx and game.roomy to 0, map.area() will no longer work properly, and since the hidden roomname check is based on map.area(), it will no longer display "Dimension VVVVVV" or "The Ship" once you press ACTION to quit. It used to do this due to the re-draw bleed, but now it doesn't. I saw that roomnames didn't get reset in hardreset(), so the solution here is to re-factor hidden names to be an actual variable, instead of being implicit. map.hiddenname is a variable that's set in mapclass::loadlevel(), and if isn't empty, it will be drawn on the quit/pause/teleporter screens. That way it will still display "Dimension VVVVVV" and "The Ship" when you press ACTION to quit to the menu. EDIT: Since PR #230 got merged, this commit is no longer strictly necessary, but it's still good to refactor hidden names like this.
2020-05-02 23:10:22 +02:00
graphics.Print(5, 2, map.hiddenname, 196, 196, 255 - help.glow, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
if (map.finalmode){
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.Print(5, 2, map.glitchname, 196, 196, 255 - help.glow, true);
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.Print(5, 2, map.roomname, 196, 196, 255 - help.glow, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
//Background color
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
FillRect(graphics.backBuffer,0, 12, 320, 240, 10, 24, 26 );
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//Menubar:
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.drawtextbox( -10, 212, 42, 3, 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
// Draw the selected page name at the bottom
// 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
graphics.Print(-1, 220, "[SAVE]", 196, 196, 255 - help.glow, true);
}
else if (game.menupage <= 3)
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
std::string tab1;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if (game.insecretlab)
{
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
tab1 = "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
{
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
tab1 = "SHIP";
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
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
tab1 = "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)
TAB(0, "MAP");
TAB(1, tab1);
TAB(2, "STATS");
TAB(3, "SAVE");
#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:
graphics.Print(-1, 220, "[ PAUSE ]", 196, 196, 255 - help.glow, true);
}
// Draw menu options
if (game.menupage >= 30 && game.menupage <= 33)
{
#define OPTION(opt, text) graphics.map_option(opt, 4, text, game.menupage - 30 == opt)
OPTION(0, "return to game");
OPTION(1, "quit to menu");
OPTION(2, "graphic options");
OPTION(3, "game options");
#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:
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if (map.finalmode || (map.custommode&&!map.customshowmm))
{
//draw the map image
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.drawpixeltextbox(35, 16, 250, 190, 32,24, 65, 185, 207,4,0);
graphics.drawimage(1, 40, 21, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
for (int j = 0; j < 20; j++)
{
for (int i = 0; i < 20; 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.drawimage(2, 40 + (i * 12), 21 + (j * 9), false);
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.Print(-1, 105, "NO SIGNAL", 245, 245, 245, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else if(map.custommode)
{
//draw the map image
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.drawcustompixeltextbox(35+map.custommmxoff, 16+map.custommmyoff, map.custommmxsize+10, map.custommmysize+10, (map.custommmxsize+10)/8, (map.custommmysize+10)/8, 65, 185, 207,4,0);
graphics.drawpartimage(12, 40+map.custommmxoff, 21+map.custommmyoff, map.custommmxsize,map.custommmysize);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//Black out here
if(map.customzoom==4){
for (int j = 0; j < map.customheight; j++){
for (int i = 0; i < map.customwidth; i++){
if(map.explored[i+(j*20)]==0){
//Draw the fog of war on the map
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.drawimage(2, map.custommmxoff+40 + (i * 48), map.custommmyoff+21 + (j * 36), false);
graphics.drawimage(2, map.custommmxoff+40 + 12 + (i * 48), map.custommmyoff+21 + (j * 36), false);
graphics.drawimage(2, map.custommmxoff+40 + (i * 48), map.custommmyoff+21 + 9 + (j * 36), false);
graphics.drawimage(2, map.custommmxoff+40 + 12 + (i * 48), map.custommmyoff+21 + 9+ (j * 36), false);
graphics.drawimage(2, map.custommmxoff+40 + (i * 48) + 24, map.custommmyoff+21 + (j * 36), false);
graphics.drawimage(2, map.custommmxoff+40 + 12 + (i * 48) + 24, map.custommmyoff+21 + (j * 36), false);
graphics.drawimage(2, map.custommmxoff+40 + (i * 48) + 24, map.custommmyoff+ 21 + 9 + (j * 36), false);
graphics.drawimage(2, map.custommmxoff+40 + 12 + (i * 48) + 24, map.custommmyoff+21 + 9+ (j * 36), false);
graphics.drawimage(2, map.custommmxoff+40 + (i * 48), map.custommmyoff+21 + (j * 36)+18, false);
graphics.drawimage(2, map.custommmxoff+40 + 12 + (i * 48), map.custommmyoff+21 + (j * 36)+18, false);
graphics.drawimage(2, map.custommmxoff+40 + (i * 48), map.custommmyoff+21 + 9 + (j * 36)+18, false);
graphics.drawimage(2, map.custommmxoff+40 + 12 + (i * 48), map.custommmyoff+21 + 9+ (j * 36)+18, false);
graphics.drawimage(2, map.custommmxoff+40 + (i * 48) + 24, map.custommmyoff+21 + (j * 36)+18, false);
graphics.drawimage(2, map.custommmxoff+40 + 12 + (i * 48) + 24, map.custommmyoff+21 + (j * 36)+18, false);
graphics.drawimage(2, map.custommmxoff+40 + (i * 48) + 24, map.custommmyoff+21 + 9 + (j * 36)+18, false);
graphics.drawimage(2, map.custommmxoff+40 + 12 + (i * 48) + 24, map.custommmyoff+21 + 9+ (j * 36)+18, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
}else if(map.customzoom==2){
for (int j = 0; j < map.customheight; j++){
for (int i = 0; i < map.customwidth; i++){
if(map.explored[i+(j*20)]==0){
//Draw the fog of war on the map
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.drawimage(2, map.custommmxoff+40 + (i * 24), map.custommmyoff+21 + (j * 18), false);
graphics.drawimage(2, map.custommmxoff+40 + 12 + (i * 24), map.custommmyoff+21 + (j * 18), false);
graphics.drawimage(2, map.custommmxoff+40 + (i * 24), map.custommmyoff+21 + 9 + (j * 18), false);
graphics.drawimage(2, map.custommmxoff+40 + 12 + (i * 24), map.custommmyoff+21 + 9+ (j * 18), false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
}else{
for (int j = 0; j < map.customheight; j++){
for (int i = 0; i < map.customwidth; i++){
if(map.explored[i+(j*20)]==0){
//Draw the fog of war on the map
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.drawimage(2, map.custommmxoff+40 + (i * 12), map.custommmyoff+21 + (j * 9), false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
}
//normal size maps
if(map.customzoom==4){
if(map.cursorstate==1){
if (int(map.cursordelay / 4) % 2 == 0){
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.drawrect(40 + ((game.roomx - 100) * 48) +map.custommmxoff, 21 + ((game.roomy - 100) * 36)+map.custommmyoff , 48 , 36 , 255,255,255);
graphics.drawrect(40 + ((game.roomx - 100) * 48) + 2+map.custommmxoff, 21 + ((game.roomy - 100) * 36) + 2+map.custommmyoff, 48 - 4, 36 - 4, 255,255,255);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}else if (map.cursorstate == 2){
if (int(map.cursordelay / 15) % 2 == 0){
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.drawrect(40 + ((game.roomx - 100) * 48) + 2+map.custommmxoff, 21 + ((game.roomy - 100) * 36) + 2+map.custommmyoff, 48 - 4, 36 - 4, 16, 245 - (help.glow), 245 - (help.glow));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}else if(map.customzoom==2){
if(map.cursorstate==1){
if (int(map.cursordelay / 4) % 2 == 0){
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.drawrect(40 + ((game.roomx - 100) * 24)+map.custommmxoff , 21 + ((game.roomy - 100) * 18)+map.custommmyoff , 24 , 18 , 255,255,255);
graphics.drawrect(40 + ((game.roomx - 100) * 24) + 2+map.custommmxoff, 21 + ((game.roomy - 100) * 18) + 2+map.custommmyoff, 24 - 4, 18 - 4, 255,255,255);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}else if (map.cursorstate == 2){
if (int(map.cursordelay / 15) % 2 == 0){
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.drawrect(40 + ((game.roomx - 100) * 24) + 2+map.custommmxoff, 21 + ((game.roomy - 100) * 18) + 2+map.custommmyoff, 24 - 4, 18 - 4, 16, 245 - (help.glow), 245 - (help.glow));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}else{
if(map.cursorstate==1){
if (int(map.cursordelay / 4) % 2 == 0){
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.drawrect(40 + ((game.roomx - 100) * 12)+map.custommmxoff , 21 + ((game.roomy - 100) * 9)+map.custommmyoff , 12 , 9 , 255,255,255);
graphics.drawrect(40 + ((game.roomx - 100) * 12) + 2+map.custommmxoff, 21 + ((game.roomy - 100) * 9) + 2+map.custommmyoff, 12 - 4, 9 - 4, 255,255,255);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}else if (map.cursorstate == 2){
if (int(map.cursordelay / 15) % 2 == 0){
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.drawrect(40 + ((game.roomx - 100) * 12) + 2+map.custommmxoff, 21 + ((game.roomy - 100) * 9) + 2+map.custommmyoff, 12 - 4, 9 - 4, 16, 245 - (help.glow), 245 - (help.glow));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
Display trinkets on the minimap in custommode I don't really like how copy-pasted the minimap rendering code is, but whatever. We can refactor it later.
2020-06-30 22:19:56 +02:00
if(map.showtrinkets){
for(size_t i=0; i<map.shinytrinkets.size(); i++){
if(!obj.collect[i]){
int temp = 1086;
if(graphics.flipmode) temp += 3;
if(map.customzoom==4){
graphics.drawtile(40 + (map.shinytrinkets[i].x * 48) + 20+map.custommmxoff, 21 + (map.shinytrinkets[i].y * 36) + 14+map.custommmyoff, temp);
}else if(map.customzoom==2){
graphics.drawtile(40 + (map.shinytrinkets[i].x * 24) + 8+map.custommmxoff, 21 + (map.shinytrinkets[i].y * 18) + 5+map.custommmyoff, temp);
}else{
graphics.drawtile(40 + 3 + (map.shinytrinkets[i].x * 12) + map.custommmxoff, 22 + (map.shinytrinkets[i].y * 9) + map.custommmyoff, temp);
}
}
}
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
//draw the map image
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.drawpixeltextbox(35, 16, 250, 190, 32,24, 65, 185, 207,4,0);
graphics.drawimage(1, 40, 21, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//black out areas we can't see yet
for (int j = 0; j < 20; j++)
{
for (int i = 0; i < 20; i++)
{
if(map.explored[i+(j*20)]==0)
{
//Draw the fog of war on the map
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.drawimage(2, 40 + (i * 12), 21 + (j * 9), false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
//draw the coordinates
if (game.roomx == 109)
{
//tower!instead of room y, scale map.ypos
Move cursor delay update logic to maplogic() Otherwise it'll go really really fast. Incidentally this also basically de-duplicates it and results in less copy-pasted code overall.
2020-04-29 06:32:53 +02:00
if (map.cursorstate == 1)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
if (int(map.cursordelay / 4) % 2 == 0)
{
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.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);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
if (map.cursordelay > 30) map.cursorstate = 2;
}
else if (map.cursorstate == 2)
{
if (int(map.cursordelay / 15) % 2 == 0)
{
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.drawrect(40 + ((game.roomx - 100) * 12) + 2 , 21 + 2, 12 - 4, 180 - 4,16, 245 - (help.glow), 245 - (help.glow));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
else
{
Move cursor delay update logic to maplogic() Otherwise it'll go really really fast. Incidentally this also basically de-duplicates it and results in less copy-pasted code overall.
2020-04-29 06:32:53 +02:00
if (map.cursorstate == 1)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
if (int(map.cursordelay / 4) % 2 == 0)
{
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.drawrect(40 + ((game.roomx - 100) * 12) , 21 + ((game.roomy - 100) * 9) , 12 , 9 , 255,255,255);
graphics.drawrect(40 + ((game.roomx - 100) * 12) + 2, 21 + ((game.roomy - 100) * 9) + 2, 12 - 4, 9 - 4, 255,255,255);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
else if (map.cursorstate == 2)
{
if (int(map.cursordelay / 15) % 2 == 0)
{
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.drawrect(40 + ((game.roomx - 100) * 12) + 2, 21 + ((game.roomy - 100) * 9) + 2, 12 - 4, 9 - 4, 16, 245 - (help.glow), 245 - (help.glow));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
//draw legend details
Remove map.numteleporters This removes the separate length-tracking variable map.numteleporters, in favor of using map.teleporters.size().
2020-04-15 04:32:30 +02:00
for (size_t i = 0; i < map.teleporters.size(); i++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
if (map.showteleporters && map.explored[map.teleporters[i].x + (20 * map.teleporters[i].y)] > 0)
{
Remove global 'temp' variable from titlerender.cpp Just a miscellaneous code cleanup. There's no glitches that take advantage of the previous situation, namely that 'temp' was a global variable in Logic.cpp and editor.cpp. Even if there were, it seems like it would easily lead to some undefined behavior. So it's good to clean this up.
2020-04-03 03:50:37 +02:00
int temp = 1126 + map.explored[map.teleporters[i].x + (20 * map.teleporters[i].y)];
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) temp += 3;
graphics.drawtile(40 + 3 + (map.teleporters[i].x * 12), 22 + (map.teleporters[i].y * 9), temp);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else if(map.showtargets && map.explored[map.teleporters[i].x+(20*map.teleporters[i].y)]==0)
{
Remove global 'temp' variable from titlerender.cpp Just a miscellaneous code cleanup. There's no glitches that take advantage of the previous situation, namely that 'temp' was a global variable in Logic.cpp and editor.cpp. Even if there were, it seems like it would easily lead to some undefined behavior. So it's good to clean this up.
2020-04-03 03:50:37 +02:00
int temp = 1126 + map.explored[map.teleporters[i].x + (20 * map.teleporters[i].y)];
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) temp += 3;
graphics.drawtile(40 + 3 + (map.teleporters[i].x * 12), 22 + (map.teleporters[i].y * 9), temp);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
if (map.showtrinkets)
{
Remove map.numshinytrinkets This removes map.numshinytrinkets in favor of using map.shinytrinkets.size(). Having automatic length tracking is much less error-prone and less tedious.
2020-04-15 04:39:08 +02:00
for (size_t i = 0; i < map.shinytrinkets.size(); i++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Change obj.collect into a vector of bools It's already treated like a bunch of bools anyway, so might as well just formalize it.
2020-04-09 08:56:36 +02:00
if (!obj.collect[i])
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Remove global 'temp' variable from titlerender.cpp Just a miscellaneous code cleanup. There's no glitches that take advantage of the previous situation, namely that 'temp' was a global variable in Logic.cpp and editor.cpp. Even if there were, it seems like it would easily lead to some undefined behavior. So it's good to clean this up.
2020-04-03 03:50:37 +02:00
int temp = 1086;
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) temp += 3;
graphics.drawtile(40 + 3 + (map.shinytrinkets[i].x * 12), 22 + (map.shinytrinkets[i].y * 9), temp);
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
{
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.Print(0, 174, "SUPER GRAVITRON HIGHSCORE", 196, 196, 255 - help.glow, true);
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);
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.Print( 240, 124, "Best Time", 196, 196, 255 - help.glow, true);
graphics.bigrprint( 300, 94, tempstring, 196, 196, 255 - help.glow, true, 2);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
switch(game.swnbestrank)
{
case 0:
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.Print( -1, 40, "Next Trophy at 5 seconds", 196, 196, 255 - help.glow, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 1:
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.Print( -1, 40, "Next Trophy at 10 seconds", 196, 196, 255 - help.glow, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 2:
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.Print( -1, 40, "Next Trophy at 15 seconds", 196, 196, 255 - help.glow, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 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.Print( -1, 40, "Next Trophy at 20 seconds", 196, 196, 255 - help.glow, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 4:
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.Print( -1, 40, "Next Trophy at 30 seconds", 196, 196, 255 - help.glow, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 5:
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.Print( -1, 40, "Next Trophy at 1 minute", 196, 196, 255 - help.glow, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 6:
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.Print( -1, 40, "All Trophies collected!", 196, 196, 255 - help.glow, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
}
}
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.Print(0, 40, "SUPER GRAVITRON HIGHSCORE", 196, 196, 255 - help.glow, true);
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);
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.Print( 240, 90, "Best Time", 196, 196, 255 - help.glow, true);
graphics.bigrprint( 300, 104, tempstring, 196, 196, 255 - help.glow, true, 2);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
switch(game.swnbestrank)
{
case 0:
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.Print( -1, 174, "Next Trophy at 5 seconds", 196, 196, 255 - help.glow, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 1:
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.Print( -1, 174, "Next Trophy at 10 seconds", 196, 196, 255 - help.glow, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 2:
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.Print( -1, 174, "Next Trophy at 15 seconds", 196, 196, 255 - help.glow, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 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.Print( -1, 174, "Next Trophy at 20 seconds", 196, 196, 255 - help.glow, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 4:
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.Print( -1, 174, "Next Trophy at 30 seconds", 196, 196, 255 - help.glow, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 5:
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.Print( -1, 174, "Next Trophy at 1 minute", 196, 196, 255 - help.glow, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 6:
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.Print( -1, 174, "All Trophies collected!", 196, 196, 255 - help.glow, true);
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
{
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.Print(0, 105, "Press ACTION to warp to the ship.", 196, 196, 255 - help.glow, true);
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){
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
LevelMetaData& meta = ed.ListOfMetaData[game.playcustomlevel];
graphics.bigprint( -1, FLIP(45), meta.title, 196, 196, 255 - help.glow, true);
graphics.Print( -1, FLIP(70), "by " + meta.creator, 196, 196, 255 - help.glow, true);
graphics.Print( -1, FLIP(80), meta.website, 196, 196, 255 - help.glow, true);
graphics.Print( -1, FLIP(100), meta.Desc1, 196, 196, 255 - help.glow, true);
graphics.Print( -1, FLIP(110), meta.Desc2, 196, 196, 255 - help.glow, true);
graphics.Print( -1, FLIP(120), meta.Desc3, 196, 196, 255 - help.glow, true);
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
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
int remaining = ed.numcrewmates() - game.crewmates();
if(remaining==1){
graphics.Print(1,FLIP(165), help.number(remaining)+ " crewmate remains", 196, 196, 255 - help.glow, true);
}else if(remaining>0){
graphics.Print(1,FLIP(165), help.number(remaining)+ " crewmates remain", 196, 196, 255 - help.glow, true);
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);
graphics.printcrewnamestatus(44, 32 + (i * 64)+4, 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);
graphics.Print(44, 32 + (i * 64) + 4, "Missing...", 64,64,64);
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);
graphics.printcrewnamestatus(44+160, 32 + (i * 64)+4, (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);
graphics.Print(44+160, 32 + (i * 64) + 4, "Missing...", 64,64,64);
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);
graphics.printcrewnamestatus(44, 32 + (i * 64)+4+10, 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);
graphics.Print(44, 32 + (i * 64) + 4 + 10, "Missing...", 64,64,64);
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);
graphics.printcrewnamestatus(44+160, 32 + (i * 64)+4+10, 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);
graphics.Print(44+160, 32 + (i * 64) + 4 + 10, "Missing...", 64,64,64);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
}
break;
case 2:
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
#if !defined(NO_CUSTOM_LEVELS)
if(map.custommode)
{
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
{
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.Print(0, 164, "[Trinkets found]", 196, 196, 255 - help.glow, true);
Don't use separate variable for number of trinkets in level Same principle as removing the separate variable to track number of collected trinkets. This means it's less error-prone as we're no longer tracking number of trinkets separately. In the function that counts the number of trinkets, I would've liked to have used std::count_if(). However, the most optimal way would require using a lambda, and lambdas are too new for the C++ standard we're using. So I just bit the bullet and counted them manually.
2020-04-09 07:09:11 +02:00
graphics.Print(0, 152, help.number(game.trinkets()) + " out of " + help.number(ed.numtrinkets()), 96,96,96, true);
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.Print(0, 114, "[Number of Deaths]", 196, 196, 255 - help.glow, true);
graphics.Print(0, 102,help.String(game.deathcounts), 96,96,96, true);
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.Print(0, 64, "[Time Taken]", 196, 196, 255 - help.glow, true);
graphics.Print(0, 52, game.timestring(), 96, 96, 96, true);
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.Print(0, 52, "[Trinkets found]", 196, 196, 255 - help.glow, true);
Don't use separate variable for number of trinkets in level Same principle as removing the separate variable to track number of collected trinkets. This means it's less error-prone as we're no longer tracking number of trinkets separately. In the function that counts the number of trinkets, I would've liked to have used std::count_if(). However, the most optimal way would require using a lambda, and lambdas are too new for the C++ standard we're using. So I just bit the bullet and counted them manually.
2020-04-09 07:09:11 +02:00
graphics.Print(0, 64, help.number(game.trinkets()) + " out of "+help.number(ed.numtrinkets()), 96,96,96, true);
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.Print(0, 102, "[Number of Deaths]", 196, 196, 255 - help.glow, true);
graphics.Print(0, 114,help.String(game.deathcounts), 96,96,96, true);
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.Print(0, 152, "[Time Taken]", 196, 196, 255 - help.glow, true);
graphics.Print(0, 164, game.timestring(), 96, 96, 96, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
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
{
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
{
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.Print(0, 164, "[Trinkets found]", 196, 196, 255 - help.glow, true);
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
graphics.Print(0, 152, help.number(game.trinkets()) + " out of Twenty", 96,96,96, true);
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.Print(0, 114, "[Number of Deaths]", 196, 196, 255 - help.glow, true);
graphics.Print(0, 102,help.String(game.deathcounts), 96,96,96, true);
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.Print(0, 64, "[Time Taken]", 196, 196, 255 - help.glow, true);
graphics.Print(0, 52, game.timestring(), 96, 96, 96, true);
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.Print(0, 52, "[Trinkets found]", 196, 196, 255 - help.glow, true);
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
graphics.Print(0, 64, help.number(game.trinkets()) + " out of Twenty", 96,96,96, true);
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.Print(0, 102, "[Number of Deaths]", 196, 196, 255 - help.glow, true);
graphics.Print(0, 114,help.String(game.deathcounts), 96,96,96, true);
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.Print(0, 152, "[Time Taken]", 196, 196, 255 - help.glow, true);
graphics.Print(0, 164, game.timestring(), 96, 96, 96, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
break;
case 3:
if (game.inintermission)
{
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.Print(0, 115, "Cannot Save in Level Replay", 146, 146, 180, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else if (game.nodeathmode)
{
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.Print(0, 115, "Cannot Save in No Death Mode", 146, 146, 180, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else if (game.intimetrial)
{
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.Print(0, 115, "Cannot Save in Time Trial", 146, 146, 180, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else 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
graphics.Print(0, 115, "Cannot Save in Secret Lab", 146, 146, 180, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Add error message if quicksave fails
2020-11-04 03:45:33 +01:00
else if (game.gamesavefailed)
{
graphics.Print(0, 115, "ERROR: Could not save game!", 146, 146, 180, true);
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
else if (map.custommode)
{
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 (game.gamesaved)
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.Print(0, 36, "Game saved ok!", 255 - (help.glow / 2), 255 - (help.glow / 2), 255 - (help.glow / 2), true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Make game save box 16 pixels wider While I'm going to fix #376 anyway to make longer numbers (like Seventy Eight) fit, I decided to also make the box a little wider in advance of the game being localized, those extra chars could be a lifesaver, while you wouldn't really notice the difference if you play the game in English.
2020-08-02 23:38:40 +02:00
graphics.drawpixeltextbox(17, 65, 286, 90, 36,12, 65, 185, 207,0,4);
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
{
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.Print(0, 122, game.customleveltitle, 25, 255 - (help.glow / 2), 255 - (help.glow / 2), true);
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
graphics.Print(59, 78, game.savetime, 255 - (help.glow / 2), 255 - (help.glow / 2), 255 - (help.glow / 2));
const std::string& trinketcount = help.number(game.savetrinkets);
graphics.Print(262-graphics.len(trinketcount), 78, trinketcount, 255 - (help.glow / 2), 255 - (help.glow / 2), 255 - (help.glow / 2));
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
graphics.drawsprite(34, 74, 50, graphics.col_clock);
graphics.drawsprite(270, 74, 22, graphics.col_trinket);
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.Print(0, 90, game.customleveltitle, 25, 255 - (help.glow / 2), 255 - (help.glow / 2), true);
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
graphics.Print(59, 132, game.savetime, 255 - (help.glow / 2), 255 - (help.glow / 2), 255 - (help.glow / 2));
const std::string& trinketcount = help.number(game.savetrinkets);
graphics.Print(262-graphics.len(trinketcount), 132, trinketcount, 255 - (help.glow / 2), 255 - (help.glow / 2), 255 - (help.glow / 2));
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
graphics.drawsprite(34, 126, 50, graphics.col_clock);
graphics.drawsprite(270, 126, 22, graphics.col_trinket);
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.Print(0, 80, "[Press ACTION to save your game]", 255 - (help.glow * 2), 255 - (help.glow * 2), 255 - help.glow, true);
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
{
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.Print(0, 186, "(Note: The game is autosaved", 146, 146, 180, true);
graphics.Print(0, 174, "at every teleporter.)", 146, 146, 180, true);
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.Print(0, 174, "(Note: The game is autosaved", 146, 146, 180, true);
graphics.Print(0, 186, "at every teleporter.)", 146, 146, 180, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
if (game.gamesaved)
{
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.Print(0, 36, "Game saved ok!", 255 - (help.glow / 2), 255 - (help.glow / 2), 255 - (help.glow / 2), true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Make game save box 16 pixels wider While I'm going to fix #376 anyway to make longer numbers (like Seventy Eight) fit, I decided to also make the box a little wider in advance of the game being localized, those extra chars could be a lifesaver, while you wouldn't really notice the difference if you play the game in English.
2020-08-02 23:38:40 +02:00
graphics.drawpixeltextbox(17, 65, 286, 90, 36,12, 65, 185, 207,0,4);
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
{
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.Print(0, 132, game.savearea, 25, 255 - (help.glow / 2), 255 - (help.glow / 2), true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
for (int i = 0; i < 6; 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(169-(3*42)+(i*42), 98, i, game.crewstats[i], true);
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
graphics.Print(59, 78, game.savetime, 255 - (help.glow / 2), 255 - (help.glow / 2), 255 - (help.glow / 2));
const std::string& trinketcount = help.number(game.savetrinkets);
graphics.Print(262-graphics.len(trinketcount), 78, trinketcount, 255 - (help.glow / 2), 255 - (help.glow / 2), 255 - (help.glow / 2));
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
graphics.drawsprite(34, 74, 50, graphics.col_clock);
graphics.drawsprite(270, 74, 22, graphics.col_trinket);
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.Print(0, 80, game.savearea, 25, 255 - (help.glow / 2), 255 - (help.glow / 2), true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
for (int i = 0; i < 6; 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(169-(3*42)+(i*42), 95, i, game.crewstats[i], true);
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
graphics.Print(59, 132, game.savetime, 255 - (help.glow / 2), 255 - (help.glow / 2), 255 - (help.glow / 2));
const std::string& trinketcount = help.number(game.savetrinkets);
graphics.Print(262-graphics.len(trinketcount), 132, trinketcount, 255 - (help.glow / 2), 255 - (help.glow / 2), 255 - (help.glow / 2));
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
graphics.drawsprite(34, 126, 50, graphics.col_clock);
graphics.drawsprite(270, 126, 22, graphics.col_trinket);
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.Print(0, 80, "[Press ACTION to save your game]", 255 - (help.glow * 2), 255 - (help.glow * 2), 255 - help.glow, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if (game.quicksummary != "")
{
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
{
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.Print(0, 110, "Last Save:", 164 - (help.glow / 4), 164 - (help.glow / 4), 164, true);
graphics.Print(0, 100, game.quicksummary, 164 - (help.glow / 4), 164 - (help.glow / 4), 164, true);
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.Print(0, 100, "Last Save:", 164 - (help.glow / 4), 164 - (help.glow / 4), 164, true);
graphics.Print(0, 110, game.quicksummary, 164 - (help.glow / 4), 164 - (help.glow / 4), 164, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
}
break;
case 10:
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.Print(128, 220, "[ 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
{
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.Print(0, 135, "Return to main menu?", 196, 196, 255 - help.glow, true);
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.Print(0, 142, "Do you want to quit? You will", 196, 196, 255 - help.glow, true);
graphics.Print(0, 130, "lose any unsaved progress.", 196, 196, 255 - help.glow, true);
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.Print(80-16, 88, "[ NO, KEEP PLAYING ]", 196, 196, 255 - help.glow);
graphics.Print(80 + 32, 76, "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
{
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.Print(0, 80, "Return to main menu?", 196, 196, 255 - help.glow, true);
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.Print(0, 76, "Do you want to quit? You will", 196, 196, 255 - help.glow, true);
graphics.Print(0, 88, "lose any unsaved progress.", 196, 196, 255 - help.glow, true);
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.Print(80-16, 130, "[ NO, KEEP PLAYING ]", 196, 196, 255 - help.glow);
graphics.Print(80 + 32, 142, "yes, quit to menu", 96, 96, 96);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
break;
case 11:
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.Print(128, 220, "[ 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
{
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.Print(0, 135, "Return to main menu?", 196, 196, 255 - help.glow, true);
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.Print(0, 142, "Do you want to quit? You will", 196, 196, 255 - help.glow, true);
graphics.Print(0, 130, "lose any unsaved progress.", 196, 196, 255 - help.glow, true);
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.Print(80, 88, "no, keep playing", 96,96,96);
graphics.Print(80+32-16, 76, "[ 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
{
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.Print(0, 80, "Return to main menu?", 196, 196, 255 - help.glow, true);
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.Print(0, 76, "Do you want to quit? You will", 196, 196, 255 - help.glow, true);
graphics.Print(0, 88, "lose any unsaved progress.", 196, 196, 255 - help.glow, true);
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.Print(80, 130, "no, keep playing", 96,96,96);
graphics.Print(80+32-16, 142, "[ YES, QUIT TO MENU ]", 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
break;
case 20:
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.Print(128, 220, "[ GRAVITRON ]", 196, 196, 255 - help.glow, true);
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
{
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.Print(0, 76, "the secret laboratory?", 196, 196, 255 - help.glow, true);
graphics.Print(0, 88, "Do you want to return to", 196, 196, 255 - help.glow, true);
graphics.Print(80-16, 142, "[ NO, KEEP PLAYING ]", 196, 196, 255 - help.glow);
graphics.Print(80 + 32, 130, "yes, return", 96, 96, 96);
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.Print(0, 76, "Do you want to return to", 196, 196, 255 - help.glow, true);
graphics.Print(0, 88, "the secret laboratory?", 196, 196, 255 - help.glow, true);
graphics.Print(80-16, 130, "[ NO, KEEP PLAYING ]", 196, 196, 255 - help.glow);
graphics.Print(80 + 32, 142, "yes, return", 96, 96, 96);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
break;
case 21:
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.Print(128, 220, "[ GRAVITRON ]", 196, 196, 255 - help.glow, true);
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
{
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.Print(0, 76, "the secret laboratory?", 196, 196, 255 - help.glow, true);
graphics.Print(0, 88, "Do you want to return to", 196, 196, 255 - help.glow, true);
graphics.Print(80, 142, "no, keep playing", 96, 96, 96);
graphics.Print(80 + 32-16, 130, "[ YES, RETURN ]", 196, 196, 255 - help.glow);
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.Print(0, 76, "Do you want to return to", 196, 196, 255 - help.glow, true);
graphics.Print(0, 88, "the secret laboratory?", 196, 196, 255 - help.glow, true);
graphics.Print(80, 130, "no, keep playing", 96, 96, 96);
graphics.Print(80 + 32-16, 142, "[ YES, RETURN ]", 196, 196, 255 - help.glow);
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
if (game.glitchrunnermode || graphics.fademode == 3 || graphics.fademode == 5)
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
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
{
Render screen effects in maprender() I had forgotten that the game flashed and did screen-shaking when you pressed ACTION to quicksave. While testing for my over-30-FPS patch I stumbled across this.
2020-04-30 01:02:17 +02:00
graphics.renderwithscreeneffects();
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
void teleporterrender()
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
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
FillRect(graphics.backBuffer, 0x000000);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
int tempx;
int tempy;
//draw screen alliteration
//Roomname:
Remove global 'temp' variable from titlerender.cpp Just a miscellaneous code cleanup. There's no glitches that take advantage of the previous situation, namely that 'temp' was a global variable in Logic.cpp and editor.cpp. Even if there were, it seems like it would easily lead to some undefined behavior. So it's good to clean this up.
2020-04-03 03:50:37 +02:00
int temp = map.area(game.roomx, game.roomy);
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 (temp < 2 && !map.custommode && graphics.fademode==0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor how "hidden names" work By "hidden names", I'm referring to "Dimension VVVVVV" and "The Ship" popping up on the quit/pause/teleporter screens, even though those rooms don't have any roomnames. Apparently my commit to fix roomname re-draw bleed on the quit/pause/teleporter screens exposed yet another hardreset()-caused bug. The issue here is that since hardreset() sets game.roomx and game.roomy to 0, map.area() will no longer work properly, and since the hidden roomname check is based on map.area(), it will no longer display "Dimension VVVVVV" or "The Ship" once you press ACTION to quit. It used to do this due to the re-draw bleed, but now it doesn't. I saw that roomnames didn't get reset in hardreset(), so the solution here is to re-factor hidden names to be an actual variable, instead of being implicit. map.hiddenname is a variable that's set in mapclass::loadlevel(), and if isn't empty, it will be drawn on the quit/pause/teleporter screens. That way it will still display "Dimension VVVVVV" and "The Ship" when you press ACTION to quit to the menu. EDIT: Since PR #230 got merged, this commit is no longer strictly necessary, but it's still good to refactor hidden names like this.
2020-05-02 23:10:22 +02:00
graphics.Print(5, 2, map.hiddenname, 196, 196, 255 - help.glow, true);
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.Print(5, 2, map.roomname, 196, 196, 255 - help.glow, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
//Background color
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
FillRect(graphics.backBuffer, 0, 12, 320, 240, 10, 24, 26);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//draw the map image
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.drawpixeltextbox(35, 16, 250, 190, 32,24, 65, 185, 207,4,0);
graphics.drawimage(1, 40, 21, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//black out areas we can't see yet
for (int j = 0; j < 20; j++)
{
for (int i = 0; i < 20; i++)
{
if(map.explored[i+(j*20)]==0)
{
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.drawfillrect(10 + (i * 12), 21 + (j * 9), 12, 9, 16, 16, 16);
graphics.drawimage(2, 40 + (i * 12), 21 + (j * 9), false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
//draw the coordinates //current
if (game.roomx == 109)
{
//tower!instead of room y, scale map.ypos
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.drawrect(40 + ((game.roomx - 100) * 12) + 2, 21 + 2, 12 - 4, 180 - 4, 16, 245 - (help.glow * 2), 245 - (help.glow * 2));
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.drawrect(40 + ((game.roomx - 100) * 12) + 2, 21 + ((game.roomy - 100) * 9) + 2, 12 - 4, 9 - 4, 16, 245 - (help.glow * 2), 245 - (help.glow * 2));
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 variables shadowing other variables In C++, when you have two variables in different scopes with the same name, the inner scope wins. Except you have to be really careful because sometimes they're not (#507). So it's better to just always have unique variable names and make sure to never clash a name with a variable in an outer scope - after all, the C++ compiler and standard might be fine with it, but that doesn't mean humans can't make mistakes reading or writing it. Usually I just renamed the inner variables, but for tx/ty in editor.cpp, I just got rid of the ridiculous overcomplicated modulo calculations and replaced them with actual simple modulo calculations, because the existing ones were just ridiculous. Actually, somebody ought to find every instance of the overcomplicated modulos and replace them with the actual good ones, because it's really stupid, quite frankly...
2020-11-04 09:37:46 +01:00
int tempx_ = map.teleporters[game.teleport_to_teleporter].x;
int tempy_ = map.teleporters[game.teleport_to_teleporter].y;
graphics.drawrect(40 + (tempx_ * 12) + 1, 21 + (tempy_ * 9) + 1, 12 - 2, 9 - 2, 245 - (help.glow * 2), 16, 16);
graphics.drawrect(40 + (tempx_ * 12) + 3, 21 + (tempy_ * 9) + 3, 12 - 6, 9 - 6, 245 - (help.glow * 2), 16, 16);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
//draw legend details
Remove map.numteleporters This removes the separate length-tracking variable map.numteleporters, in favor of using map.teleporters.size().
2020-04-15 04:32:30 +02:00
for (size_t i = 0; i < map.teleporters.size(); i++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
if (map.showteleporters && map.explored[map.teleporters[i].x + (20 * map.teleporters[i].y)] > 0)
{
temp = 1126 + map.explored[map.teleporters[i].x + (20 * map.teleporters[i].y)];
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) temp += 3;
graphics.drawtile(40 + 3 + (map.teleporters[i].x * 12), 22 + (map.teleporters[i].y * 9), temp);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else if(map.showtargets && map.explored[map.teleporters[i].x+(20*map.teleporters[i].y)]==0)
{
temp = 1126 + map.explored[map.teleporters[i].x + (20 * map.teleporters[i].y)];
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) temp += 3;
graphics.drawtile(40 + 3 + (map.teleporters[i].x * 12), 22 + (map.teleporters[i].y * 9), temp);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
if (map.showtrinkets)
{
Remove map.numshinytrinkets This removes map.numshinytrinkets in favor of using map.shinytrinkets.size(). Having automatic length tracking is much less error-prone and less tedious.
2020-04-15 04:39:08 +02:00
for (size_t i = 0; i < map.shinytrinkets.size(); i++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Change obj.collect into a vector of bools It's already treated like a bunch of bools anyway, so might as well just formalize it.
2020-04-09 08:56:36 +02:00
if (!obj.collect[i])
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
temp = 1086;
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) temp += 3;
graphics.drawtile(40 + 3 + (map.shinytrinkets[i].x * 12), 22 + (map.shinytrinkets[i].y * 9), temp);
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
tempx = map.teleporters[game.teleport_to_teleporter].x;
tempy = map.teleporters[game.teleport_to_teleporter].y;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if (game.useteleporter && ((help.slowsine%16)>8))
{
//colour in the legend
temp = 1128;
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) temp += 3;
graphics.drawtile(40 + 3 + (tempx * 12), 22 + (tempy * 9), temp);
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)
{
//Instructions!
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.Print(5, 210, "Press Left/Right to choose a Teleporter", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true);
graphics.Print(5, 225, "Press ENTER to Teleport", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true);
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
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
{
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 (game.advancetext) graphics.bprint(5, 228, "- Press ACTION to advance text -", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true);
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 (game.advancetext) graphics.bprint(5, 5, "- Press ACTION to advance text -", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true);
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
{
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
}
}