From c614acd2421c57f0c746f2deca65fbfbbe7e977b Mon Sep 17 00:00:00 2001 From: Dennis Duda Date: Wed, 12 Sep 2018 20:27:50 +0200 Subject: [PATCH] Changed `PFILE_ALL` to `PFILE_NONDEATH` to not be misleading --- Source/player.cpp | 4 ++-- enums.h | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/player.cpp b/Source/player.cpp index eca715d5c..9ecbf1c8f 100644 --- a/Source/player.cpp +++ b/Source/player.cpp @@ -133,7 +133,7 @@ void __fastcall LoadPlrGFX(int pnum, player_graphic gfxflag) UCHAR *pData; UCHAR *pAnim; - for (DWORD i = 1; i <= PFILE_ALL; i <<= 1) { + for (DWORD i = 1; i <= PFILE_NONDEATH; i <<= 1) { if ( !(i & gfxflag) ) { continue; } @@ -238,7 +238,7 @@ void __fastcall InitPlayerGFX(int pnum) plr[pnum]._pgfxnum = 0; LoadPlrGFX(pnum, PFILE_DEATH); } else { - LoadPlrGFX(pnum, PFILE_ALL); + LoadPlrGFX(pnum, PFILE_NONDEATH); } } diff --git a/enums.h b/enums.h index 92c2caeed..aaf8ee1b5 100644 --- a/enums.h +++ b/enums.h @@ -2536,5 +2536,7 @@ enum player_graphic PFILE_MAGIC = 1 << 6, PFILE_DEATH = 1 << 7, PFILE_BLOCK = 1 << 8, - PFILE_ALL = 0x17F + // everything except PFILE_DEATH + // 0b1_0111_1111 + PFILE_NONDEATH = 0x17F };