Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Level debugger #985

Merged
merged 13 commits into from
Nov 20, 2023
1 change: 1 addition & 0 deletions desktop_version/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ set(VVV_SRC
src/Input.cpp
src/KeyPoll.cpp
src/Labclass.cpp
src/LevelDebugger.cpp
src/Localization.cpp
src/LocalizationMaint.cpp
src/LocalizationStorage.cpp
Expand Down
1 change: 1 addition & 0 deletions desktop_version/lang/en/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,7 @@
<string english="- Press {button} to advance text -" translation="" explanation="to dismiss a textbox. Expect `ACTION`" max="40"/>
<string english="Press ACTION to continue" translation="" explanation="***OUTDATED***" max="34"/>
<string english="Press {button} to continue" translation="" explanation="Expect `ACTION`" max="34"/>
<string english="[Press {button} to toggle gameplay]" translation="" explanation="Tab toggles whether the game is paused or not" max="39"/>
<string english="Current Time" translation="" explanation="super gravitron, stopwatch time" max="20"/>
<string english="Best Time" translation="" explanation="super gravitron, best stopwatch time" max="20"/>
<string english="Next Trophy at 5 seconds" translation="" explanation="" max="38*2"/>
Expand Down
3 changes: 2 additions & 1 deletion desktop_version/src/Game.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "Font.h"
#include "GlitchrunnerMode.h"
#include "Graphics.h"
#include "LevelDebugger.h"
#include "Localization.h"
#include "LocalizationStorage.h"
#include "KeyPoll.h"
Expand Down Expand Up @@ -7527,7 +7528,7 @@ int Game::get_timestep(void)

bool Game::physics_frozen(void)
{
return roomname_translator::is_pausing();
return roomname_translator::is_pausing() || level_debugger::is_pausing();
}

bool Game::incompetitive(void)
Expand Down
7 changes: 7 additions & 0 deletions desktop_version/src/Input.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "Graphics.h"
#include "GraphicsUtil.h"
#include "KeyPoll.h"
#include "LevelDebugger.h"
#include "Localization.h"
#include "LocalizationMaint.h"
#include "LocalizationStorage.h"
Expand Down Expand Up @@ -2436,6 +2437,12 @@ void gameinput(void)
game.press_map = true;
}

level_debugger::input();
if (level_debugger::is_pausing())
{
return;
}

if (game.advancetext)
{
if (game.pausescript)
Expand Down
Loading