Skip to content

Commit

Permalink
Remove system messages in replays
Browse files Browse the repository at this point in the history
  • Loading branch information
poco0317 committed Oct 6, 2018
1 parent f40dd5b commit 56a02aa
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ scroller =
givenrate = SCREENMAN:GetTopScreen():SetReplayRate(newrate)
if givenrate ~= nil then
realnewrate = notShit.round(givenrate, 3)
SCREENMAN:SystemMessage(string.format("Set rate to %f", realnewrate))
--SCREENMAN:SystemMessage(string.format("Set rate to %f", realnewrate))
end
end,
ReplayPauseToggleCommand = function(self)
Expand Down
14 changes: 12 additions & 2 deletions src/ScreenGameplay.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2852,13 +2852,13 @@ ScreenGameplay::ToggleReplayPause()
m_pSoundMusic->Play(false, &p);
GAMESTATE->m_Position.m_fMusicSeconds = fSeconds;
UpdateSongPosition(0);
SCREENMAN->SystemMessage("Unpaused Replay");
// SCREENMAN->SystemMessage("Unpaused Replay");
} else {
// Almost all of gameplay is based on the music moving.
// If the music is paused, nothing works.
// This is all we have to do.
m_pSoundMusic->Pause(newPause);
SCREENMAN->SystemMessage("Paused Replay");
// SCREENMAN->SystemMessage("Paused Replay");
}
GAMESTATE->SetPaused(newPause);
}
Expand Down Expand Up @@ -2961,13 +2961,17 @@ class LunaScreenGameplay : public Luna<ScreenGameplay>
{
float newpos = FArg(1);
if (!GAMESTATE->GetPaused()) {
/*
SCREENMAN->SystemMessage(
"You must be paused to move the song position of a Replay.");
*/
return 0;
}
if (GamePreferences::m_AutoPlay != PC_REPLAY) {
/*
SCREENMAN->SystemMessage(
"You cannot move the song position outside of a Replay.");
*/
return 0;
}
p->SetSongPosition(newpos);
Expand All @@ -2977,14 +2981,18 @@ class LunaScreenGameplay : public Luna<ScreenGameplay>
{
float newrate = FArg(1);
if (!GAMESTATE->GetPaused()) {
/*
SCREENMAN->SystemMessage(
"You must be paused to change the rate of a Replay.");
*/
lua_pushnumber(L, -1.f);
return 0;
}
if (GamePreferences::m_AutoPlay != PC_REPLAY) {
/*
SCREENMAN->SystemMessage(
"You cannot change the rate outside of a Replay.");
*/
lua_pushnumber(L, -1.f);
return 0;
}
Expand All @@ -2994,8 +3002,10 @@ class LunaScreenGameplay : public Luna<ScreenGameplay>
static int ToggleReplayPause(T* p, lua_State* L)
{
if (GamePreferences::m_AutoPlay != PC_REPLAY) {
/*
SCREENMAN->SystemMessage(
"You cannot pause the game outside of a Replay.");
*/
return 0;
}
p->ToggleReplayPause();
Expand Down

0 comments on commit 56a02aa

Please sign in to comment.