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

De-duplicate speak_active/speak code

Browse source 
The `speak` command is the exact same as the `speak_active` command,
except without one line of code. So instead of copy-pasting the entire
thing, it's better to just combine them into the same chunk of code.
This commit is contained in:
Misa 2020-05-23 12:24:54 -07:00 committed by Ethan Lee
parent e9ffa1863f
commit 46559bbe0a
1 changed files with 4 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
desktop_version/src/Script.cpp
View file

@ -573,9 +573,10 @@ void scriptclass::run()
{
if(graphics.flipmode) texty += 2*(120 - texty) - 8*(txt.size()+2);
}
else if (words[0] == "speak_active")
else if (words[0] == "speak_active" || words[0] == "speak")
{
//Ok, actually display the textbox we've initilised now!
//If using "speak", don't make the textbox active (so we can use multiple textboxes)
graphics.createtextbox(txt[0], textx, texty, r, g, b);
if ((int) txt.size() > 1)
{
@ -606,52 +607,10 @@ void scriptclass::run()
}
graphics.textboxadjust();
graphics.textboxactive();
if (!game.backgroundtext)
if (words[0] == "speak_active")
{
game.advancetext = true;
game.hascontrol = false;
game.pausescript = true;
if (key.isDown(90) || key.isDown(32) || key.isDown(86)
|| key.isDown(KEYBOARD_UP) || key.isDown(KEYBOARD_DOWN)) game.jumpheld = true;
graphics.textboxactive();
}
game.backgroundtext = false;
}
else if (words[0] == "speak")
{
//Exactly as above, except don't make the textbox active (so we can use multiple textboxes)
graphics.createtextbox(txt[0], textx, texty, r, g, b);
if ((int) txt.size() > 1)
{
for (i = 1; i < (int) txt.size(); i++)
{
graphics.addline(txt[i]);
}
}
//the textbox cannot be outside the screen. Fix if it is.
if (textx <= -1000)
{
//position to the left of the player
textx += 10000;
textx -= graphics.textboxwidth();
textx += 16;
graphics.textboxmoveto(textx);
}
if (textx == -500 || textx == -1)
{
graphics.textboxcenterx();
}
if (texty == -500)
{
graphics.textboxcentery();
}
graphics.textboxadjust();
//graphics.textboxactive();
if (!game.backgroundtext)
{