From ca288b89b3b39c54a93300d850425e6717dc0c6d Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 27 Dec 2023 13:10:48 +0100 Subject: [PATCH 1/3] why do that twice? --- src/hardware/hw_cache.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/hardware/hw_cache.c b/src/hardware/hw_cache.c index bfd5fa26d..4255475bb 100644 --- a/src/hardware/hw_cache.c +++ b/src/hardware/hw_cache.c @@ -672,14 +672,6 @@ void HWR_GetFlat(lumpnum_t flatlumpnum, boolean noencoremap) grmip->colormap += (256*32); #endif - grmip->colormap = colormaps; - -#ifdef GLENCORE - if (!noencoremap && encoremap) - grmip->colormap += (256*32); -#endif - - if (!grmip->downloaded && !grmip->grInfo.data) HWR_CacheFlat(grmip, flatlumpnum); From 8e6023d85060a82b0311a3e862b56f53d6440272 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 27 Dec 2023 13:11:08 +0100 Subject: [PATCH 2/3] invert encore remap is 12 not 15? is it? --- src/r_bsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/r_bsp.c b/src/r_bsp.c index f0dcbd80e..795ef459c 100644 --- a/src/r_bsp.c +++ b/src/r_bsp.c @@ -39,7 +39,7 @@ INT32 doorclosed; boolean R_NoEncore(sector_t *sector, boolean ceiling) { - boolean invertencore = (GETSECSPECIAL(sector->special, 2) == 15); + boolean invertencore = (GETSECSPECIAL(sector->special, 2) == 12); #if 0 // perfect implementation INT32 val = GETSECSPECIAL(sector->special, 3); if (val != 1 && val != 3 // spring panel From 647641214a0410a3a47bdb9e8738f69b0cabeb91 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 27 Dec 2023 13:30:09 +0100 Subject: [PATCH 3/3] try and cleanup sector special comments a little --- src/p_spec.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/p_spec.c b/src/p_spec.c index bba01ed0e..dc2ea796d 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -3627,8 +3627,8 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers case 5: // Spikes // Don't do anything. In Soviet Russia, spikes find you. break; - case 6: // Death Pit (Camera Mod) - case 7: // Death Pit (No Camera Mod) + case 6: // Death Pit (Camera Tilt) + case 7: // Death Pit (No Camera Tilt) if (roversector || P_MobjReadyToTrigger(player->mo, sector)) P_DamageMobj(player->mo, NULL, NULL, 10000); break; @@ -3685,8 +3685,8 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers { case 1: // Trigger Linedef Exec (Pushable Objects) break; - case 2: // Linedef executor requires all players present+doesn't require touching floor - case 3: // Linedef executor requires all players present + case 2: // Linedef executor requires all players present+doesn't require touching floor // Trigger Linedef Exec (Anywhere, All Players) + case 3: // Linedef executor requires all players present // Trigger Linedef Exec (Floor Touch, All Players) /// \todo check continues for proper splitscreen support? for (i = 0; i < MAXPLAYERS; i++) if (playeringame[i] && !players[i].bot && players[i].mo && (gametype != GT_COOP || players[i].lives > 0)) @@ -3743,16 +3743,16 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers } } /* FALLTHRU */ - case 4: // Linedef executor that doesn't require touching floor - case 5: // Linedef executor - case 6: // Linedef executor (7 Emeralds) - case 7: // Linedef executor (NiGHTS Mare) + case 4: // Linedef executor that doesn't require touching floor // Trigger Linedef Exec (Anywhere in Sector) + case 5: // Linedef executor // Trigger Linedef Exec (Floor Touch) + case 6: // Linedef executor (7 Emeralds) // unused + case 7: // SRB2kart: Linedef executor (Race Lap) if (!player->bot) P_LinedefExecute(sector->tag, player->mo, sector); break; - case 8: // Tells pushable things to check FOFs + case 8: // Tells pushable things to check FOFs // Check for Linedef Executor on FOFs break; - case 9: // Egg trap capsule + case 9: // Egg trap capsule // unused { thinker_t *th; mobj_t *mo2; @@ -3792,12 +3792,12 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers P_DoPlayerExit(&players[i]); break; } - case 10: // Special Stage Time/Rings + case 10: // Special Stage Time/Rings // unused case 11: // Custom Gravity break; - case 12: // Lua sector special + case 12: // SRB2kart: Invert Encore Remap break; - case 15: // Invert Encore Remap + case 15: // no idea but keep it dont want anything to break break; } DoneSection2: