mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2026-03-30 13:41:48 +03:00
Compare commits
3 Commits
cdf363b236
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9bcade9776 | ||
|
|
deeed00c95 | ||
|
|
11b660abb0 |
@@ -1392,6 +1392,10 @@ next:
|
|||||||
{
|
{
|
||||||
name.text.push_back(std::string(text));
|
name.text.push_back(std::string(text));
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
name.text.push_back(std::string(""));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1409,6 +1413,10 @@ next:
|
|||||||
{
|
{
|
||||||
name.text.push_back(std::string(text));
|
name.text.push_back(std::string(text));
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
name.text.push_back(std::string(""));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -222,11 +222,11 @@ void mapclass::updateroomnames(void)
|
|||||||
if (rx == roomname->x && ry == roomname->y && (roomname->flag == -1 || (INBOUNDS_ARR(roomname->flag, obj.flags) && obj.flags[roomname->flag])))
|
if (rx == roomname->x && ry == roomname->y && (roomname->flag == -1 || (INBOUNDS_ARR(roomname->flag, obj.flags) && obj.flags[roomname->flag])))
|
||||||
{
|
{
|
||||||
roomname_special = true;
|
roomname_special = true;
|
||||||
if (roomname->type == RoomnameType_STATIC)
|
if (roomname->type == RoomnameType_STATIC && roomname->text.size() >= 1)
|
||||||
{
|
{
|
||||||
setroomname(roomname->text[0].c_str());
|
setroomname(roomname->text[0].c_str());
|
||||||
}
|
}
|
||||||
if (roomname->type == RoomnameType_GLITCH)
|
if (roomname->type == RoomnameType_GLITCH && roomname->text.size() >= 2)
|
||||||
{
|
{
|
||||||
roomname->delay--;
|
roomname->delay--;
|
||||||
if (roomname->delay <= 0)
|
if (roomname->delay <= 0)
|
||||||
@@ -240,7 +240,7 @@ void mapclass::updateroomnames(void)
|
|||||||
}
|
}
|
||||||
setroomname(roomname->text[roomname->progress].c_str());
|
setroomname(roomname->text[roomname->progress].c_str());
|
||||||
}
|
}
|
||||||
if (roomname->type == RoomnameType_TRANSFORM)
|
if (roomname->type == RoomnameType_TRANSFORM && roomname->text.size() >= 1)
|
||||||
{
|
{
|
||||||
roomname->delay--;
|
roomname->delay--;
|
||||||
if (roomname->delay <= 0)
|
if (roomname->delay <= 0)
|
||||||
|
|||||||
@@ -1346,7 +1346,14 @@ void scriptclass::run(void)
|
|||||||
{
|
{
|
||||||
// Allow the gamestate command to bypass statelock, at least for now
|
// Allow the gamestate command to bypass statelock, at least for now
|
||||||
game.state = ss_toi(words[1]);
|
game.state = ss_toi(words[1]);
|
||||||
game.statedelay = 0;
|
if (argexists[2])
|
||||||
|
{
|
||||||
|
game.statedelay = ss_toi(words[2]);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
game.statedelay = 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if (words[0] == "textboxactive")
|
else if (words[0] == "textboxactive")
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user