From 631c9695a804031facf2e925cdc6cac91e1c7b68 Mon Sep 17 00:00:00 2001
From: AllyTally <alexiatilde@gmail.com>
Date: Tue, 17 Jan 2023 21:04:53 -0400
Subject: [PATCH] Remove `ct`, replace Flip token with Gravity token

---
 desktop_version/src/Editor.cpp | 5 ++---
 desktop_version/src/Logic.cpp  | 2 +-
 desktop_version/src/Map.cpp    | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/desktop_version/src/Editor.cpp b/desktop_version/src/Editor.cpp
index 742ce8fa3a..bdb6ef266c 100644
--- a/desktop_version/src/Editor.cpp
+++ b/desktop_version/src/Editor.cpp
@@ -700,9 +700,8 @@ void editorrender(void)
                 graphics.Print((customentities[i].x*8)- (ed.levx*40*8),(customentities[i].y*8)- (ed.levy*30*8), "////", 255 - help.glow, 255 - help.glow, 255 - help.glow, false);
                 fillboxabs((customentities[i].x*8)- (ed.levx*40*8),(customentities[i].y*8)- (ed.levy*30*8),32,8,graphics.getRGB(255,255,255));
                 break;
-            case 5: // Flip Token
-                graphics.setcol(customentities[i].p2);
-                graphics.drawsprite((customentities[i].x * 8) - (ed.levx * 40 * 8), (customentities[i].y * 8) - (ed.levy * 30 * 8), 68 + customentities[i].p1, graphics.ct.colour);
+            case 5: //Gravity Token
+                graphics.drawsprite((customentities[i].x * 8) - (ed.levx * 40 * 8), (customentities[i].y * 8) - (ed.levy * 30 * 8), 68 + customentities[i].p1, graphics.getcol(customentities[i].p2));
                 fillboxabs((customentities[i].x * 8) - (ed.levx * 40 * 8), (customentities[i].y * 8) - (ed.levy * 30 * 8), 16, 16, graphics.getRGB(255, 164, 164));
                 break;
             case 9: //Shiny Trinket
diff --git a/desktop_version/src/Logic.cpp b/desktop_version/src/Logic.cpp
index bf5aa8d2e4..6d1af99fb7 100644
--- a/desktop_version/src/Logic.cpp
+++ b/desktop_version/src/Logic.cpp
@@ -419,7 +419,7 @@ void gamelogic(void)
             }
             else if (obj.entities[i].type == 4 && obj.entities[i].state == 2)
             {
-                // Flip token: Give a signal to respawn
+                // Gravity token: Give a signal to respawn
                 obj.entities[i].state = 3;
             }
             else if (obj.entities[i].type == 23 && game.swnmode && game.deathseq<15)
diff --git a/desktop_version/src/Map.cpp b/desktop_version/src/Map.cpp
index cb92d8bbd7..b9e6b05603 100644
--- a/desktop_version/src/Map.cpp
+++ b/desktop_version/src/Map.cpp
@@ -1962,7 +1962,7 @@ void mapclass::loadlevel(int rx, int ry)
             case 3: // Disappearing platforms
                 obj.createentity(ex, ey, 3);
                 break;
-            case 5: // Flip tokens
+            case 5: // Gravity tokens
                 obj.createentity(ex, ey, 5, ent.p1, ent.p2, ent.p3, ent.p4);
                 break;
             case 9: // Trinkets