zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 03:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for weapon switch option issue with demo playback

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@34 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-04-16 21:15:12 +00:00
parent 7170226bca
commit f59fefe33d
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
polymer/eduke32/source/config.c
View file

@ -631,6 +631,7 @@ void CONFIG_ReadSetup( void )
SCRIPT_GetNumber( scripthandle, "Controls","AutoAim",&AutoAim); // JBF 20031125 SCRIPT_GetNumber( scripthandle, "Controls","AutoAim",&AutoAim); // JBF 20031125
ps[0].auto_aim = AutoAim; ps[0].auto_aim = AutoAim;
SCRIPT_GetNumber( scripthandle, "Controls","WeaponSwitchMode",&ud.weaponswitch); SCRIPT_GetNumber( scripthandle, "Controls","WeaponSwitchMode",&ud.weaponswitch);
ps[0].weaponswitch = ud.weaponswitch;
glusetexcache = glusetexcachecompression = -1; glusetexcache = glusetexcachecompression = -1;
SCRIPT_GetNumber( scripthandle, "Screen Setup", "GLUseCompressedTextureCache", &glusetexcache); SCRIPT_GetNumber( scripthandle, "Screen Setup", "GLUseCompressedTextureCache", &glusetexcache);
SCRIPT_GetNumber( scripthandle, "Screen Setup", "GLUseTextureCacheCompression", &glusetexcachecompression); SCRIPT_GetNumber( scripthandle, "Screen Setup", "GLUseTextureCacheCompression", &glusetexcachecompression);

7
polymer/eduke32/source/gameexec.c
View file

@ -3564,17 +3564,14 @@ char parse(void)
case CON_SIZETO: case CON_SIZETO:
insptr++; insptr++;
j = (*insptr++-g_sp->xrepeat)<<1; j = (*(insptr++)-g_sp->xrepeat)<<1;
g_sp->xrepeat += ksgn(j); g_sp->xrepeat += ksgn(j);
if( ( g_sp->picnum == APLAYER && g_sp->yrepeat < 36 ) || *insptr < g_sp->yrepeat || ((g_sp->yrepeat*(tilesizy[g_sp->picnum]+8))<<2) < (hittype[g_i].floorz - hittype[g_i].ceilingz) ) if( ( g_sp->picnum == APLAYER && g_sp->yrepeat < 36 ) || *insptr++ < g_sp->yrepeat || ((g_sp->yrepeat*(tilesizy[g_sp->picnum]+8))<<2) < (hittype[g_i].floorz - hittype[g_i].ceilingz) )
{ {
j = ((*insptr)-g_sp->yrepeat)<<1; j = ((*insptr)-g_sp->yrepeat)<<1;
if( klabs(j) ) g_sp->yrepeat += ksgn(j); if( klabs(j) ) g_sp->yrepeat += ksgn(j);
} }
insptr++;
break; break;
case CON_SIZEAT: case CON_SIZEAT:
insptr++; insptr++;