1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2025-01-10 19:09:45 +01:00
VVVVVV/desktop_version/src
Misa da6c524db5 Don't use map.extrarow for menu animations
This fixes all the headaches about map.extrarow having to be the correct
value and which way it should be and whatnot. The latest headache was
the detection that prevent user-initiated menu animations while an
animation was already happening being tripped because
graphics.menuoffset would be 230 (due to closing the menu while being in
a room without a room name), but then going to a room with a room name
would check for 240 instead, and 230 is less than 240. (The numbers are
the wrong way round because I got the ternaries the wrong way round, but
even if the numbers are the correct way round, the bug would still
happen, but it would just be reversed.)

So instead, I've just made it 240 for both. This doesn't change the
duration of the menu animation (because the animation moves in
increments of 25, and 230 / 25 == 240 / 25 under integer division). It
might change the animation slightly, but it was already inconsistent
anyway because map.extrarow was always set to be 1 in custom levels, and
I legitimately would not be able to tell the difference without
recording the animations and nitpicking it frame-by-frame.

Fixes #841.
2021-09-03 17:13:03 -07:00
..
BinaryBlob.cpp Replace all print calls with vlog calls 2021-09-01 14:34:55 -07:00
BinaryBlob.h Remove data/ from track name list, refactor music loading, and support loose ogg music 2021-08-31 15:30:23 -07:00
BlockV.cpp Remove unused x and y attributes of blockclass 2021-02-27 18:27:28 -05:00
BlockV.h Remove unused x and y attributes of blockclass 2021-02-27 18:27:28 -05:00
Credits.h Move Misa to C++ credits 2021-08-31 23:22:22 -07:00
CustomLevels.cpp Remove EditorData and put its attributes on customlevelclass 2021-09-01 15:30:02 -07:00
CustomLevels.h Remove EditorData and put its attributes on customlevelclass 2021-09-01 15:30:02 -07:00
DeferCallbacks.c Add deferred callbacks to game loop 2021-03-21 02:55:42 -04:00
DeferCallbacks.h Add deferred callbacks to game loop 2021-03-21 02:55:42 -04:00
Editor.cpp Remove EditorData and put its attributes on customlevelclass 2021-09-01 15:30:02 -07:00
Editor.h Move all editor-specific attributes to a new editorclass 2021-09-01 15:30:02 -07:00
Ent.cpp Fix regression: quick stopping changing drawframe 2021-07-28 20:11:16 -04:00
Ent.h Fix regression: quick stopping changing drawframe 2021-07-28 20:11:16 -04:00
Entity.cpp Rename edlevelclass to RoomProperty 2021-09-01 15:30:02 -07:00
Entity.h Refactor colors in internal commands 2021-08-31 15:09:51 -07:00
Enums.h Hello WWWWWWorld! 2020-01-08 10:37:50 -05:00
Exit.h Add VVV_exit() 2021-02-15 23:07:35 -05:00
FileSystemUtils.cpp Call FS.syncfs on Emscripten (#838) 2021-09-02 13:19:51 -04:00
FileSystemUtils.h Call FS.syncfs on Emscripten (#838) 2021-09-02 13:19:51 -04:00
Finalclass.cpp Separate includes into sections and alphabetize them 2020-07-19 21:37:40 -04:00
Finalclass.h Remove unnecessary includes from header files 2020-07-19 21:37:40 -04:00
Game.cpp Don't use map.extrarow for menu animations 2021-09-03 17:13:03 -07:00
Game.h Prevent user-initiated map menu changes during menu animations 2021-09-02 12:21:46 -07:00
GlitchrunnerMode.c Split glitchrunner mode into multiple versions 2021-08-05 13:35:21 -04:00
GlitchrunnerMode.h Split glitchrunner mode into multiple versions 2021-08-05 13:35:21 -04:00
GOGNetwork.c Explicitly declare void for all void parameter functions (#628) 2021-02-25 17:23:59 -05:00
Graphics.cpp Rename edlevelclass to RoomProperty 2021-09-01 15:30:02 -07:00
Graphics.h Do not close game if custom level has assets issues 2021-08-10 16:33:52 -04:00
GraphicsResources.cpp Replace all print calls with vlog calls 2021-09-01 14:34:55 -07:00
GraphicsResources.h Consistently use angle brackets for SDL.h includes 2020-07-19 21:37:40 -04:00
GraphicsUtil.cpp Remove unnecessary Sint16 casts 2021-04-18 14:55:33 -04:00
GraphicsUtil.h Add ClearSurface() 2021-02-25 19:38:25 -05:00
Input.cpp Correct onground/onroof check 2021-09-02 16:09:06 -07:00
Input.h Explicitly declare void for all void parameter functions (#628) 2021-02-25 17:23:59 -05:00
KeyPoll.cpp Replace all print calls with vlog calls 2021-09-01 14:34:55 -07:00
KeyPoll.h Separate pressing Enter to open map from pressing Enter to interact 2021-05-19 00:04:00 -07:00
Labclass.cpp Separate includes into sections and alphabetize them 2020-07-19 21:37:40 -04:00
Labclass.h Remove unnecessary includes from header files 2020-07-19 21:37:40 -04:00
Logic.cpp Axe screen_transition variable in favor of roomchange 2021-08-31 09:25:47 -07:00
Logic.h Explicitly declare void for all void parameter functions (#628) 2021-02-25 17:23:59 -05:00
main.cpp Call teleporterrenderfixed in TELEPORTERMODE 2021-09-02 11:46:56 -07:00
MakeAndPlay.h Use multiline comments in C files 2021-04-17 00:50:04 -04:00
Map.cpp Rename edentity to customentities 2021-09-01 15:30:02 -07:00
Map.h Allow custom levels to use 2 billion tile numbers once again 2021-08-22 21:30:53 -07:00
Maths.h Explicitly declare void for all void parameter functions (#628) 2021-02-25 17:23:59 -05:00
Music.cpp Only reset fade booleans when music is actually played 2021-09-03 16:38:34 -07:00
Music.h Fix fade volume durations being incorrect 2021-04-27 20:33:44 -04:00
Network.c Suppress unused i warning if NUM_BACKENDS is 0 2021-08-31 23:12:38 -07:00
Network.h Explicitly declare void for all void parameter functions (#628) 2021-02-25 17:23:59 -05:00
Otherlevel.cpp Refactor colors in internal commands 2021-08-31 15:09:51 -07:00
Otherlevel.h Set Secret Lab/Super Gravitron hidden names 2021-08-22 20:33:03 -07:00
preloader.cpp Change all surface-clearing FillRect()s to use ClearSurface() 2021-02-25 19:38:25 -05:00
preloader.h Explicitly declare void for all void parameter functions (#628) 2021-02-25 17:23:59 -05:00
Render.cpp Move all editor-specific attributes to a new editorclass 2021-09-01 15:30:02 -07:00
Render.h Explicitly declare void for all void parameter functions (#628) 2021-02-25 17:23:59 -05:00
RenderFixed.cpp Don't use map.extrarow for menu animations 2021-09-03 17:13:03 -07:00
RenderFixed.h Remove now-unneeded deltaframe fix when going to in-game settings 2021-03-21 02:55:42 -04:00
Screen.cpp Simplify Flip Mode rendering code with SDL_RenderCopyEx 2021-09-01 14:44:59 -07:00
Screen.h Simplify Flip Mode rendering code with SDL_RenderCopyEx 2021-09-01 14:44:59 -07:00
ScreenSettings.h Explicitly declare void for all void parameter functions (#628) 2021-02-25 17:23:59 -05:00
Script.cpp gamemode(teleporter): Set gamestate to GAMEMODE 2021-09-02 12:23:17 -07:00
Script.h createentity command: Actually have p1/p2/p3/p4 defaults 2021-08-12 00:20:40 -04:00
Scripts.cpp Add message when player is kicked out of Super Gravitron 2021-09-03 12:08:31 -07:00
SoundSystem.cpp Replace all print calls with vlog calls 2021-09-01 14:34:55 -07:00
SoundSystem.h Explicitly declare void for all void parameter functions (#628) 2021-02-25 17:23:59 -05:00
Spacestation2.cpp Separate includes into sections and alphabetize them 2020-07-19 21:37:40 -04:00
Spacestation2.h Remove unnecessary includes from header files 2020-07-19 21:37:40 -04:00
SteamNetwork.c Replace all print calls with vlog calls 2021-09-01 14:34:55 -07:00
TerminalScripts.cpp Revert "Change final stretch song to Piercing the Sky" 2021-05-20 23:01:43 -04:00
Textbox.cpp Don't update crewmate colors in text boxes every deltaframe 2021-05-18 21:17:06 -04:00
Textbox.h Don't update crewmate colors in text boxes every deltaframe 2021-05-18 21:17:06 -04:00
ThirdPartyDeps.c Use multiline comments in C files 2021-04-17 00:50:04 -04:00
Tower.cpp Explicitly declare void for all void parameter functions (#628) 2021-02-25 17:23:59 -05:00
Tower.h Explicitly declare void for all void parameter functions (#628) 2021-02-25 17:23:59 -05:00
TowerBG.h Move mapclass r/g/b variables off onto TowerBG 2021-01-07 21:15:34 -05:00
Unused.h Factor out UNUSED macro to header file 2021-05-25 15:23:34 -04:00
UtilityClass.cpp Factor out "between" calculation to macro and func 2021-05-25 15:23:34 -04:00
UtilityClass.h Replace all print calls with vlog calls 2021-09-01 14:34:55 -07:00
Version.h Don't recompile all files when the commit hash is changed 2020-12-25 20:17:01 -05:00
Version.h.in Don't recompile all files when the commit hash is changed 2020-12-25 20:17:01 -05:00
Vlogging.c Add debug logs 2021-09-01 14:34:55 -07:00
Vlogging.h Add debug logs 2021-09-01 14:34:55 -07:00
WarpClass.cpp Separate includes into sections and alphabetize them 2020-07-19 21:37:40 -04:00
WarpClass.h Remove unnecessary includes from header files 2020-07-19 21:37:40 -04:00
XMLUtils.cpp Move all settings to settings.vvv 2020-11-04 12:06:57 -05:00
XMLUtils.h Move all settings to settings.vvv 2020-11-04 12:06:57 -05:00
Xoshiro.c Replace Gravitron RNG with seeded Xoshiro 2021-08-27 12:28:35 -07:00
Xoshiro.h Replace Gravitron RNG with seeded Xoshiro 2021-08-27 12:28:35 -07:00