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

Add being able to use Lab rainbow background in editor

Browse source 
If you use Lab tilecol 6, you get the rainbow background. However, this
is unintended, because the associated autotiling is... not very good.

To combat that, Ved disallows using the Lab rainbow background outside
of Direct Mode. We will follow Ved here and only allow switching to the
rainbow background if you're in Direct Mode. Also make sure if someone
is disabling Direct Mode with the rainbow background that it gets reset
properly.
This commit is contained in:
Misa 2021-08-22 20:56:47 -07:00
parent 3947949ebb
commit 731fb89c90
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
desktop_version/src/editor.cpp
View file

@ -1704,6 +1704,12 @@ void editorclass::clamp_tilecol(const int rx, const int ry, const bool wrap)
case 1: case 1:
maxcol = 7; maxcol = 7;
break; break;
case 2:
if (room->directmode)
{
maxcol = 6;
}
break;
case 3: case 3:
maxcol = 6; maxcol = 6;
break; break;
@ -4803,6 +4809,12 @@ void editorinput(void)
{ {
ed.setroomdirectmode(ed.levx, ed.levy, 0); ed.setroomdirectmode(ed.levx, ed.levy, 0);
ed.note="Direct Mode Disabled"; ed.note="Direct Mode Disabled";
/* Kludge fix for rainbow BG here... */
if (ed.getroomprop(ed.levx, ed.levy)->tileset == 2
&& ed.getroomprop(ed.levx, ed.levy)->tilecol == 6)
{
ed.setroomtilecol(ed.levx, ed.levy, 0);
}
} }
else else
{ {