zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Brightskins tweak, more whitespace

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@29 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-04-16 03:42:36 +00:00
parent e3d40c7b51
commit b11595ad2e
13 changed files with 589 additions and 593 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/source/actors.c
View file

@ -2515,7 +2515,7 @@ void moveweapons(void)
} }
} }
/* if(thisprojectile[i].workslike & 8192) /* if(thisprojectile[i].workslike & 8192)
{ {
for(k=-3;k<2;k++) for(k=-3;k<2;k++)
{ {

18
polymer/eduke32/source/game.c
View file

@ -2525,7 +2525,7 @@ void palto(char r,char g,char b,long e)
int i; int i;
char temparray[768]; char temparray[768];
long tc; long tc;
/* /*
for(i=0;i<768;i+=3) for(i=0;i<768;i+=3)
{ {
temparray[i ] = temparray[i ] =
@ -2535,7 +2535,7 @@ void palto(char r,char g,char b,long e)
temparray[i+2] = temparray[i+2] =
ps[myconnectindex].palette[i+2]+((((long)b-(long)ps[myconnectindex].palette[i+2])*(long)(e&127))>>6); ps[myconnectindex].palette[i+2]+((((long)b-(long)ps[myconnectindex].palette[i+2])*(long)(e&127))>>6);
} }
*/ */
//setbrightness(ud.brightness>>2,temparray); //setbrightness(ud.brightness>>2,temparray);
setpalettefade(r,g,b,e&127); setpalettefade(r,g,b,e&127);
@ -5847,14 +5847,14 @@ PALONLY:
if( sector[sect].floorpal && sector[sect].floorpal < numl) if( sector[sect].floorpal && sector[sect].floorpal < numl)
t->pal = sector[sect].floorpal; t->pal = sector[sect].floorpal;
if(ud.brightskins)
t->shade = -32; // yes? no?
if(s->owner == -1) continue; if(s->owner == -1) continue;
if( t->z > hittype[i].floorz && t->xrepeat < 32 ) if( t->z > hittype[i].floorz && t->xrepeat < 32 )
t->z = hittype[i].floorz; t->z = hittype[i].floorz;
if(ud.brightskins)
t->shade -= 15;
break; break;
case JIBS1__STATIC: case JIBS1__STATIC:
@ -5883,9 +5883,6 @@ PALONLY:
case SCRAP3__STATIC: case SCRAP3__STATIC:
case SCRAP4__STATIC: case SCRAP4__STATIC:
case SCRAP5__STATIC: case SCRAP5__STATIC:
if(hittype[i].picnum == BLIMP && t->picnum == SCRAP1 && s->yvel >= 0) if(hittype[i].picnum == BLIMP && t->picnum == SCRAP1 && s->yvel >= 0)
t->picnum = s->yvel; t->picnum = s->yvel;
else t->picnum += T1; else t->picnum += T1;
@ -5902,7 +5899,6 @@ PALONLY:
break; break;
} }
default: default:
if( sector[sect].floorpal && sector[sect].floorpal < numl ) if( sector[sect].floorpal && sector[sect].floorpal < numl )
t->pal = sector[sect].floorpal; t->pal = sector[sect].floorpal;
break; break;
@ -7137,7 +7133,7 @@ FAKE_F3:
screencapt = 0; screencapt = 0;
if( lastsavedpos >= 0 ) if( lastsavedpos >= 0 )
{ {
/* inputloc = strlen(&ud.savegame[lastsavedpos][0]); /* inputloc = strlen(&ud.savegame[lastsavedpos][0]);
current_menu = 360+lastsavedpos; current_menu = 360+lastsavedpos;
probey = lastsavedpos; */ probey = lastsavedpos; */
if(ud.multimode > 1) if(ud.multimode > 1)
@ -8356,7 +8352,7 @@ void app_main(int argc,char **argv)
int bpp[] = {32,16,8}; int bpp[] = {32,16,8};
initprintf("Failure setting video mode %dx%dx%d %s! Attempting safer mode...", initprintf("Failure setting video mode %dx%dx%d %s! Attempting safer mode...",
ScreenWidth,ScreenHeight,ScreenBPP,ScreenMode?"fullscreen":"windowed"); ScreenWidth,ScreenHeight,ScreenBPP,ScreenMode?"fullscreen":"windowed");
/* ScreenMode = 0; // JBF: was 2 /* ScreenMode = 0; // JBF: was 2
ScreenWidth = 800; ScreenWidth = 800;
ScreenHeight = 600; // JBF: was 200 ScreenHeight = 600; // JBF: was 200
ScreenBPP = 32; */ ScreenBPP = 32; */

2
polymer/eduke32/source/gamedef.c
View file

@ -809,7 +809,7 @@ LABELS inputlabels[]= {
{ "bits", INPUT_BITS, 0, 0 }, { "bits", INPUT_BITS, 0, 0 },
{ "bits2", INPUT_BITS2, 0, 0 }, { "bits2", INPUT_BITS2, 0, 0 },
{ "", -1, 0, 0 } // END OF LIST { "", -1, 0, 0 } // END OF LIST
}; };
void skipcomments(void) void skipcomments(void)
{ {

2
polymer/eduke32/source/osdcmds.c
View file

@ -382,7 +382,7 @@ int osdcmd_setvar(const osdfuncparm_t *parm)
SetGameVarID(i, varval, ps[myconnectindex].i, myconnectindex); SetGameVarID(i, varval, ps[myconnectindex].i, myconnectindex);
} }
return OSDCMD_OK; return OSDCMD_OK;
} }
int osdcmd_addpath(const osdfuncparm_t *parm) int osdcmd_addpath(const osdfuncparm_t *parm)
{ {