From 01f6a97ed0374e80d935c6e3d1b701584f6b4651 Mon Sep 17 00:00:00 2001 From: Misa Date: Thu, 9 Jul 2020 03:16:52 -0700 Subject: [PATCH] Fix and update comments for edentities "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. --- desktop_version/src/Map.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/desktop_version/src/Map.cpp b/desktop_version/src/Map.cpp index f0f00243..83b8755c 100644 --- a/desktop_version/src/Map.cpp +++ b/desktop_version/src/Map.cpp @@ -1730,11 +1730,11 @@ void mapclass::loadlevel(int rx, int ry) obj.createentity(ex, ey, 56, ent.p1, 4, bx1, by1, bx2, by2); break; - case 2: //Platforms and Threadmills + case 2: //Platforms and conveyors if(ent.p1<=4){ obj.createentity(ex, ey, 2, 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, ent.p1 + 3, 4); } @@ -1742,7 +1742,7 @@ void mapclass::loadlevel(int rx, int ry) case 3: //Disappearing platforms obj.createentity(ex, ey, 3); break; - case 9: + case 9: // Trinkets obj.createentity(ex, ey, 9, ed.findtrinket(edi)); break; case 10: //Checkpoints @@ -1808,7 +1808,7 @@ void mapclass::loadlevel(int rx, int ry) obj.customwarpmode=true; switch (ent.p1) { - case 0: // + case 0: // Vertical, left obj.createentity(ex + 4, ent.p2 * 8, 51, ent.p3); break; case 1: //Horizontal, right @@ -1817,7 +1817,7 @@ void mapclass::loadlevel(int rx, int ry) case 2: //Vertical, top obj.createentity(ent.p2 * 8, ey + 7, 53, ent.p3); break; - case 3: + case 3: // Horizontal, bottom obj.createentity(ent.p2 * 8, ey, 54, ent.p3); break; }