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

Usual cleanup type stuff involving vectors and variable scopes.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5802 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2016-06-21 00:34:29 +00:00
parent 0e713e698f
commit 951ad678c4
3 changed files with 200 additions and 218 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
polymer/eduke32/build/include/build.h
View file

@ -1157,24 +1157,24 @@ void rotatepoint(vec2_t pivot, vec2_t p, int16_t daang, vec2_t *p2) ATTRIBU
int32_t lastwall(int16_t point); int32_t lastwall(int16_t point);
int32_t nextsectorneighborz(int16_t sectnum, int32_t refz, int16_t topbottom, int16_t direction); int32_t nextsectorneighborz(int16_t sectnum, int32_t refz, int16_t topbottom, int16_t direction);
int32_t getceilzofslopeptr(const sectortype *sec, int32_t dax, int32_t day) ATTRIBUTE((nonnull(1))); int32_t getceilzofslopeptr(const usectortype *sec, int32_t dax, int32_t day) ATTRIBUTE((nonnull(1)));
int32_t getflorzofslopeptr(const sectortype *sec, int32_t dax, int32_t day) ATTRIBUTE((nonnull(1))); int32_t getflorzofslopeptr(const usectortype *sec, int32_t dax, int32_t day) ATTRIBUTE((nonnull(1)));
void getzsofslopeptr(const sectortype *sec, int32_t dax, int32_t day, void getzsofslopeptr(const usectortype *sec, int32_t dax, int32_t day,
int32_t *ceilz, int32_t *florz) ATTRIBUTE((nonnull(1,4,5))); int32_t *ceilz, int32_t *florz) ATTRIBUTE((nonnull(1,4,5)));
FORCE_INLINE int32_t getceilzofslope(int16_t sectnum, int32_t dax, int32_t day) FORCE_INLINE int32_t getceilzofslope(int16_t sectnum, int32_t dax, int32_t day)
{ {
return getceilzofslopeptr(&sector[sectnum], dax, day); return getceilzofslopeptr((usectortype *)&sector[sectnum], dax, day);
} }
FORCE_INLINE int32_t getflorzofslope(int16_t sectnum, int32_t dax, int32_t day) FORCE_INLINE int32_t getflorzofslope(int16_t sectnum, int32_t dax, int32_t day)
{ {
return getflorzofslopeptr(&sector[sectnum], dax, day); return getflorzofslopeptr((usectortype *)&sector[sectnum], dax, day);
} }
FORCE_INLINE void getzsofslope(int16_t sectnum, int32_t dax, int32_t day, int32_t *ceilz, int32_t *florz) FORCE_INLINE void getzsofslope(int16_t sectnum, int32_t dax, int32_t day, int32_t *ceilz, int32_t *florz)
{ {
getzsofslopeptr(&sector[sectnum], dax, day, ceilz, florz); getzsofslopeptr((usectortype *)&sector[sectnum], dax, day, ceilz, florz);
} }
// Is <wal> a red wall in a safe fashion, i.e. only if consistency invariant // Is <wal> a red wall in a safe fashion, i.e. only if consistency invariant

323
polymer/eduke32/build/src/engine.c
View file

