mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-21 12:01:05 +00:00
Merge branch 'fix-trnslate-lumps-being-recognized-as-sprite-names' into 'next'
Prevent TRNSLATE lumps from being recognized as valid sprite names See merge request STJr/SRB2!2524
This commit is contained in:
commit
6c0e105544
1 changed files with 8 additions and 0 deletions
|
@ -279,6 +279,14 @@ static boolean GetFramesAndRotationsFromShortLumpName(
|
|||
*ret_rotation2 = R_Char2Rotation(name[7]);
|
||||
if (*ret_frame2 >= 64 || *ret_rotation2 == 255)
|
||||
return false;
|
||||
|
||||
// TRNSLATE is a valid but extremely unlikely sprite name:
|
||||
// * The sprite name is "TRNS"
|
||||
// * The frame is L, rotation A; mirrored to frame T, rotation E
|
||||
// In the very unfortunate event that TRNSLATE is found between sprite lumps,
|
||||
// this name check prevents it from being added as a sprite, when it actually isn't.
|
||||
if (memcmp(name, "TRNSLATE", 8) == 0)
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue