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

Change the text of custom activity zones

Browse source 
When an activity zone is spawned through the
use of `createactivityzone`, and `i` is 35,
then it'll change the activity zone text to
"Press ENTER to interact".
This commit is contained in:
AllyTally 2021-04-15 01:12:37 -03:00 committed by Misa Elizabeth Kai
parent 1cbc3bdc7c
commit 0685cade69
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
desktop_version/src/Entity.cpp
View file

@ -759,7 +759,7 @@ void entityclass::generateswnwave( int t )
} }
} }
void entityclass::createblock( int t, int xp, int yp, int w, int h, int trig /*= 0*/, const std::string& script /*= ""*/ ) void entityclass::createblock( int t, int xp, int yp, int w, int h, int trig /*= 0*/, const std::string& script /*= ""*/, bool custom /*= false*/)
{ {
k = blocks.size(); k = blocks.size();
@ -1051,7 +1051,12 @@ void entityclass::createblock( int t, int xp, int yp, int w, int h, int trig /*=
trig=0; trig=0;
break; break;
case 35: case 35:
block.prompt = "Press %s to activate terminal"; if (custom)
{
block.prompt = "Press %s to interact";
} else {
block.prompt = "Press %s to activate terminal";
}
block.script = "custom_"+customscript; block.script = "custom_"+customscript;
block.setblockcolour("orange"); block.setblockcolour("orange");
trig=0; trig=0;

2
desktop_version/src/Entity.h
View file

@ -52,7 +52,7 @@ public:
void generateswnwave(int t); void generateswnwave(int t);
void createblock(int t, int xp, int yp, int w, int h, int trig = 0, const std::string& script = ""); void createblock(int t, int xp, int yp, int w, int h, int trig = 0, const std::string& script = "", bool custom = false);
bool disableentity(int t); bool disableentity(int t);

4
desktop_version/src/Script.cpp
View file

@ -1896,11 +1896,11 @@ void scriptclass::run(void)
int crewman = obj.getcrewman(i); int crewman = obj.getcrewman(i);
if (INBOUNDS_VEC(crewman, obj.entities) && i == 4) if (INBOUNDS_VEC(crewman, obj.entities) && i == 4)
{ {
obj.createblock(5, obj.entities[crewman].xp - 32, obj.entities[crewman].yp-20, 96, 60, i); obj.createblock(5, obj.entities[crewman].xp - 32, obj.entities[crewman].yp-20, 96, 60, i, "", (i == 35));
} }
else if (INBOUNDS_VEC(crewman, obj.entities)) else if (INBOUNDS_VEC(crewman, obj.entities))
{ {
obj.createblock(5, obj.entities[crewman].xp - 32, 0, 96, 240, i); obj.createblock(5, obj.entities[crewman].xp - 32, 0, 96, 240, i, "", (i == 35));
} }
} }
else if (words[0] == "createrescuedcrew") else if (words[0] == "createrescuedcrew")