diff --git a/desktop_version/src/Entity.cpp b/desktop_version/src/Entity.cpp index 57cb9319..7d6e7117 100644 --- a/desktop_version/src/Entity.cpp +++ b/desktop_version/src/Entity.cpp @@ -67,9 +67,11 @@ void entityclass::init(void) upsetmode = false; upset = 0; - customenemy=0; - customwarpmode=false; customwarpmodevon=false; customwarpmodehon=false; - trophytext = 0 ; + customenemy = 0; + customwarpmode = false; customwarpmodevon = false; customwarpmodehon = false; + customactivitycolour = ""; + customactivitytext = ""; + trophytext = 0; oldtrophytext = 0; trophytype = 0; altstates = 0; @@ -1065,6 +1067,18 @@ void entityclass::createblock( int t, int xp, int yp, int w, int h, int trig /*= break; } + if (customactivitytext != "") + { + block.prompt = customactivitytext; + customactivitytext = ""; + } + + if (customactivitycolour != "") + { + block.setblockcolour(customactivitycolour); + customactivitycolour = ""; + } + if (!reuse) { blocks.push_back(block); diff --git a/desktop_version/src/Entity.h b/desktop_version/src/Entity.h index 04538589..4d57bda2 100644 --- a/desktop_version/src/Entity.h +++ b/desktop_version/src/Entity.h @@ -193,6 +193,8 @@ public: bool customwarpmode, customwarpmodevon, customwarpmodehon; std::string customscript; bool customcrewmoods[Game::numcrew]; + std::string customactivitycolour; + std::string customactivitytext; }; #ifndef OBJ_DEFINITION diff --git a/desktop_version/src/Script.cpp b/desktop_version/src/Script.cpp index d182e9e4..c688f436 100644 --- a/desktop_version/src/Script.cpp +++ b/desktop_version/src/Script.cpp @@ -1903,6 +1903,15 @@ void scriptclass::run(void) obj.createblock(5, obj.entities[crewman].xp - 32, 0, 96, 240, i, "", (i == 35)); } } + else if (words[0] == "setactivitycolour") + { + obj.customactivitycolour = words[1]; + } + else if (words[0] == "setactivitytext") + { + position++; + obj.customactivitytext = commands[position]; + } else if (words[0] == "createrescuedcrew") { //special for final level cutscene