mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 10:09:43 +01:00
Code Issues Releases Wiki Activity

Haiku: Keep the option visible, but note the bug

Browse source
This commit is contained in:
Ethan Lee 2020-07-08 14:43:04 -04:00
parent 86fde7bf99
commit 2716296a10
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
desktop_version/src/Game.cpp
View file

@ -6833,9 +6833,7 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ )
option("toggle filter"); option("toggle filter");
option("toggle analogue"); option("toggle analogue");
option("toggle fps"); option("toggle fps");
#ifndef __HAIKU__ // FIXME: Remove after SDL VSync bug is fixed! -flibit
option("toggle vsync"); option("toggle vsync");
#endif
option("return"); option("return");
menuyoff = -10; menuyoff = -10;
break; break;

4
desktop_version/src/Input.cpp
View file

@ -367,15 +367,15 @@ void menuactionpress()
game.over30mode = !game.over30mode; game.over30mode = !game.over30mode;
game.savestats(); game.savestats();
break; break;
#ifndef __HAIKU__ // FIXME: Remove after SDL VSync bug is fixed! -flibit
case 6: case 6:
//toggle vsync //toggle vsync
music.playef(11); music.playef(11);
#ifndef __HAIKU__ // FIXME: Remove after SDL VSync bug is fixed! -flibit
graphics.screenbuffer->vsync = !graphics.screenbuffer->vsync; graphics.screenbuffer->vsync = !graphics.screenbuffer->vsync;
graphics.screenbuffer->resetRendererWorkaround(); graphics.screenbuffer->resetRendererWorkaround();
game.savestats(); game.savestats();
break;
#endif #endif
break;
default: default:
//back //back
music.playef(11); music.playef(11);

6
desktop_version/src/Render.cpp
View file

@ -228,10 +228,13 @@ void menurender()
graphics.Print(-1, 95, "Current mode: Over 30 FPS", tr, tg, tb, true); graphics.Print(-1, 95, "Current mode: Over 30 FPS", tr, tg, tb, true);
} }
break; break;
#ifndef __HAIKU__ // FIXME: Remove after SDL VSync bug is fixed! -flibit
case 6: case 6:
graphics.bigprint(-1, 30, "Toggle VSync", tr, tg, tb, true); graphics.bigprint(-1, 30, "Toggle VSync", tr, tg, tb, true);
#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
graphics.Print(-1, 65, "Turn VSync on or off.", tr, tg, tb, true); graphics.Print(-1, 65, "Turn VSync on or off.", tr, tg, tb, true);
#endif
if (!graphics.screenbuffer->vsync) if (!graphics.screenbuffer->vsync)
{ {
@ -242,7 +245,6 @@ void menurender()
graphics.Print(-1, 95, "Current mode: VSYNC ON", tr, tg, tb, true); graphics.Print(-1, 95, "Current mode: VSYNC ON", tr, tg, tb, true);
} }
break; break;
#endif
} }
break; break;
case Menu::credits: case Menu::credits: