mirror of
https://github.com/DrBeef/Raze.git
synced 2024-11-15 00:41:55 +00:00
Fix a couple of video mode switching bugs
git-svn-id: https://svn.eduke32.com/eduke32@143 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
2f99dd111b
commit
297400098b
2 changed files with 9 additions and 2 deletions
|
@ -2532,7 +2532,8 @@ void moveweapons(void)
|
|||
}
|
||||
}
|
||||
else */
|
||||
if(thisprojectile[i].workslike & PROJECTILE_FLAG_SPIT) if(s->zvel < 6144)
|
||||
if(thisprojectile[i].workslike & PROJECTILE_FLAG_SPIT)
|
||||
if(s->zvel < 6144)
|
||||
s->zvel += gc-112;
|
||||
|
||||
if(thisprojectile[i].workslike & PROJECTILE_FLAG_WATERBUBBLES && sector[s->sectnum].lotag == 2 && rnd(140))
|
||||
|
|
|
@ -2508,7 +2508,11 @@ cheat_for_port_credits:
|
|||
do {
|
||||
newvidmode++;
|
||||
if (newvidmode == lastvidmode) break; // end of cycle
|
||||
if (newvidmode >= validmodecnt) newvidmode = 0;
|
||||
if (newvidmode >= validmodecnt) {
|
||||
if(safevidmode != -1)
|
||||
break;
|
||||
newvidmode = 0;
|
||||
}
|
||||
if (validmode[newvidmode].bpp == (vidsets[newvidset]&0x0ffff) &&
|
||||
validmode[newvidmode].fs == newfullscreen &&
|
||||
validmode[newvidmode].xdim <= validmode[lastvidmode].xdim &&
|
||||
|
@ -2607,6 +2611,8 @@ cheat_for_port_credits:
|
|||
gameexit("Failed restoring old video mode.");
|
||||
} else onvideomodechange(pbpp > 8);
|
||||
} else onvideomodechange(nbpp > 8);
|
||||
|
||||
restorepalette = 1;
|
||||
vscrn();
|
||||
setrendermode(nrend);
|
||||
|
||||
|
|
Loading…
Reference in a new issue