mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 01:59:43 +01:00
Code Issues Releases Wiki Activity

Remove duplicate talkgreen_2 script and alarmon/alarmoff commands

Browse source 
For some reason, there were just exact duplicates of the talkgreen_2
script and alarmon/alarmoff commands. I have no idea why, but cppcheck
identified them.
This commit is contained in:
Misa 2020-07-04 15:18:29 -07:00 committed by Ethan Lee
parent fd0dafc16c
commit 9398e9f1f0
2 changed files with 0 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
desktop_version/src/Script.cpp
View file

@ -1156,15 +1156,6 @@ void scriptclass::run()
}
}
}
else if (words[0] == "alarmon")
{
game.alarmon = true;
game.alarmdelay = 0;
}
else if (words[0] == "alarmoff")
{
game.alarmon = false;
}
else if (words[0] == "activateteleporter")
{
i = obj.getteleporter();

24
desktop_version/src/Scripts.cpp
View file

@ -4334,30 +4334,6 @@ void scriptclass::load(std::string t)
};
filllines(lines);
}
else if (t == "talkgreen_2")
{
static const char* lines[] = {
"cutscene()",
"untilbars()",
"face(player,green)",
"face(green,player)",
"squeak(green)",
"text(green,0,0,3)",
"I think I can get this ship",
"moving again, but it's going",
"to take a while...",
"position(green,above)",
"speak_active",
"endtext",
"endcutscene()",
"untilbars()",
"createactivityzone(green)",
};
filllines(lines);
}
else if (t == "talkgreen_3")
{
static const char* lines[] = {