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

Fix and update comments for edentities

Browse source 
"Threadmills" are now properly called "conveyors". I don't know why they
were called "threadmills" anyway, the proper spelling is "treadmills".
Also, warp line `p1`s of 0 and 3 are now properly labeled, as well as
the trinket edentity.
This commit is contained in:
Misa 2020-07-09 03:16:52 -07:00 committed by Ethan Lee
parent f8e23119bf
commit 01f6a97ed0
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
desktop_version/src/Map.cpp
View file

@ -1730,11 +1730,11 @@ void mapclass::loadlevel(int rx, int ry)
obj.createentity(ex, ey, 56, obj.createentity(ex, ey, 56,
ent.p1, 4, bx1, by1, bx2, by2); ent.p1, 4, bx1, by1, bx2, by2);
break; break;
case 2: //Platforms and Threadmills case 2: //Platforms and conveyors
if(ent.p1<=4){ if(ent.p1<=4){
obj.createentity(ex, ey, 2, obj.createentity(ex, ey, 2,
ent.p1, room.platv, bx1, by1, bx2, by2); ent.p1, room.platv, bx1, by1, bx2, by2);
}else if(ent.p1 >= 5 && ent.p1 <= 8){ //Threadmill }else if(ent.p1 >= 5 && ent.p1 <= 8){ // Conveyor
obj.createentity(ex, ey, 2, obj.createentity(ex, ey, 2,
ent.p1 + 3, 4); ent.p1 + 3, 4);
} }
@ -1742,7 +1742,7 @@ void mapclass::loadlevel(int rx, int ry)
case 3: //Disappearing platforms case 3: //Disappearing platforms
obj.createentity(ex, ey, 3); obj.createentity(ex, ey, 3);
break; break;
case 9: case 9: // Trinkets
obj.createentity(ex, ey, 9, ed.findtrinket(edi)); obj.createentity(ex, ey, 9, ed.findtrinket(edi));
break; break;
case 10: //Checkpoints case 10: //Checkpoints
@ -1808,7 +1808,7 @@ void mapclass::loadlevel(int rx, int ry)
obj.customwarpmode=true; obj.customwarpmode=true;
switch (ent.p1) switch (ent.p1)
{ {
case 0: // case 0: // Vertical, left
obj.createentity(ex + 4, ent.p2 * 8, 51, ent.p3); obj.createentity(ex + 4, ent.p2 * 8, 51, ent.p3);
break; break;
case 1: //Horizontal, right case 1: //Horizontal, right
@ -1817,7 +1817,7 @@ void mapclass::loadlevel(int rx, int ry)
case 2: //Vertical, top case 2: //Vertical, top
obj.createentity(ent.p2 * 8, ey + 7, 53, ent.p3); obj.createentity(ent.p2 * 8, ey + 7, 53, ent.p3);
break; break;
case 3: case 3: // Horizontal, bottom
obj.createentity(ent.p2 * 8, ey, 54, ent.p3); obj.createentity(ent.p2 * 8, ey, 54, ent.p3);
break; break;
} }