From 1b2319cc509eb441fd1e56bb9d4a106195c53abe Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sat, 6 Oct 2018 19:13:18 -0400 Subject: [PATCH] freedm: Remove override for menu skull. FreeDM had a special override to use an animated rocket for the menu selector, a tweak to make it more deathmatch-appropriate. Unfortunately the rocket animation is too wide and causes Chocolate Doom to error out when the help screen is brought up (F1) with "Bad V_DrawPatch". Even if the horizontal offset is adjusted it will overlap with parts of the help screen and obscure them. I think the easiest solution is to just remove the override. --- buildcfg.txt | 5 ----- graphics/m_rokt1.png | Bin 489 -> 0 bytes graphics/m_rokt2.png | Bin 501 -> 0 bytes 3 files changed, 5 deletions(-) delete mode 100644 graphics/m_rokt1.png delete mode 100644 graphics/m_rokt2.png diff --git a/buildcfg.txt b/buildcfg.txt index ede08ded..ecf83818 100644 --- a/buildcfg.txt +++ b/buildcfg.txt @@ -770,13 +770,8 @@ M_RDTHIS 0 0 M_OPTION 0 0 M_QUITG 0 0 M_NGAME 0 0 -#ifdef FREEDM -M_SKULL1 = m_rokt1 16 -4 -M_SKULL2 = m_rokt2 16 -4 -#else M_SKULL1 0 -1 M_SKULL2 0 -1 -#endif M_THERMO -2 -1 M_THERMR 0 0 M_THERMM 0 0 diff --git a/graphics/m_rokt1.png b/graphics/m_rokt1.png deleted file mode 100644 index 58388289aa2afc9235e5facb654a35e9406f8cc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 489 zcmeAS@N?(olHy`uVBq!ia0vp^hCs~6!3-of=COnUDVB6cUq>LXpZiZDE0C{{>=ES4 zz)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15>5d=A+8Mn|65yI>+9=h zXJ8-KYcsSvv%9;yU*GNg|9>_&H}~evn`cK0|NsAASy_4h{Q3X?Z=O7P za(#V0(3l&dB|wb~j3q&S!3+-1Zlr-YN#5=*qEB!9Tnyx}mw5WRvOi=J6*APXdwP36 zP-wcRi(`n!`J+60 z>HYi{yf-=7KC&ITCJS_;YKdz^NlIc#s#S7PDv)9@GB7mPH89dOG7K@aurjfLXpZiZDE0C{{>=ES4 zz)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15>5d=A+8Mn|65yI>+9=h zXJ8-KYcsSvv%9;yU*GNg|9>_&H}~evn`cK0|NsAASy_4h{Q3X?Z=O7P za(#V0(3l&dB|wb~j3q&S!3+-1Zlr-YN#5=*qEB!9Tnyx}mw5WRvOi=J6*APXdwP36 zP-wBIi(`n!`J+M6e1{cylo^>9e%V<1-TpOGtl->ZcIMs_bwrM7m zq7}*Iy0$t#E#((NFKIWdJ&={TO1!$^{=552nTi^p2=8K!V0b)xv7;@Y6I0FIyqP{{ zn?EJ&mYvWjw0qwIqd)(IZ5i#A*gTe~DWM4fd~U8C