thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-02-27 07:51:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Display Z button

Browse source
This commit is contained in:
Sally Coolatta 2023-08-25 08:16:16 -04:00
parent 764010b3ab
commit 71e068a8b6
2 changed files with 32 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/k_dialogue.cpp
View file

@ -26,6 +26,7 @@
#include "r_skins.h"
#include "s_sound.h"
#include "z_zone.h"
#include "k_hud.h"
#include "v_draw.hpp"
@ -36,7 +37,6 @@ using srb2::Dialogue;
void Dialogue::Init(void)
{
active = true;
dismissable = false;
syllable = true;
}
@ -190,6 +190,19 @@ void Dialogue::WriteText(void)
textDone = (textTimer <= 0 && textDest.empty());
}
bool Dialogue::Held(void)
{
return ((players[serverplayer].cmd.buttons & BT_VOTE) == BT_VOTE);
}
bool Dialogue::Pressed(void)
{
return (
((players[serverplayer].cmd.buttons & BT_VOTE) == BT_VOTE) &&
((players[serverplayer].oldcmd.buttons & BT_VOTE) == 0)
);
}
void Dialogue::CompleteText(void)
{
while (!textDest.empty())
@ -235,12 +248,7 @@ void Dialogue::Tick(void)
if (Dismissable() == true)
{
bool pressed = (
((players[serverplayer].cmd.buttons & BT_VOTE) == BT_VOTE) &&
((players[serverplayer].oldcmd.buttons & BT_VOTE) == 0)
);
if (pressed == true)
if (Pressed() == true)
{
if (TextDone())
{
@ -286,19 +294,27 @@ void Dialogue::Draw(void)
.font(srb2::Draw::Font::kConsole)
.text( text.c_str() );
if (Dismissable() && TextDone() && Active())
if (Dismissable())
{
drawer
.xy(304, 7)
.patch("TUTDIAG2");
if (TextDone())
{
drawer
.xy(304, 7)
.patch("TUTDIAG2");
}
K_drawButton(
FloatToFixed(drawer.x() + 303),
FloatToFixed(drawer.y() + 39),
V_SNAPTOTOP,
kp_button_z[0], Held()
);
}
}
void Dialogue::Dismiss(void)
{
active = false;
dismissable = false;
text.clear();
textDest.clear();
}

3
src/k_dialogue.hpp
View file

@ -55,6 +55,9 @@ private:
void WriteText(void);
void CompleteText(void);
bool Pressed(void);
bool Held(void);
public:
static constexpr fixed_t kTextSpeedDefault = FRACUNIT;
static constexpr fixed_t kTextPunctPause = (FRACUNIT * TICRATE * 2) / 5;