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

Instead of checking for mod being nonzero, pretend it's 1 - after all, there's no good behaviour in that circumstance otherwise.

This commit is contained in:
toaster 2019-11-02 18:12:12 +00:00
parent 417f17ebdd
commit 8909598baf
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/hardware/hw_md2.c
View File

@ -1085,16 +1085,15 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
if (mod > (INT32)((skin_t *)spr->mobj->skin)->sprites[spr2].numframes) if (mod > (INT32)((skin_t *)spr->mobj->skin)->sprites[spr2].numframes)
mod = ((skin_t *)spr->mobj->skin)->sprites[spr2].numframes; mod = ((skin_t *)spr->mobj->skin)->sprites[spr2].numframes;
#endif #endif
if (mod) if (!mod)
frame = md2->model->spr2frames[spr2].frames[frame%mod]; mod = 1;
else frame = md2->model->spr2frames[spr2].frames[frame%mod];
frame = 0;
} }
else else
{ {
mod = md2->model->meshes[0].numFrames; mod = md2->model->meshes[0].numFrames;
if (mod) if (!mod)
frame %= mod; mod = 1;
} }
#ifdef USE_MODEL_NEXTFRAME #ifdef USE_MODEL_NEXTFRAME
@ -1106,7 +1105,7 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
if (spr->mobj->skin && spr->mobj->sprite == SPR_PLAY && md2->model->spr2frames) if (spr->mobj->skin && spr->mobj->sprite == SPR_PLAY && md2->model->spr2frames)
{ {
if (mod && HWR_CanInterpolateSprite2(&md2->model->spr2frames[spr2]) if (HWR_CanInterpolateSprite2(&md2->model->spr2frames[spr2])
&& (spr->mobj->frame & FF_ANIMATE && (spr->mobj->frame & FF_ANIMATE
|| (spr->mobj->state->nextstate != S_NULL || (spr->mobj->state->nextstate != S_NULL
&& states[spr->mobj->state->nextstate].sprite == SPR_PLAY && states[spr->mobj->state->nextstate].sprite == SPR_PLAY
@ -1128,17 +1127,13 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
{ {
nextFrame = (spr->mobj->frame & FF_FRAMEMASK) + 1; nextFrame = (spr->mobj->frame & FF_FRAMEMASK) + 1;
if (nextFrame >= (INT32)(spr->mobj->state->var1 + (spr->mobj->state->frame & FF_FRAMEMASK))) if (nextFrame >= (INT32)(spr->mobj->state->var1 + (spr->mobj->state->frame & FF_FRAMEMASK)))
nextFrame = (spr->mobj->state->frame & FF_FRAMEMASK); nextFrame = (spr->mobj->state->frame & FF_FRAMEMASK) % mod;
//next = &md2->model->meshes[0].frames[nextFrame];
} }
else else
{ {
if (spr->mobj->state->nextstate != S_NULL && states[spr->mobj->state->nextstate].sprite != SPR_NULL if (spr->mobj->state->nextstate != S_NULL && states[spr->mobj->state->nextstate].sprite != SPR_NULL
&& !(spr->mobj->player && (spr->mobj->state->nextstate == S_PLAY_WAIT) && spr->mobj->state == &states[S_PLAY_STND])) && !(spr->mobj->player && (spr->mobj->state->nextstate == S_PLAY_WAIT) && spr->mobj->state == &states[S_PLAY_STND]))
{ nextFrame = (states[spr->mobj->state->nextstate].frame & FF_FRAMEMASK) % mod;
nextFrame = (states[spr->mobj->state->nextstate].frame & FF_FRAMEMASK);
//next = &md2->model->meshes[0].frames[nextFrame];
}
} }
} }
} }