Skip to content

Commit

Permalink
Brought fixes from doom to heretic
Browse files Browse the repository at this point in the history
  • Loading branch information
Daivuk committed Aug 11, 2023
1 parent 7d4e5bf commit 3fb049e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
3 changes: 3 additions & 0 deletions release.lst
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Release/apdoom-launcher.exe
Release/crispy-apdoom.exe
Release/crispy-apheretic.exe
Release/crispy-setup.exe
Release/APCpp.dll
Release/intl.dll
Expand All @@ -11,5 +12,7 @@ Release/samplerate.dll
Release/SDL2.dll
Release/SDL2_mixer.dll
Release/APDOOM.WAD
Release/APHERETIC.WAD
Release/credits-doom-1993.txt
Release/credits-doom-ii.txt
Release/credits-heretic.txt
3 changes: 0 additions & 3 deletions src/heretic/p_map.c
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,7 @@ boolean P_TeleportMove(mobj_t * thing, fixed_t x, fixed_t y)

// If it's the player, make sure to reset hub timer by like 5sec so we don't accidentally retrigger it
if (thing == players[consoleplayer].mo)
{
leveltimesinceload = min(leveltimesinceload, 175);

}

return true;
}
Expand Down
7 changes: 7 additions & 0 deletions src/heretic/p_spec.c
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,7 @@ Events are operations triggered by using, crossing, or shooting special lines, o
void P_CrossSpecialLine(int linenum, int side, mobj_t * thing)
{
line_t *line;
int i;

line = &lines[linenum];
if (!thing->player)
Expand Down Expand Up @@ -725,6 +726,12 @@ void P_CrossSpecialLine(int linenum, int side, mobj_t * thing)
line->special = 0;
break;
case 52: // EXIT!
// make sure there is a player alive for victory
for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i] && players[i].health > 0)
break;
if (i == MAXPLAYERS) return;

G_ExitLevel();
line->special = 0;
break;
Expand Down

0 comments on commit 3fb049e

Please sign in to comment.