From 46d08716f4fc18cc925c66a862c3d139583ef7d8 Mon Sep 17 00:00:00 2001 From: AllyTally Date: Tue, 15 Nov 2022 00:16:13 -0400 Subject: [PATCH] Gravity token edentity --- desktop_version/src/Editor.cpp | 4 ++++ desktop_version/src/Logic.cpp | 2 +- desktop_version/src/Map.cpp | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/desktop_version/src/Editor.cpp b/desktop_version/src/Editor.cpp index 7ef87371..e0f8c7a5 100644 --- a/desktop_version/src/Editor.cpp +++ b/desktop_version/src/Editor.cpp @@ -671,6 +671,10 @@ static void draw_entities(void) font::print(PR_FONT_8X8, x, y, "////", 255 - help.glow, 255 - help.glow, 255 - help.glow); graphics.draw_rect(x, y, 32, 8, graphics.getRGB(255, 255, 255)); break; + case 5: // Gravity Tokens + graphics.draw_sprite(x, y, 68 + entity->p1, graphics.getcol(entity->p2)); + graphics.draw_rect(x, y, 16, 16, graphics.getRGB(255, 164, 164)); + break; case 9: // Shiny Trinkets graphics.draw_sprite(x, y, 22, 196, 196, 196); graphics.draw_rect(x, y, 16, 16, graphics.getRGB(255, 164, 164)); diff --git a/desktop_version/src/Logic.cpp b/desktop_version/src/Logic.cpp index a754d606..c66afd87 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 99bffbf5..d4766747 100644 --- a/desktop_version/src/Map.cpp +++ b/desktop_version/src/Map.cpp @@ -1872,6 +1872,9 @@ void mapclass::loadlevel(int rx, int ry) case 3: // Disappearing platforms obj.createentity(ex, ey, 3); break; + case 5: // Gravity tokens + obj.createentity(ex, ey, 5, ent.p1, ent.p2, ent.p3, ent.p4); + break; case 9: // Trinkets obj.createentity(ex, ey, 9, cl.findtrinket(edi)); break;