@ -1425,7 +1425,7 @@ static int32_t *lastx;
int32_t halfxdim16, midydim16; int32_t halfxdim16, midydim16;
static const int32_t hitscangoalx = (1<<29)-1, hitscangoaly = (1<<29)-1; static vec2_t const hitscangoal = { (1<<29)-1, (1<<29)-1 };
#ifdef USE_OPENGL #ifdef USE_OPENGL
int32_t hitallsprites = 0; int32_t hitallsprites = 0;
#endif #endif
@ -1473,9 +1473,9 @@ char inpreparemirror = 0;
static int32_t mirrorsx1, mirrorsy1, mirrorsx2, mirrorsy2; static int32_t mirrorsx1, mirrorsy1, mirrorsx2, mirrorsy2;
static int32_t setviewcnt = 0; // interface layers use this now static int32_t setviewcnt = 0; // interface layers use this now
static int32_t bakframeplace[4], bakxsiz[4], bakysiz[4]; static intptr_t bakframeplace[4];
static int32_t bakwindowx1[4], bakwindowy1[4]; static int32_t bakxsiz[4], bakysiz[4];
static int32_t bakwindowx2[4], bakwindowy2[4]; static vec2_t bakwindowxy1[4], bakwindowxy2[4];
#ifdef USE_OPENGL #ifdef USE_OPENGL
static int32_t bakrendmode; static int32_t bakrendmode;
#endif #endif
@ -9847,7 +9847,6 @@ int32_t setgamemode(char davidoption, int32_t daxdim, int32_t daydim, int32_t da
// //
void nextpage(void) void nextpage(void)
{ {
int32_t i;
permfifotype *per; permfifotype *per;
//char snotbuf[32]; //char snotbuf[32];
@ -9867,7 +9866,7 @@ void nextpage(void)
{ {
case 200: case 200:
begindrawing(); //{{{ begindrawing(); //{{{
for (i=permtail; i!=permhead; i=((i+1)&(MAXPERMS-1))) for (int i=permtail; i!=permhead; i=((i+1)&(MAXPERMS-1)))
{ {
per = &permfifo[i]; per = &permfifo[i];
if ((per->pagesleft > 0) && (per->pagesleft <= numpages)) if ((per->pagesleft > 0) && (per->pagesleft <= numpages))
@ -9881,7 +9880,7 @@ void nextpage(void)
showframe(0); showframe(0);
begindrawing(); //{{{ begindrawing(); //{{{
for (i=permtail; i!=permhead; i=((i+1)&(MAXPERMS-1))) for (int i=permtail; i!=permhead; i=((i+1)&(MAXPERMS-1)))
{ {
per = &permfifo[i]; per = &permfifo[i];
if (per->pagesleft >= 130) if (per->pagesleft >= 130)
@ -9908,7 +9907,7 @@ void nextpage(void)
#ifdef USE_OPENGL #ifdef USE_OPENGL
omdtims = mdtims; mdtims = getticks(); omdtims = mdtims; mdtims = getticks();
for (int i = 0; i < Numsprites; i++) for (int i = 0; i < Numsprites; ++i)
if ((mdpause && spriteext[i].mdanimtims) || (spriteext[i].flags & SPREXT_NOMDANIM)) if ((mdpause && spriteext[i].mdanimtims) || (spriteext[i].flags & SPREXT_NOMDANIM))
spriteext[i].mdanimtims += mdtims - omdtims; spriteext[i].mdanimtims += mdtims - omdtims;
#endif #endif
@ -9974,7 +9973,7 @@ int32_t inside(int32_t x, int32_t y, int16_t sectnum)
{ {
uint32_t cnt1 = 0, cnt2 = 0; uint32_t cnt1 = 0, cnt2 = 0;
uwalltype const * wal = (uwalltype *) &wall[sector[sectnum].wallptr]; uwalltype const * wal = (uwalltype *) &wall[sector[sectnum].wallptr];
int32_t i = sector[sectnum].wallnum; int wallsleft = sector[sectnum].wallnum;
do do
{ {
@ -10013,9 +10012,9 @@ int32_t inside(int32_t x, int32_t y, int16_t sectnum)
cnt2 ^= (((v1.x^v2.x) >= 0) ? v1.x : (v1.x*v2.y-v2.x*v1.y)^v2.y); cnt2 ^= (((v1.x^v2.x) >= 0) ? v1.x : (v1.x*v2.y-v2.x*v1.y)^v2.y);
} }
wal++; i--; wal++;
} }
while (i); while (--wallsleft);
return (cnt1|cnt2)>>31; return (cnt1|cnt2)>>31;
} }
@ -10611,7 +10610,7 @@ int32_t hitscan(const vec3_t *sv, int16_t sectnum, int32_t vx, int32_t vy, int32
#ifdef YAX_ENABLE #ifdef YAX_ENABLE
restart_grand: restart_grand:
#endif #endif
hit->pos.x = hitscangoalx; hit->pos.y = hitscangoaly; *(vec2_t *)&hit->pos = hitscangoal;
clipsectorlist[0] = sectnum; clipsectorlist[0] = sectnum;
tempshortcnt = 0; tempshortnum = 1; tempshortcnt = 0; tempshortnum = 1;
@ -11246,28 +11245,25 @@ static inline int32_t inside_z_p(int32_t x, int32_t y, int32_t z, int16_t i)
// //
void updatesector(int32_t x, int32_t y, int16_t *sectnum) void updatesector(int32_t x, int32_t y, int16_t *sectnum)
{ {
int32_t i;
if (inside_p(x,y,*sectnum)) if (inside_p(x,y,*sectnum))
return; return;
if ((unsigned)*sectnum < (unsigned)numsectors) if ((unsigned)*sectnum < (unsigned)numsectors)
{ {
const uwalltype *wal = (uwalltype *)&wall[sector[*sectnum].wallptr]; const uwalltype *wal = (uwalltype *)&wall[sector[*sectnum].wallptr];
int32_t j = sector[*sectnum].wallnum; int wallsleft = sector[*sectnum].wallnum;
do do
{ {
i = wal->nextsector; int const next = wal->nextsector;
if (inside_p(x, y, i)) if (inside_p(x, y, next))
SET_AND_RETURN(*sectnum, i); SET_AND_RETURN(*sectnum, next);
wal++;
wal++; j--;
} }
while (j != 0); while (--wallsleft);
} }
for (i=numsectors-1; i>=0; i--) for (int i=numsectors-1; i>=0; --i)
if (inside_p(x, y, i)) if (inside_p(x, y, i))
SET_AND_RETURN(*sectnum, i); SET_AND_RETURN(*sectnum, i);
@ -11306,28 +11302,25 @@ void updatesectorbreadth(int32_t x, int32_t y, int16_t *sectnum)
void updatesectorexclude(int32_t x, int32_t y, int16_t *sectnum, const uint8_t *excludesectbitmap) void updatesectorexclude(int32_t x, int32_t y, int16_t *sectnum, const uint8_t *excludesectbitmap)
{ {
int32_t i;
if (inside_exclude_p(x, y, *sectnum, excludesectbitmap)) if (inside_exclude_p(x, y, *sectnum, excludesectbitmap))
return; return;
if (*sectnum >= 0 && *sectnum < numsectors) if (*sectnum >= 0 && *sectnum < numsectors)
{ {
const uwalltype *wal = (uwalltype *)&wall[sector[*sectnum].wallptr]; const uwalltype *wal = (uwalltype *)&wall[sector[*sectnum].wallptr];
int32_t j = sector[*sectnum].wallnum; int wallsleft = sector[*sectnum].wallnum;
do do
{ {
i = wal->nextsector; int const next = wal->nextsector;
if (inside_exclude_p(x, y, i, excludesectbitmap)) if (inside_exclude_p(x, y, next, excludesectbitmap))
SET_AND_RETURN(*sectnum, i); SET_AND_RETURN(*sectnum, next);
wal++;
wal++; j--;
} }
while (j != 0); while (--wallsleft);
} }
for (i=numsectors-1; i>=0; i--) for (int i=numsectors-1; i>=0; --i)
if (inside_exclude_p(x, y, i, excludesectbitmap)) if (inside_exclude_p(x, y, i, excludesectbitmap))
SET_AND_RETURN(*sectnum, i); SET_AND_RETURN(*sectnum, i);
@ -11339,13 +11332,8 @@ void updatesectorexclude(int32_t x, int32_t y, int16_t *sectnum, const uint8_t *
// (not initial anymore because it follows the sector updating due to TROR) // (not initial anymore because it follows the sector updating due to TROR)
void updatesectorz(int32_t x, int32_t y, int32_t z, int16_t *sectnum) void updatesectorz(int32_t x, int32_t y, int32_t z, int16_t *sectnum)
{ {
int32_t i;
if ((uint32_t)(*sectnum) < 2*MAXSECTORS) if ((uint32_t)(*sectnum) < 2*MAXSECTORS)
{ {
const uwalltype *wal;
int32_t j, cz, fz;
int32_t nofirstzcheck = 0; int32_t nofirstzcheck = 0;
if (*sectnum >= MAXSECTORS) if (*sectnum >= MAXSECTORS)
@ -11355,42 +11343,43 @@ void updatesectorz(int32_t x, int32_t y, int32_t z, int16_t *sectnum)
} }
// this block used to be outside the "if" and caused crashes in Polymost Mapster32 // this block used to be outside the "if" and caused crashes in Polymost Mapster32
int32_t cz, fz;
getzsofslope(*sectnum, x, y, &cz, &fz); getzsofslope(*sectnum, x, y, &cz, &fz);
#ifdef YAX_ENABLE #ifdef YAX_ENABLE
if (z < cz) if (z < cz)
{ {
i = yax_getneighborsect(x, y, *sectnum, YAX_CEILING); int const next = yax_getneighborsect(x, y, *sectnum, YAX_CEILING);
if (i >= 0 && z >= getceilzofslope(i, x, y)) if (next >= 0 && z >= getceilzofslope(next, x, y))
SET_AND_RETURN(*sectnum, i); SET_AND_RETURN(*sectnum, next);
} }
if (z > fz) if (z > fz)
{ {
i = yax_getneighborsect(x, y, *sectnum, YAX_FLOOR); int const next = yax_getneighborsect(x, y, *sectnum, YAX_FLOOR);
if (i >= 0 && z <= getflorzofslope(i, x, y)) if (next >= 0 && z <= getflorzofslope(next, x, y))
SET_AND_RETURN(*sectnum, i); SET_AND_RETURN(*sectnum, next);
} }
#endif #endif
if (nofirstzcheck || (z >= cz && z <= fz)) if (nofirstzcheck || (z >= cz && z <= fz))
if (inside_p(x, y, *sectnum)) if (inside_p(x, y, *sectnum))
return; return;
wal = (uwalltype *)&wall[sector[*sectnum].wallptr]; uwalltype const * wal = (uwalltype *)&wall[sector[*sectnum].wallptr];
j = sector[*sectnum].wallnum; int wallsleft = sector[*sectnum].wallnum;
do do
{ {
// YAX: TODO: check neighboring sectors here too? // YAX: TODO: check neighboring sectors here too?
i = wal->nextsector; int const next = wal->nextsector;
if (i>=0 && inside_z_p(x,y,z, i)) if (next>=0 && inside_z_p(x,y,z, next))
SET_AND_RETURN(*sectnum, i); SET_AND_RETURN(*sectnum, next);
wal++; j--; wal++;
} }
while (j != 0); while (--wallsleft);
} }
for (i=numsectors-1; i>=0; i--) for (int i=numsectors-1; i>=0; --i)
if (inside_z_p(x,y,z, i)) if (inside_z_p(x,y,z, i))
SET_AND_RETURN(*sectnum, i); SET_AND_RETURN(*sectnum, i);
@ -11505,7 +11494,6 @@ void getzrange(const vec3_t *pos, int16_t sectnum,
} }
int32_t clipsectcnt = 0; int32_t clipsectcnt = 0;
int32_t daz, daz2, i, j, x1, y1, x2, y2;
#ifdef YAX_ENABLE #ifdef YAX_ENABLE
// YAX round, -1:center, 0:ceiling, 1:floor // YAX round, -1:center, 0:ceiling, 1:floor
@ -11566,15 +11554,16 @@ restart_grand:
clipsprite_initindex(curidx, curspr, &clipsectcnt, pos); clipsprite_initindex(curidx, curspr, &clipsectcnt, pos);
for (i=0; i<clipsectnum; i++) for (int i=0; i<clipsectnum; i++)
{ {
const int k = clipsectorlist[i]; int const k = clipsectorlist[i];
if (k==sectq[clipinfo[curidx].qend]) if (k==sectq[clipinfo[curidx].qend])
continue; continue;
int32_t fz, cz; int32_t daz, daz2;
getzsofslope(k,pos->x,pos->y,&daz,&daz2); getzsofslope(k,pos->x,pos->y,&daz,&daz2);
int32_t fz, cz;
getzsofslope(sectq[clipinfo[curidx].qend],pos->x,pos->y,&cz,&fz); getzsofslope(sectq[clipinfo[curidx].qend],pos->x,pos->y,&cz,&fz);
const int hitwhat = (curspr-(uspritetype *)sprite)+49152; const int hitwhat = (curspr-(uspritetype *)sprite)+49152;
@ -11597,25 +11586,26 @@ restart_grand:
const int startwall = startsec->wallptr; const int startwall = startsec->wallptr;
const int endwall = startwall + startsec->wallnum; const int endwall = startwall + startsec->wallnum;
for (j=startwall; j<endwall; j++) for (int j=startwall; j<endwall; j++)
{ {
const int k = wall[j].nextsector; const int k = wall[j].nextsector;
if (k >= 0) if (k >= 0)
{ {
x1 = wall[j].x; x2 = wall[wall[j].point2].x; vec2_t const v1 = *(vec2_t *)&wall[j];
if ((x1 < xmin) && (x2 < xmin)) continue; vec2_t const v2 = *(vec2_t *)&wall[wall[j].point2];
if ((x1 > xmax) && (x2 > xmax)) continue;
y1 = wall[j].y; y2 = wall[wall[j].point2].y;
if ((y1 < ymin) && (y2 < ymin)) continue;
if ((y1 > ymax) && (y2 > ymax)) continue;
const int32_t dx = x2-x1, dy = y2-y1; if ((v1.x < xmin && (v2.x < xmin)) || (v1.x > xmax && v2.x > xmax) ||
if (dx*(pos->y-y1) < (pos->x-x1)*dy) continue; //back (v1.y < ymin && (v2.y < ymin)) || (v1.y > ymax && v2.y > ymax))
continue;
int32_t dax = (dx > 0) ? dx*(ymin-y1) : dx*(ymax-y1); vec2_t const d = { v2.x-v1.x, v2.y-v1.y };
int32_t day = (dy > 0) ? dy*(xmax-x1) : dy*(xmin-x1); if (d.x*(pos->y-v1.y) < (pos->x-v1.x)*d.y) continue; //back
if (dax >= day)
vec2_t da = { (d.x > 0) ? d.x*(ymin-v1.y) : d.x*(ymax-v1.y),
(d.y > 0) ? d.y*(xmax-v1.x) : d.y*(xmin-v1.x) };
if (da.x >= da.y)
continue; continue;
if (wall[j].cstat&dawalclipmask) continue; // XXX? if (wall[j].cstat&dawalclipmask) continue; // XXX?
@ -11637,24 +11627,28 @@ restart_grand:
if (((sec->floorstat&1) == 0) && (pos->z >= sec->floorz-(3<<8))) continue; if (((sec->floorstat&1) == 0) && (pos->z >= sec->floorz-(3<<8))) continue;
} }
for (i=clipsectnum-1; i>=0; i--) int i;
for (i=clipsectnum-1; i>=0; --i)
if (clipsectorlist[i] == k) break; if (clipsectorlist[i] == k) break;
if (i < 0) clipsectorlist[clipsectnum++] = k; if (i < 0) clipsectorlist[clipsectnum++] = k;
if ((x1 < xmin+MAXCLIPDIST) && (x2 < xmin+MAXCLIPDIST)) continue; if (((v1.x < xmin + MAXCLIPDIST) && (v2.x < xmin + MAXCLIPDIST)) ||
if ((x1 > xmax-MAXCLIPDIST) && (x2 > xmax-MAXCLIPDIST)) continue; ((v1.x > xmax - MAXCLIPDIST) && (v2.x > xmax - MAXCLIPDIST)) ||
if ((y1 < ymin+MAXCLIPDIST) && (y2 < ymin+MAXCLIPDIST)) continue; ((v1.y < ymin + MAXCLIPDIST) && (v2.y < ymin + MAXCLIPDIST)) ||
if ((y1 > ymax-MAXCLIPDIST) && (y2 > ymax-MAXCLIPDIST)) continue; ((v1.y > ymax - MAXCLIPDIST) && (v2.y > ymax - MAXCLIPDIST)))
continue;
if (dx > 0) dax += dx*MAXCLIPDIST; else dax -= dx*MAXCLIPDIST; if (d.x > 0) da.x += d.x*MAXCLIPDIST; else da.x -= d.x*MAXCLIPDIST;
if (dy > 0) day -= dy*MAXCLIPDIST; else day += dy*MAXCLIPDIST; if (d.y > 0) da.y -= d.y*MAXCLIPDIST; else da.y += d.y*MAXCLIPDIST;
if (dax >= day) if (da.x >= da.y)
continue; continue;
#ifdef YAX_ENABLE #ifdef YAX_ENABLE
if (mcf==-1 && curspr==NULL) if (mcf==-1 && curspr==NULL)
origclipsectorlist[origclipsectnum++] = k; origclipsectorlist[origclipsectnum++] = k;
#endif #endif
//It actually got here, through all the continue's!!! //It actually got here, through all the continue's!!!
int32_t daz, daz2;
getzsofslope(k, pos->x,pos->y, &daz,&daz2); getzsofslope(k, pos->x,pos->y, &daz,&daz2);
#ifdef HAVE_CLIPSHAPE_FEATURE #ifdef HAVE_CLIPSHAPE_FEATURE
@ -11709,14 +11703,15 @@ restart_grand:
////////// Sprites ////////// ////////// Sprites //////////
for (i=0; i<clipsectnum; i++) for (int i=0; i<clipsectnum; i++)
{ {
if (dasprclipmask==0) if (dasprclipmask==0)
break; break;
for (j=headspritesect[clipsectorlist[i]]; j>=0; j=nextspritesect[j]) for (int j=headspritesect[clipsectorlist[i]]; j>=0; j=nextspritesect[j])
{ {
const int32_t cstat = sprite[j].cstat; const int32_t cstat = sprite[j].cstat;
int32_t daz, daz2;
if (cstat&dasprclipmask) if (cstat&dasprclipmask)
{ {
@ -11726,58 +11721,57 @@ restart_grand:
if (clipsprite_try((uspritetype *)&sprite[j], xmin,ymin, xmax,ymax)) if (clipsprite_try((uspritetype *)&sprite[j], xmin,ymin, xmax,ymax))
continue; continue;
#endif #endif
x1 = sprite[j].x; y1 = sprite[j].y; vec2_t v1 = *(vec2_t *)&sprite[j];
switch (cstat&48) switch (cstat&48)
{ {
case 0: case 0:
{
int32_t k = walldist+(sprite[j].clipdist<<2)+1;
if ((klabs(x1-pos->x) <= k) && (klabs(y1-pos->y) <= k))
{ {
daz = sprite[j].z + spriteheightofs(j, &k, 1); int32_t k = walldist+(sprite[j].clipdist<<2)+1;
daz2 = daz - k; if ((klabs(v1.x-pos->x) <= k) && (klabs(v1.y-pos->y) <= k))
clipyou = 1; {
daz = sprite[j].z + spriteheightofs(j, &k, 1);
daz2 = daz - k;
clipyou = 1;
}
break;
} }
break;
}
case 16: case 16:
{
get_wallspr_points((uspritetype *)&sprite[j], &x1, &x2, &y1, &y2);
if (clipinsideboxline(pos->x,pos->y,x1,y1,x2,y2,walldist+1) != 0)
{ {
int32_t k; vec2_t v2;
daz = sprite[j].z + spriteheightofs(j, &k, 1); get_wallspr_points((uspritetype *)&sprite[j], &v1.x, &v2.x, &v1.y, &v2.y);
daz2 = daz-k;
clipyou = 1; if (clipinsideboxline(pos->x,pos->y,v1.x,v1.y,v2.x,v2.y,walldist+1) != 0)
{
int32_t k;
daz = sprite[j].z + spriteheightofs(j, &k, 1);
daz2 = daz-k;
clipyou = 1;
}
break;
} }
break;
}
case 32: case 32:
{ {
int32_t x3, y3, x4, y4; daz = sprite[j].z; daz2 = daz;
daz = sprite[j].z; daz2 = daz; if ((cstat&64) != 0 && (pos->z > daz) == ((cstat&8)==0))
if ((cstat&64) != 0)
if ((pos->z > daz) == ((cstat&8)==0))
continue; continue;
get_floorspr_points((uspritetype const *) &sprite[j], pos->x, pos->y, &x1, &x2, &x3, &x4, vec2_t v2, v3, v4;
&y1, &y2, &y3, &y4); get_floorspr_points((uspritetype const *) &sprite[j], pos->x, pos->y, &v1.x, &v2.x, &v3.x, &v4.x,
&v1.y, &v2.y, &v3.y, &v4.y);
vec2_t const da = { mulscale14(sintable[(sprite[j].ang - 256 + 512) & 2047], walldist + 4), vec2_t const da = { mulscale14(sintable[(sprite[j].ang - 256 + 512) & 2047], walldist + 4),
mulscale14(sintable[(sprite[j].ang - 256) & 2047], walldist + 4) }; mulscale14(sintable[(sprite[j].ang - 256) & 2047], walldist + 4) };
x1 += da.x; x2 -= da.y; x3 -= da.x; x4 += da.y; v1.x += da.x; v2.x -= da.y; v3.x -= da.x; v4.x += da.y;
y1 += da.y; y2 += da.x; y3 -= da.y; y4 -= da.x; v1.y += da.y; v2.y += da.x; v3.y -= da.y; v4.y -= da.x;
clipyou = get_floorspr_clipyou(x1, x2, x3, x4, y1, y2, y3, y4); clipyou = get_floorspr_clipyou(v1.x, v2.x, v3.x, v4.x, v1.y, v2.y, v3.y, v4.y);
break; break;
} }
} }
if (clipyou != 0) if (clipyou != 0)
@ -11815,20 +11809,21 @@ restart_grand:
#ifdef YAX_ENABLE #ifdef YAX_ENABLE
if (numyaxbunches > 0) if (numyaxbunches > 0)
{ {
const int32_t dasecclipmask = yax_waltosecmask(dawalclipmask); int const dasecclipmask = yax_waltosecmask(dawalclipmask);
int16_t cb, fb, didchange; int16_t cb, fb;
yax_getbunches(sectnum, &cb, &fb); yax_getbunches(sectnum, &cb, &fb);
mcf++; mcf++;
clipsectcnt = 0; clipsectnum = 0; clipsectcnt = 0; clipsectnum = 0;
didchange = 0; int didchange = 0;
if (cb>=0 && mcf==0 && *ceilhit==sectnum+16384) if (cb>=0 && mcf==0 && *ceilhit==sectnum+16384)
{ {
int i;
for (i=0; i<origclipsectnum; i++) for (i=0; i<origclipsectnum; i++)
{ {
j = origclipsectorlist[i]; int const j = origclipsectorlist[i];
if (yax_getbunch(j, YAX_CEILING) >= 0) if (yax_getbunch(j, YAX_CEILING) >= 0)
if (sector[j].ceilingstat&dasecclipmask) if (sector[j].ceilingstat&dasecclipmask)
break; break;
@ -11841,11 +11836,11 @@ restart_grand:
if (cb < 0) if (cb < 0)
continue; continue;
for (SECTORS_OF_BUNCH(cb,YAX_FLOOR, j)) for (int SECTORS_OF_BUNCH(cb,YAX_FLOOR, j))
if (inside(pos->x,pos->y, j)==1) if (inside(pos->x,pos->y, j)==1)
{ {
clipsectorlist[clipsectnum++] = j; clipsectorlist[clipsectnum++] = j;
daz = getceilzofslope(j, pos->x,pos->y); int const daz = getceilzofslope(j, pos->x,pos->y);
if (!didchange || daz > *ceilz) if (!didchange || daz > *ceilz)
didchange=1, *ceilhit = j+16384, *ceilz = daz; didchange=1, *ceilhit = j+16384, *ceilz = daz;
} }
@ -11860,9 +11855,10 @@ restart_grand:
didchange = 0; didchange = 0;
if (fb>=0 && mcf==1 && *florhit==sectnum+16384) if (fb>=0 && mcf==1 && *florhit==sectnum+16384)
{ {
for (i=0; i<origclipsectnum; i++) int i=0;
for (; i<origclipsectnum; i++)
{ {
j = origclipsectorlist[i]; int const j = origclipsectorlist[i];
if (yax_getbunch(j, YAX_FLOOR) >= 0) if (yax_getbunch(j, YAX_FLOOR) >= 0)
if (sector[j].floorstat&dasecclipmask) if (sector[j].floorstat&dasecclipmask)
break; break;
@ -11876,11 +11872,11 @@ restart_grand:
if (fb < 0) if (fb < 0)
continue; continue;
for (SECTORS_OF_BUNCH(fb, YAX_CEILING, j)) for (int SECTORS_OF_BUNCH(fb, YAX_CEILING, j))
if (inside(pos->x,pos->y, j)==1) if (inside(pos->x,pos->y, j)==1)
{ {
clipsectorlist[clipsectnum++] = j; clipsectorlist[clipsectnum++] = j;
daz = getflorzofslope(j, pos->x,pos->y); int const daz = getflorzofslope(j, pos->x,pos->y);
if (!didchange || daz < *florz) if (!didchange || daz < *florz)
didchange=1, *florhit = j+16384, *florz = daz; didchange=1, *florhit = j+16384, *florz = daz;
} }
@ -11955,8 +11951,6 @@ void setaspect_new()
// //
void setview(int32_t x1, int32_t y1, int32_t x2, int32_t y2) void setview(int32_t x1, int32_t y1, int32_t x2, int32_t y2)
{ {
int32_t i;
windowxy1.x = x1; wx1 = (x1<<12); windowxy1.x = x1; wx1 = (x1<<12);
windowxy1.y = y1; wy1 = (y1<<12); windowxy1.y = y1; wy1 = (y1<<12);
windowxy2.x = x2; wx2 = ((x2+1)<<12); windowxy2.x = x2; wx2 = ((x2+1)<<12);
@ -11972,11 +11966,11 @@ void setview(int32_t x1, int32_t y1, int32_t x2, int32_t y2)
#endif #endif
setaspect_new(); setaspect_new();
for (i=0; i<windowxy1.x; i++) { startumost[i] = 1, startdmost[i] = 0; } for (int i=0; i<windowxy1.x; i++) { startumost[i] = 1, startdmost[i] = 0; }
Bassert(windowxy2.x < xdim); // xdim is the number of alloc'd elements in start*most[]. Bassert(windowxy2.x < xdim); // xdim is the number of alloc'd elements in start*most[].
for (i=windowxy1.x; i<=windowxy2.x; i++) for (int i=windowxy1.x; i<=windowxy2.x; i++)
{ startumost[i] = windowxy1.y, startdmost[i] = windowxy2.y+1; } { startumost[i] = windowxy1.y, startdmost[i] = windowxy2.y+1; }
for (i=windowxy2.x+1; i<xdim; i++) { startumost[i] = 1, startdmost[i] = 0; } for (int i=windowxy2.x+1; i<xdim; i++) { startumost[i] = 1, startdmost[i] = 0; }
} }
@ -12106,9 +12100,6 @@ void rotatesprite_(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t picnum,
// //
void clearview(int32_t dacol) void clearview(int32_t dacol)
{ {
intptr_t p;
int32_t y, dx;
if (!in3dmode() && dacol != -1) return; if (!in3dmode() && dacol != -1) return;
if (dacol == -1) dacol = 0; if (dacol == -1) dacol = 0;
@ -12116,7 +12107,7 @@ void clearview(int32_t dacol)
#ifdef USE_OPENGL #ifdef USE_OPENGL
if (getrendermode() >= REND_POLYMOST) if (getrendermode() >= REND_POLYMOST)
{ {
palette_t p = getpal(dacol); palette_t const p = getpal(dacol);
bglClearColor((float)p.r * (1.f/255.f), bglClearColor((float)p.r * (1.f/255.f),
(float)p.g * (1.f/255.f), (float)p.g * (1.f/255.f),
@ -12128,10 +12119,10 @@ void clearview(int32_t dacol)
#endif #endif
begindrawing(); //{{{ begindrawing(); //{{{
dx = windowxy2.x-windowxy1.x+1;
//dacol += (dacol<<8); dacol += (dacol<<16); //dacol += (dacol<<8); dacol += (dacol<<16);
p = frameplace+ylookup[windowxy1.y]+windowxy1.x; int const dx = windowxy2.x-windowxy1.x+1;
for (y=windowxy1.y; y<=windowxy2.y; y++) intptr_t p = frameplace+ylookup[windowxy1.y]+windowxy1.x;
for (int y=windowxy1.y; y<=windowxy2.y; ++y)
{ {
//clearbufbyte((void*)p,dx,dacol); //clearbufbyte((void*)p,dx,dacol);
Bmemset((void *)p,dacol,dx); Bmemset((void *)p,dacol,dx);
@ -12154,7 +12145,7 @@ void clearallviews(int32_t dacol)
#ifdef USE_OPENGL #ifdef USE_OPENGL
if (getrendermode() >= REND_POLYMOST) if (getrendermode() >= REND_POLYMOST)
{ {
palette_t p = getpal(dacol); palette_t const p = getpal(dacol);
bglViewport(0,0,xdim,ydim); glox1 = -1; bglViewport(0,0,xdim,ydim); glox1 = -1;
bglClearColor((float)p.r * (1.f/255.f), bglClearColor((float)p.r * (1.f/255.f),
@ -12186,8 +12177,8 @@ void setviewtotile(int16_t tilenume, int32_t xsiz, int32_t ysiz)
tilesiz[tilenume].x = xsiz; tilesiz[tilenume].y = ysiz; tilesiz[tilenume].x = xsiz; tilesiz[tilenume].y = ysiz;
bakxsiz[setviewcnt] = xsiz; bakysiz[setviewcnt] = ysiz; bakxsiz[setviewcnt] = xsiz; bakysiz[setviewcnt] = ysiz;
bakframeplace[setviewcnt] = frameplace; frameplace = waloff[tilenume]; bakframeplace[setviewcnt] = frameplace; frameplace = waloff[tilenume];
bakwindowx1[setviewcnt] = windowxy1.x; bakwindowy1[setviewcnt] = windowxy1.y; bakwindowxy1[setviewcnt] = windowxy1;
bakwindowx2[setviewcnt] = windowxy2.x; bakwindowy2[setviewcnt] = windowxy2.y; bakwindowxy2[setviewcnt] = windowxy2;
if (setviewcnt == 0) if (setviewcnt == 0)
{ {
@ -12230,8 +12221,8 @@ void setviewback(void)
} }
#endif #endif
setview(bakwindowx1[setviewcnt],bakwindowy1[setviewcnt], setview(bakwindowxy1[setviewcnt].x,bakwindowxy1[setviewcnt].y,
bakwindowx2[setviewcnt],bakwindowy2[setviewcnt]); bakwindowxy2[setviewcnt].x,bakwindowxy2[setviewcnt].y);
copybufbyte(&bakumost[windowxy1.x],&startumost[windowxy1.x],(windowxy2.x-windowxy1.x+1)*sizeof(startumost[0])); copybufbyte(&bakumost[windowxy1.x],&startumost[windowxy1.x],(windowxy2.x-windowxy1.x+1)*sizeof(startumost[0]));
copybufbyte(&bakdmost[windowxy1.x],&startdmost[windowxy1.x],(windowxy2.x-windowxy1.x+1)*sizeof(startdmost[0])); copybufbyte(&bakdmost[windowxy1.x],&startdmost[windowxy1.x],(windowxy2.x-windowxy1.x+1)*sizeof(startdmost[0]));
frameplace = bakframeplace[setviewcnt]; frameplace = bakframeplace[setviewcnt];
@ -12248,7 +12239,7 @@ void setviewback(void)
// //
void squarerotatetile(int16_t tilenume) void squarerotatetile(int16_t tilenume)
{ {
int32_t siz = tilesiz[tilenume].x; int const siz = tilesiz[tilenume].x;
if (siz != tilesiz[tilenume].y) if (siz != tilesiz[tilenume].y)
return; return;
@ -12259,21 +12250,23 @@ void squarerotatetile(int16_t tilenume)
{ {
ptr2 = ptr1 = (char *) (waloff[tilenume]+i*(siz+1)); ptr2 = ptr1 = (char *) (waloff[tilenume]+i*(siz+1));
swapchar(--ptr1, (ptr2 -= siz)); swapchar(--ptr1, (ptr2 -= siz));
j=(i>>1)-1; for (j=(i>>1)-1; j>=0; --j)
for (; j>=0; j--) swapchar2((ptr1 -= 2), (ptr2 -= (siz<<1)), siz); swapchar2((ptr1 -= 2), (ptr2 -= (siz<<1)), siz);
ptr2 = ptr1 = (char *) (waloff[tilenume]+(i-1)*(siz+1)); ptr2 = ptr1 = (char *) (waloff[tilenume]+(i-1)*(siz+1));
j=((i-1)>>1)-1; for (j=((i-1)>>1)-1; j>=0; --j)
for (; j>=0; j--) swapchar2((ptr1 -= 2), (ptr2 -= (siz<<1)), siz); swapchar2((ptr1 -= 2), (ptr2 -= (siz<<1)), siz);
ptr2 = ptr1 = (char *) (waloff[tilenume]+(i-2)*(siz+1)); ptr2 = ptr1 = (char *) (waloff[tilenume]+(i-2)*(siz+1));
swapchar(--ptr1, (ptr2 -= siz)); swapchar(--ptr1, (ptr2 -= siz));
j=((i-2)>>1)-1;
for (; j>=0; j--) swapchar2((ptr1 -= 2), (ptr2 -= (siz<<1)), siz); for (j=((i-2)>>1)-1; j>=0; --j)
swapchar2((ptr1 -= 2), (ptr2 -= (siz<<1)), siz);
ptr2 = ptr1 = (char *) (waloff[tilenume]+(i-3)*(siz+1)); ptr2 = ptr1 = (char *) (waloff[tilenume]+(i-3)*(siz+1));
j=((i-3)>>1)-1;
for (; j>=0; j--) swapchar2((ptr1 -= 2), (ptr2 -= (siz<<1)), siz); for (j=((i-3)>>1)-1; j>=0; --j)
swapchar2((ptr1 -= 2), (ptr2 -= (siz<<1)), siz);
} }
} }
@ -12330,16 +12323,16 @@ void completemirror(void)
begindrawing(); begindrawing();
// Width in pixels (screen x's are inclusive on both sides): // Width in pixels (screen x's are inclusive on both sides):
const int32_t width = mirrorsx2-mirrorsx1+1; int const width = mirrorsx2-mirrorsx1+1;
// Height in pixels (screen y's are half-open because they come from umost/dmost): // Height in pixels (screen y's are half-open because they come from umost/dmost):
const int32_t height = mirrorsy2-mirrorsy1; int const height = mirrorsy2-mirrorsy1;
// Address of the mirror wall's top left corner in the source scene: // Address of the mirror wall's top left corner in the source scene:
intptr_t p = frameplace + ylookup[windowxy1.y+mirrorsy1] + windowxy1.x+mirrorsx1; intptr_t p = frameplace + ylookup[windowxy1.y+mirrorsy1] + windowxy1.x+mirrorsx1;
// Offset (wrt p) of a mirror line's left corner in the destination: // Offset (wrt p) of a mirror line's left corner in the destination:
// p+destof == frameplace + ylookup[...] + windowx2-mirrorsx2 // p+destof == frameplace + ylookup[...] + windowx2-mirrorsx2
const int32_t destofs = windowxy2.x-mirrorsx2-windowxy1.x-mirrorsx1; int const destofs = windowxy2.x-mirrorsx2-windowxy1.x-mirrorsx1;
for (int y=0; y<height; y++) for (int y=0; y<height; y++)
{ {
@ -12397,7 +12390,7 @@ int32_t sectorofwall_noquick(int16_t theline)
} }
int32_t getceilzofslopeptr(const sectortype *sec, int32_t dax, int32_t day) int32_t getceilzofslopeptr(const usectortype *sec, int32_t dax, int32_t day)
{ {
if (!(sec->ceilingstat&2)) if (!(sec->ceilingstat&2))
return sec->ceilingz; return sec->ceilingz;
@ -12406,16 +12399,16 @@ int32_t getceilzofslopeptr(const sectortype *sec, int32_t dax, int32_t day)
// floor(sqrt(2**31-1)) == 46340 // floor(sqrt(2**31-1)) == 46340
vec2_t const w = *(vec2_t const *)wal; vec2_t const w = *(vec2_t const *)wal;
vec2_t const d ={ wall[wal->point2].x-w.x , wall[wal->point2].y-w.y }; vec2_t const d = { wall[wal->point2].x-w.x , wall[wal->point2].y-w.y };
int32_t const i = nsqrtasm(uhypsq(d.x,d.y))<<5; int const i = nsqrtasm(uhypsq(d.x,d.y))<<5;
if (i == 0) return sec->ceilingz; if (i == 0) return sec->ceilingz;
int32_t const j = dmulscale3(d.x, day-w.y, -d.y, dax-w.x); int const j = dmulscale3(d.x, day-w.y, -d.y, dax-w.x);
return sec->ceilingz + (scale(sec->ceilingheinum,j>>1,i)<<1); return sec->ceilingz + (scale(sec->ceilingheinum,j>>1,i)<<1);
} }
int32_t getflorzofslopeptr(const sectortype *sec, int32_t dax, int32_t day) int32_t getflorzofslopeptr(const usectortype *sec, int32_t dax, int32_t day)
{ {
if (!(sec->floorstat&2)) if (!(sec->floorstat&2))
return sec->floorz; return sec->floorz;
@ -12423,16 +12416,16 @@ int32_t getflorzofslopeptr(const sectortype *sec, int32_t dax, int32_t day)
uwalltype const *wal = (uwalltype *) &wall[sec->wallptr]; uwalltype const *wal = (uwalltype *) &wall[sec->wallptr];
vec2_t const w = *(vec2_t const *)wal; vec2_t const w = *(vec2_t const *)wal;
vec2_t const d ={ wall[wal->point2].x-w.x , wall[wal->point2].y-w.y }; vec2_t const d = { wall[wal->point2].x-w.x , wall[wal->point2].y-w.y };
int32_t const i = nsqrtasm(uhypsq(d.x,d.y))<<5; int const i = nsqrtasm(uhypsq(d.x,d.y))<<5;
if (i == 0) return sec->floorz; if (i == 0) return sec->floorz;
int32_t const j = dmulscale3(d.x, day-w.y, -d.y, dax-w.x); int const j = dmulscale3(d.x, day-w.y, -d.y, dax-w.x);
return sec->floorz + (scale(sec->floorheinum,j>>1,i)<<1); return sec->floorz + (scale(sec->floorheinum,j>>1,i)<<1);
} }
void getzsofslopeptr(const sectortype *sec, int32_t dax, int32_t day, int32_t *ceilz, int32_t *florz) void getzsofslopeptr(const usectortype *sec, int32_t dax, int32_t day, int32_t *ceilz, int32_t *florz)
{ {
*ceilz = sec->ceilingz; *florz = sec->floorz; *ceilz = sec->ceilingz; *florz = sec->floorz;
@ -12441,12 +12434,12 @@ void getzsofslopeptr(const sectortype *sec, int32_t dax, int32_t day, int32_t *c
uwalltype const *wal = (uwalltype *) &wall[sec->wallptr]; uwalltype const *wal = (uwalltype *) &wall[sec->wallptr];
uwalltype const *wal2 = (uwalltype *) &wall[wal->point2]; uwalltype const *wal2 = (uwalltype *) &wall[wal->point2];
const vec2_t d ={ wal2->x-wal->x, wal2->y-wal->y }; vec2_t const d = { wal2->x-wal->x, wal2->y-wal->y };
int32_t const i = nsqrtasm(uhypsq(d.x,d.y))<<5; int const i = nsqrtasm(uhypsq(d.x,d.y))<<5;
if (i == 0) return; if (i == 0) return;
int32_t const j = dmulscale3(d.x,day-wal->y, -d.y,dax-wal->x); int const j = dmulscale3(d.x,day-wal->y, -d.y,dax-wal->x);
if (sec->ceilingstat&2) if (sec->ceilingstat&2)
*ceilz += scale(sec->ceilingheinum,j>>1,i)<<1; *ceilz += scale(sec->ceilingheinum,j>>1,i)<<1;
if (sec->floorstat&2) if (sec->floorstat&2)

83
polymer/eduke32/build/src/tiles.c
View file

@ -79,8 +79,6 @@ static inline void ALLOC_MAPART_ARRAY(origar_t &origar, bakar_t &bakar)
void E_MapArt_Clear(void) void E_MapArt_Clear(void)
{ {
int32_t i;
if (g_bakTileFileNum == NULL) if (g_bakTileFileNum == NULL)
return; // per-map ART N/A return; // per-map ART N/A
@ -95,13 +93,15 @@ void E_MapArt_Clear(void)
artfilplc = 0L; artfilplc = 0L;
} }
for (i=0; i<MAXTILES; i++) for (int i=0; i<MAXTILES; i++)
{
if (tilefilenum[i] >= MAXARTFILES_BASE) if (tilefilenum[i] >= MAXARTFILES_BASE)
{ {
// XXX: OK way to free it? Better: cache1d API. CACHE1D_FREE // XXX: OK way to free it? Better: cache1d API. CACHE1D_FREE
walock[i] = 1; walock[i] = 1;
waloff[i] = 0; waloff[i] = 0;
} }
}
// Restore original per-tile arrays // Restore original per-tile arrays
RESTORE_MAPART_ARRAY(tilefilenum, g_bakTileFileNum); RESTORE_MAPART_ARRAY(tilefilenum, g_bakTileFileNum);
@ -121,8 +121,6 @@ void E_MapArt_Clear(void)
void E_MapArt_Setup(const char *filename) void E_MapArt_Setup(const char *filename)
{ {
int32_t i;
E_MapArt_Clear(); E_MapArt_Clear();
if (Bstrlen(filename) + 7 >= sizeof(mapartfilename)) if (Bstrlen(filename) + 7 >= sizeof(mapartfilename))
@ -149,9 +147,9 @@ void E_MapArt_Setup(const char *filename)
ALLOC_MAPART_ARRAY(tilesiz, g_bakTileSiz); ALLOC_MAPART_ARRAY(tilesiz, g_bakTileSiz);
ALLOC_MAPART_ARRAY(picanm, g_bakPicAnm); ALLOC_MAPART_ARRAY(picanm, g_bakPicAnm);
for (i=MAXARTFILES_BASE; i<MAXARTFILES_TOTAL; i++) for (int i=MAXARTFILES_BASE; i<MAXARTFILES_TOTAL; i++)
{ {
int32_t ret = E_ReadArtFileOfID(i); int ret = E_ReadArtFileOfID(i);
if (ret != 0) if (ret != 0)
{ {
@ -284,7 +282,7 @@ int32_t E_ReadArtFileHeader(int32_t const fil, char const * const fn, artheader_
int32_t E_ReadArtFileHeaderFromBuffer(uint8_t const * const buf, artheader_t * const local) int32_t E_ReadArtFileHeaderFromBuffer(uint8_t const * const buf, artheader_t * const local)
{ {
int32_t const artversion = B_LITTLE32(B_UNBUF32(&buf[0])); int const artversion = B_LITTLE32(B_UNBUF32(&buf[0]));
if (EDUKE32_PREDICT_FALSE(artversion != 1)) if (EDUKE32_PREDICT_FALSE(artversion != 1))
{ {
initprintf("loadpics: Invalid art file version\n"); initprintf("loadpics: Invalid art file version\n");
@ -349,7 +347,7 @@ void E_ReadArtFileTileInfo(int32_t const fil, artheader_t const * const local)
kread(fil, tilesizy, local->numtiles*sizeof(int16_t)); kread(fil, tilesizy, local->numtiles*sizeof(int16_t));
kread(fil, &picanm[local->tilestart], local->numtiles*sizeof(picanm_t)); kread(fil, &picanm[local->tilestart], local->numtiles*sizeof(picanm_t));
for (int32_t i=local->tilestart; i<=local->tileend; i++) for (int i=local->tilestart; i<=local->tileend; i++)
{ {
tilesiz[i].x = B_LITTLE16(tilesizx[i-local->tilestart]); tilesiz[i].x = B_LITTLE16(tilesizx[i-local->tilestart]);
tilesiz[i].y = B_LITTLE16(tilesizy[i-local->tilestart]); tilesiz[i].y = B_LITTLE16(tilesizy[i-local->tilestart]);
@ -366,9 +364,9 @@ void E_ReadArtFileIntoFakeData(int32_t const fil, artheader_t const * const loca
char *buffer = NULL; char *buffer = NULL;
int32_t buffersize = 0; int32_t buffersize = 0;
for (int32_t i=local->tilestart; i<=local->tileend; i++) for (int i=local->tilestart; i<=local->tileend; i++)
{ {
int32_t dasiz = tilesiz[i].x * tilesiz[i].y; int const dasiz = tilesiz[i].x * tilesiz[i].y;
if (dasiz == 0) if (dasiz == 0)
{ {
@ -377,9 +375,7 @@ void E_ReadArtFileIntoFakeData(int32_t const fil, artheader_t const * const loca
} }
maybe_grow_buffer(&buffer, &buffersize, dasiz); maybe_grow_buffer(&buffer, &buffersize, dasiz);
kread(fil, buffer, dasiz); kread(fil, buffer, dasiz);
E_CreateFakeTile(i, dasiz, buffer); E_CreateFakeTile(i, dasiz, buffer);
} }
@ -431,7 +427,7 @@ static int32_t E_ReadArtFileOfID(int32_t tilefilei)
#endif #endif
artheader_t local; artheader_t local;
int32_t headerval = E_ReadArtFileHeader(fil, fn, &local); int const headerval = E_ReadArtFileHeader(fil, fn, &local);
if (headerval != 0) if (headerval != 0)
return headerval; return headerval;
@ -465,11 +461,11 @@ static int32_t E_ReadArtFileOfID(int32_t tilefilei)
} }
else else
{ {
int32_t offscount = 4+4+4+4+(local.numtiles<<3); int offscount = 4+4+4+4+(local.numtiles<<3);
for (int32_t i=local.tilestart; i<=local.tileend; i++) for (int i=local.tilestart; i<=local.tileend; ++i)
{ {
int32_t dasiz = tilesiz[i].x * tilesiz[i].y; int const dasiz = tilesiz[i].x * tilesiz[i].y;
tilefilenum[i] = tilefilei; tilefilenum[i] = tilefilei;
tilefileoffs[i] = offscount; tilefileoffs[i] = offscount;
@ -495,8 +491,6 @@ static int32_t E_ReadArtFileOfID(int32_t tilefilei)
// //
int32_t loadpics(const char *filename, int32_t askedsize) int32_t loadpics(const char *filename, int32_t askedsize)
{ {
int32_t tilefilei;
Bstrncpyz(artfilename, filename, sizeof(artfilename)); Bstrncpyz(artfilename, filename, sizeof(artfilename));
Bmemset(&tilesiz[0], 0, sizeof(vec2_t) * MAXTILES); Bmemset(&tilesiz[0], 0, sizeof(vec2_t) * MAXTILES);
@ -504,16 +498,13 @@ int32_t loadpics(const char *filename, int32_t askedsize)
// artsize = 0; // artsize = 0;
for (tilefilei=0; tilefilei<MAXARTFILES_BASE; tilefilei++) for (int tilefilei=0; tilefilei<MAXARTFILES_BASE; tilefilei++)
E_ReadArtFileOfID(tilefilei); E_ReadArtFileOfID(tilefilei);
Bmemset(gotpic, 0, sizeof(gotpic)); Bmemset(gotpic, 0, sizeof(gotpic));
//cachesize = min((int32_t)((Bgetsysmemsize()/100)*60),max(artsize,askedsize)); //cachesize = min((int32_t)((Bgetsysmemsize()/100)*60),max(artsize,askedsize));
if (Bgetsysmemsize() <= (uint32_t) askedsize) cachesize = (Bgetsysmemsize() <= (uint32_t)askedsize) ? (Bgetsysmemsize() / 100) * 60 : askedsize;
cachesize = (Bgetsysmemsize()/100)*60;
else
cachesize = askedsize;
// NOTE: this doesn't make a lot of sense on modern OSs... // NOTE: this doesn't make a lot of sense on modern OSs...
while ((pic = Bmalloc(cachesize)) == NULL) while ((pic = Bmalloc(cachesize)) == NULL)
@ -541,10 +532,9 @@ static void postloadtile(int16_t tilenume);
void loadtile(int16_t tilenume) void loadtile(int16_t tilenume)
{ {
int32_t dasiz;
if ((unsigned) tilenume >= (unsigned) MAXTILES) return; if ((unsigned) tilenume >= (unsigned) MAXTILES) return;
if ((dasiz = tilesiz[tilenume].x*tilesiz[tilenume].y) <= 0) return; int const dasiz = tilesiz[tilenume].x*tilesiz[tilenume].y;
if (dasiz <= 0) return;
// Allocate storage if necessary. // Allocate storage if necessary.
if (waloff[tilenume] == 0) if (waloff[tilenume] == 0)
@ -571,19 +561,18 @@ void E_LoadTileIntoBuffer(int16_t tilenume, int32_t dasiz, char *buffer)
return; return;
} }
int32_t const i = tilefilenum[tilenume]; int const tfn = tilefilenum[tilenume];
// Potentially switch open ART file. // Potentially switch open ART file.
if (i != artfilnum) if (tfn != artfilnum)
{ {
const char *fn;
if (artfil != -1) if (artfil != -1)
kclose(artfil); kclose(artfil);
fn = E_GetArtFileName(i); char const *fn = E_GetArtFileName(tfn);
artfil = kopen4load(fn, 0); artfil = kopen4load(fn, 0);
if (artfil == -1) if (artfil == -1)
{ {
initprintf("Failed opening ART file \"%s\"!\n", fn); initprintf("Failed opening ART file \"%s\"!\n", fn);
@ -591,7 +580,7 @@ void E_LoadTileIntoBuffer(int16_t tilenume, int32_t dasiz, char *buffer)
Bexit(11); Bexit(11);
} }
artfilnum = i; artfilnum = tfn;
artfilplc = 0L; artfilplc = 0L;
faketimerhandler(); faketimerhandler();
@ -646,24 +635,24 @@ static void postloadtile(int16_t tilenume)
// Assumes pic has been initialized to zero. // Assumes pic has been initialized to zero.
void E_RenderArtDataIntoBuffer(palette_t * const pic, uint8_t const * const buf, int32_t const bufsizx, int32_t const sizx, int32_t const sizy) void E_RenderArtDataIntoBuffer(palette_t * const pic, uint8_t const * const buf, int32_t const bufsizx, int32_t const sizx, int32_t const sizy)
{ {
for (int32_t y = 0; y < sizy; y++) for (int y = 0; y < sizy; ++y)
{ {
palette_t * const picrow = &pic[bufsizx * y]; palette_t * const picrow = &pic[bufsizx * y];
for (int32_t x = 0; x < sizx; x++) for (int x = 0; x < sizx; ++x)
{ {
uint8_t index = buf[sizy * x + y]; uint8_t index = buf[sizy * x + y];
if (index != 255) if (index == 255)
{ continue;
index *= 3;
// pic is BGRA index *= 3;
picrow[x].r = palette[index+2];
picrow[x].g = palette[index+1]; // pic is BGRA
picrow[x].b = palette[index]; picrow[x].r = palette[index+2];
picrow[x].f = 255; picrow[x].g = palette[index+1];
} picrow[x].b = palette[index];
picrow[x].f = 255;
} }
} }
} }
@ -673,12 +662,10 @@ void E_RenderArtDataIntoBuffer(palette_t * const pic, uint8_t const * const buf,
// //
intptr_t allocatepermanenttile(int16_t tilenume, int32_t xsiz, int32_t ysiz) intptr_t allocatepermanenttile(int16_t tilenume, int32_t xsiz, int32_t ysiz)
{ {
int32_t dasiz;
if (xsiz <= 0 || ysiz <= 0 || (unsigned) tilenume >= MAXTILES) if (xsiz <= 0 || ysiz <= 0 || (unsigned) tilenume >= MAXTILES)
return 0; return 0;
dasiz = xsiz*ysiz; int const dasiz = xsiz*ysiz;
walock[tilenume] = 255; walock[tilenume] = 255;
allocache(&waloff[tilenume], dasiz, &walock[tilenume]); allocache(&waloff[tilenume], dasiz, &walock[tilenume]);
@ -692,6 +679,7 @@ intptr_t allocatepermanenttile(int16_t tilenume, int32_t xsiz, int32_t ysiz)
// //
// copytilepiece // copytilepiece
// //
#if 0
void copytilepiece(int32_t tilenume1, int32_t sx1, int32_t sy1, int32_t xsiz, int32_t ysiz, void copytilepiece(int32_t tilenume1, int32_t sx1, int32_t sy1, int32_t xsiz, int32_t ysiz,
int32_t tilenume2, int32_t sx2, int32_t sy2) int32_t tilenume2, int32_t sx2, int32_t sy2)
{ {
@ -728,6 +716,7 @@ void copytilepiece(int32_t tilenume1, int32_t sx1, int32_t sy1, int32_t xsiz, in
} }
} }
} }
#endif
void Buninitart(void) void Buninitart(void)
{ {