Merge branch 'frame-backslash-fix' into 'next'

Accept '+' as substitute for '\' for sprite frames (PK3)

See merge request STJr/SRB2!380
This commit is contained in:
Monster Iestyn 2018-12-17 17:34:41 -05:00
commit bd58ff8c49

View file

@ -219,6 +219,7 @@ FUNCMATH FUNCINLINE static ATTRINLINE char R_Frame2Char(UINT8 frame)
FUNCMATH FUNCINLINE static ATTRINLINE UINT8 R_Char2Frame(char cn)
{
#if 1 // 2.1 compat
if (cn == '+') return '\\' - 'A'; // PK3 can't use backslash, so use + instead
return cn - 'A';
#else
if (cn >= 'A' && cn <= 'Z') return cn - 'A';