Inline dialogue advance prompt

This commit is contained in:
Antonio Martinez 2024-09-19 22:25:22 -07:00 committed by AJ Martinez
parent 9a669ff864
commit 1d7aa0ee18

View file

@ -472,11 +472,35 @@ void Dialogue::Draw(void)
.flags(V_VFLIP|V_FLIP) .flags(V_VFLIP|V_FLIP)
.patch(patchCache["TUTDIAGE"]); .patch(patchCache["TUTDIAGE"]);
std::string intertext = "<large>";
if (Dismissable() && typewriter.text.length() > 0)
{
if (TextDone())
{
drawer
.xy(-14, -7-5)
.patch(patchCache["TUTDIAG2"]);
}
intertext += " <large>";
if (Held())
intertext += "<z_pressed>";
else if (TextDone())
intertext += "<z_animated>";
else
intertext += "";
}
std::string fulltext = typewriter.text + srb2::Draw::TextElement().parse(intertext).string();
drawer drawer
.xy(10 - BASEVIDWIDTH, -3-32) .xy(10 - BASEVIDWIDTH, -3-32)
.font(srb2::Draw::Font::kConsole) .font(srb2::Draw::Font::kConsole)
.text( typewriter.text.c_str() ); .text( fulltext.c_str() );
/*
if (Dismissable()) if (Dismissable())
{ {
if (TextDone()) if (TextDone())
@ -495,7 +519,6 @@ void Dialogue::Draw(void)
else else
ctrl += "<z>"; ctrl += "<z>";
// FIXME: Old animation behavior (bt_translate_press above)
std::string parsedctrl = srb2::Draw::TextElement().parse(ctrl).string(); std::string parsedctrl = srb2::Draw::TextElement().parse(ctrl).string();
drawer drawer
@ -503,6 +526,7 @@ void Dialogue::Draw(void)
.font(Draw::Font::kMenu) .font(Draw::Font::kMenu)
.text(parsedctrl); .text(parsedctrl);
} }
*/
} }
void Dialogue::Dismiss(void) void Dialogue::Dismiss(void)