From 70df636bb6c8d2468995707264492fd1e7875e4b Mon Sep 17 00:00:00 2001 From: Eidolon Date: Sat, 18 Jan 2025 13:54:32 -0600 Subject: [PATCH] Revert "Add Evertone to credits and adjust some objs" This reverts commit b91854fa253758dbbb0cdd2a192534c553f7e613. --- src/f_finale.c | 1 - src/info.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/f_finale.c b/src/f_finale.c index ee6491b69..dd85cc6d5 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -1163,7 +1163,6 @@ static const char *credits[] = { "Sally \"TehRealSalt\" Cochenour", "Desmond \"Blade\" DesJardins", "Sherman \"CoatRack\" DesJardins", - "\"Evertone\"", // summit showdown hehehehe "Ben \"Mystic\" Geyer", "Nathan \"Jazz\" Giroux", "\"GomaTheMascar\"", diff --git a/src/info.c b/src/info.c index 95cc64135..47cef8656 100644 --- a/src/info.c +++ b/src/info.c @@ -19790,7 +19790,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // deathsound 0, // speed 16*FRACUNIT, // radius - 48*FRACUNIT, // height + 96*FRACUNIT, // height 0, // display offset 100, // mass 0, // damage @@ -19817,7 +19817,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // deathsound 0, // speed 16*FRACUNIT, // radius - 48*FRACUNIT, // height + 96*FRACUNIT, // height 0, // display offset 100, // mass 0, // damage @@ -19844,7 +19844,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // deathsound 0, // speed 16*FRACUNIT, // radius - 48*FRACUNIT, // height + 96*FRACUNIT, // height 0, // display offset 100, // mass 0, // damage @@ -19871,7 +19871,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // deathsound 0, // speed 16*FRACUNIT, // radius - 48*FRACUNIT, // height + 96*FRACUNIT, // height 0, // display offset 100, // mass 0, // damage @@ -19903,7 +19903,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 100, // mass 0, // damage sfx_None, // activesound - MF_SOLID|MF_SCENERY, // flags + MF_NOCLIP|MF_SCENERY, // flags S_NULL // raisestate },