lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fixed_new_new_spriteframe_angle' into 'master' 

Fixed new new spriteframe angle

@Nev3r helped me discover a crash caused by NAMEcLcR not loading patches into every angle lump slot. This is the smallest possible change that fixes the crash.

This is a one line change exclusively modifying an edge case for a feature which isn't available in public builds. Therefore, it SHOULD require (almost) zero code review, and I would've committed directly to master if I had the ability to do that (and the desire to disregard ettiquette). Please help me out here.

See merge request !38
This commit is contained in:
Monster Iestyn 2016-08-26 15:46:39 -04:00
parent 074dde5f78 8a244c1816
commit 544974ee35
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/r_things.c
View File

@ -145,7 +145,7 @@ static void R_InstallSpriteLump(UINT16 wad, // graphics patch
if (sprtemp[frame].rotate == (SRF_3D|SRF_2D))
sprtemp[frame].rotate = SRF_2D; // SRF_3D|SRF_2D being enabled at the same time doesn't HURT in the current sprite angle implementation, but it DOES mean more to check in some of the helper functions. Let's not allow this scenario to happen.
for (r = 1; r < 4; r++) // Don't set for front/back frames
for (r = 0; r < 4; r++) // Thanks to R_PrecacheLevel, we can't leave sprtemp[*].lumppat[*] == LUMPERROR... so we load into the front/back angle too.
{
sprtemp[frame].lumppat[r + rightfactor] = lumppat;
sprtemp[frame].lumpid[r + rightfactor] = lumpid;