From c120d9f915db46e731653ec65fdf82d34f744d13 Mon Sep 17 00:00:00 2001 From: terminx Date: Thu, 13 Jul 2006 03:16:51 +0000 Subject: [PATCH] git-svn-id: https://svn.eduke32.com/eduke32@218 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/build/src/polymost.c | 30 +++++++++++++++--------------- polymer/eduke32/source/game.c | 18 ++++++------------ 2 files changed, 21 insertions(+), 27 deletions(-) diff --git a/polymer/build/src/polymost.c b/polymer/build/src/polymost.c index caaa46f45..be6f3a9a9 100644 --- a/polymer/build/src/polymost.c +++ b/polymer/build/src/polymost.c @@ -2217,9 +2217,9 @@ static void polymost_drawalls (long bunch) col[2] = (float)palookupfog[sec->floorpal].b / 63.f; col[3] = 0; bglFogfv(GL_FOG_COLOR,col); - bglFogf(GL_FOG_DENSITY,gvisibility*((float)((unsigned char)(sec->visibility+16)))); + bglFogf(GL_FOG_DENSITY,gvisibility*((float)((unsigned char)(sec->visibility<240?sec->visibility+16:sec->visibility-240)))); -// bglFogf(GL_FOG_DENSITY,gvisibility*((float)((unsigned char)(sec->visibility+16)))); +// bglFogf(GL_FOG_DENSITY,gvisibility*((float)((unsigned char)(sec->visibility<240?sec->visibility+16:sec->visibility-240)))); } } #endif @@ -2381,7 +2381,7 @@ static void polymost_drawalls (long bunch) { int i = klabs(sec->floorshade); if(i > 30) i = 30; - bglFogf(GL_FOG_DENSITY,gvisibility/(sec->floorshade<0?(fogtable[i]-glnegfogsub)*glnegshadescale:1)*(sec->floorshade<0?1:fogtable[i]*glshadescale)*((float)((unsigned char)(sec->visibility+16)))); + bglFogf(GL_FOG_DENSITY,gvisibility/(sec->floorshade<0?(fogtable[i]-glnegfogsub)*glnegshadescale:1)*(sec->floorshade<0?1:fogtable[i]*glshadescale)*((float)((unsigned char)(sec->visibility<240?sec->visibility+16:sec->visibility-240)))); } pow2xsplit = 0; domost(x0,fy0,x1,fy1); //flor domostpolymethod = 0; @@ -2394,7 +2394,7 @@ static void polymost_drawalls (long bunch) { /* if (!nofog) { bglDisable(GL_FOG); - //r = ((float)globalpisibility)*((float)((unsigned char)(sec->visibility+16)))*FOGSCALE; + //r = ((float)globalpisibility)*((float)((unsigned char)(sec->visibility<240?sec->visibility+16:sec->visibility-240)))*FOGSCALE; //r *= ((double)xdimscale*(double)viewingrange*gdo) / (65536.0*65536.0); //bglFogf(GL_FOG_DENSITY,r); } */ @@ -2403,7 +2403,7 @@ static void polymost_drawalls (long bunch) { int i = klabs(sec->floorshade); if(i > 30) i = 30; - bglFogf(GL_FOG_DENSITY,0.005*gvisibility/(sec->floorshade<0?(fogtable[i]-glnegfogsub)*glnegshadescale:1)*((float)((unsigned char)(sec->visibility+16)))); + bglFogf(GL_FOG_DENSITY,0.005*gvisibility/(sec->floorshade<0?(fogtable[i]-glnegfogsub)*glnegshadescale:1)*((float)((unsigned char)(sec->visibility<240?sec->visibility+16:sec->visibility-240)))); } //Use clamping for tiled sky textures @@ -2636,7 +2636,7 @@ static void polymost_drawalls (long bunch) skyclamphack = 0; if (!nofog) { bglEnable(GL_FOG); - //bglFogf(GL_FOG_DENSITY,gvisibility*((float)((unsigned char)(sec->visibility+16)))); + //bglFogf(GL_FOG_DENSITY,gvisibility*((float)((unsigned char)(sec->visibility<240?sec->visibility+16:sec->visibility-240)))); } } #endif @@ -2747,7 +2747,7 @@ static void polymost_drawalls (long bunch) { int i = klabs(sec->ceilingshade); if(i > 30) i = 30; - bglFogf(GL_FOG_DENSITY,gvisibility/(sec->ceilingshade<0?(fogtable[i]-glnegfogsub)*glnegshadescale:1)*(sec->ceilingshade<0?1:fogtable[i]*glshadescale)*((float)((unsigned char)(sec->visibility+16)))); + bglFogf(GL_FOG_DENSITY,gvisibility/(sec->ceilingshade<0?(fogtable[i]-glnegfogsub)*glnegshadescale:1)*(sec->ceilingshade<0?1:fogtable[i]*glshadescale)*((float)((unsigned char)(sec->visibility<240?sec->visibility+16:sec->visibility-240)))); } pow2xsplit = 0; domost(x1,cy1,x0,cy0); //ceil domostpolymethod = 0; @@ -2759,7 +2759,7 @@ static void polymost_drawalls (long bunch) { /* if (!nofog) { bglDisable(GL_FOG); - //r = ((float)globalpisibility)*((float)((unsigned char)(sec->visibility+16)))*FOGSCALE; + //r = ((float)globalpisibility)*((float)((unsigned char)(sec->visibility<240?sec->visibility+16:sec->visibility-240)))*FOGSCALE; //r *= ((double)xdimscale*(double)viewingrange*gdo) / (65536.0*65536.0); //bglFogf(GL_FOG_DENSITY,r); } @@ -2768,7 +2768,7 @@ static void polymost_drawalls (long bunch) { int i = klabs(sec->ceilingshade); if(i > 30) i = 30; - bglFogf(GL_FOG_DENSITY,0.005*gvisibility/(sec->ceilingshade<0?(fogtable[i]-glnegfogsub)*glnegshadescale:1)*((float)((unsigned char)(sec->visibility+16)))); + bglFogf(GL_FOG_DENSITY,0.005*gvisibility/(sec->ceilingshade<0?(fogtable[i]-glnegfogsub)*glnegshadescale:1)*((float)((unsigned char)(sec->visibility<240?sec->visibility+16:sec->visibility-240)))); } //Use clamping for tiled sky textures @@ -3000,7 +3000,7 @@ static void polymost_drawalls (long bunch) skyclamphack = 0; if (!nofog) { bglEnable(GL_FOG); - //bglFogf(GL_FOG_DENSITY,gvisibility*((float)((unsigned char)(sec->visibility+16)))); + //bglFogf(GL_FOG_DENSITY,gvisibility*((float)((unsigned char)(sec->visibility<240?sec->visibility+16:sec->visibility-240)))); } } #endif @@ -3085,7 +3085,7 @@ static void polymost_drawalls (long bunch) { int i = klabs(wal->shade); if(i > 30) i = 30; - bglFogf(GL_FOG_DENSITY,gvisibility/(wal->shade<0?(fogtable[i]-glnegfogsub)*glnegshadescale:1)*(wal->shade<0?1:fogtable[i]*glshadescale)*((float)((unsigned char)(sec->visibility+16)))); + bglFogf(GL_FOG_DENSITY,gvisibility/(wal->shade<0?(fogtable[i]-glnegfogsub)*glnegshadescale:1)*(wal->shade<0?1:fogtable[i]*glshadescale)*((float)((unsigned char)(sec->visibility<240?sec->visibility+16:sec->visibility-240)))); } pow2xsplit = 1; domost(x1,ocy1,x0,ocy0); if (wal->cstat&8) { gux = ogux; guy = oguy; guo = oguo; } @@ -3126,7 +3126,7 @@ static void polymost_drawalls (long bunch) { int i = klabs(nwal->shade); if(i > 30) i = 30; - bglFogf(GL_FOG_DENSITY,gvisibility/(nwal->shade<0?(fogtable[i]-glnegfogsub)*glnegshadescale:1)*(nwal->shade<0?1:fogtable[i]*glshadescale)*((float)((unsigned char)(sec->visibility+16)))); + bglFogf(GL_FOG_DENSITY,gvisibility/(nwal->shade<0?(fogtable[i]-glnegfogsub)*glnegshadescale:1)*(nwal->shade<0?1:fogtable[i]*glshadescale)*((float)((unsigned char)(sec->visibility<240?sec->visibility+16:sec->visibility-240)))); } pow2xsplit = 1; domost(x0,ofy0,x1,ofy1); if (wal->cstat&(2+8)) { guo = oguo; gux = ogux; guy = oguy; } @@ -3163,7 +3163,7 @@ static void polymost_drawalls (long bunch) { int i = klabs(wal->shade); if(i > 30) i = 30; - bglFogf(GL_FOG_DENSITY,gvisibility/(wal->shade<0?(fogtable[i]-glnegfogsub)*glnegshadescale:1)*(wal->shade<0?1:fogtable[i]*glshadescale)*((float)((unsigned char)(sec->visibility+16)))); + bglFogf(GL_FOG_DENSITY,gvisibility/(wal->shade<0?(fogtable[i]-glnegfogsub)*glnegshadescale:1)*(wal->shade<0?1:fogtable[i]*glshadescale)*((float)((unsigned char)(sec->visibility<240?sec->visibility+16:sec->visibility-240)))); } pow2xsplit = 1; domost(x0,-10000,x1,-10000); } @@ -3621,7 +3621,7 @@ if (yp1 < SCISDIST) { t1 = (SCISDIST-oyp0)/(yp1-oyp0); xp1 = (xp1-oxp0)*t1+oxp0; { int i = klabs(wal->shade); if(i > 30) i = 30; - bglFogf(GL_FOG_DENSITY,gvisibility/(wal->shade<0?(fogtable[i]-glnegfogsub)*glnegshadescale:1)*(wal->shade<0?1:fogtable[i]*glshadescale)*((float)((unsigned char)(sec->visibility+16)))); + bglFogf(GL_FOG_DENSITY,gvisibility/(wal->shade<0?(fogtable[i]-glnegfogsub)*glnegshadescale:1)*(wal->shade<0?1:fogtable[i]*glshadescale)*((float)((unsigned char)(sec->visibility<240?sec->visibility+16:sec->visibility-240)))); } } } @@ -3734,7 +3734,7 @@ if (tspr->cstat&2) { if (!(tspr->cstat&512)) method = 2+4; else method = 3+4; } { int i = klabs(globalshade); if(i > 30) i = 30; - bglFogf(GL_FOG_DENSITY,gvisibility/(globalshade<0?(fogtable[i]-glnegfogsub)*glnegshadescale:1)*(globalshade<0?1:fogtable[i]*glsprshadescale)*((float)((unsigned char)(sector[tspr->sectnum].visibility+16)))); + bglFogf(GL_FOG_DENSITY,gvisibility/(globalshade<0?(fogtable[i]-glnegfogsub)*glnegshadescale:1)*(globalshade<0?1:fogtable[i]*glsprshadescale)*((float)((unsigned char)(sector[tspr->sectnum].visibility<240?sector[tspr->sectnum].visibility+16:sector[tspr->sectnum].visibility-240)))); } } diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index 4334e0c5f..d9457d578 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -1856,32 +1856,26 @@ if (sbar.frag[myconnectindex] != p->frag) { sbar.frag[myconnectindex] = p->frag; } } if (sbar.curr_weapon != p->curr_weapon) { sbar.curr_weapon = p->curr_weapon; u |= (4+8+16+32+64+128+256+512+1024+65536L); } - for(i=1;i < MAX_WEAPONS;i++) + + for(i=1;iammo_amount[i]) { sbar.ammo_amount[i] = p->ammo_amount[i]; if(i < 9) u |= ((2<gotweapon[i]) { sbar.gotweapon[i] = p->gotweapon[i]; if(i < 9 ) u |= ((2<inven_icon) { sbar.inven_icon = p->inven_icon; u |= (2048+4096+8192); } if (sbar.holoduke_on != p->holoduke_on) { sbar.holoduke_on = p->holoduke_on; u |= (4096+8192); } if (sbar.jetpack_on != p->jetpack_on) { sbar.jetpack_on = p->jetpack_on; u |= (4096+8192); }