thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

A few stashed fixes that didn't make it to the branches somehow

Browse source
This commit is contained in:
TehRealSalt 2019-10-03 10:31:34 -04:00
parent 8338d3e71c
commit 37009ac9b0
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/f_wipe.c
View file

@ -461,11 +461,13 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu, const char *colormap, boolean r
#endif #endif
F_DoWipe(fmask, fcolor, reverse); F_DoWipe(fmask, fcolor, reverse);
#ifndef HWRENDER
if (encorewiggle) if (encorewiggle)
F_DoEncoreWiggle(wipeframe); // Can't think of a better way to run this on fades, unfortunately. {
#ifdef HWRENDER
if (rendermode != render_opengl)
#endif #endif
F_DoEncoreWiggle(wipeframe);
}
I_OsPolling(); I_OsPolling();
I_UpdateNoBlit(); I_UpdateNoBlit();

7
src/info.c
View file

@ -20382,13 +20382,6 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // damage 0, // damage
sfx_None, // activesound sfx_None, // activesound
MF_NOBLOCKMAP|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_SCENERY|MF_DONTENCOREMAP, // flags MF_NOBLOCKMAP|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_SCENERY|MF_DONTENCOREMAP, // flags
8<<FRACBITS, // radius
16<<FRACBITS, // height
0, // display offset
100, // mass
0, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DONTENCOREMAP, // flags
S_NULL // raisestate S_NULL // raisestate
}, },