zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 19:20:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

If 3rd person view gets outside map, try again w/o subtracting 3072 from player z.

Browse source 
Also, clean up G_DoThirdPerson().

git-svn-id: https://svn.eduke32.com/eduke32@4369 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2014-03-15 14:10:42 +00:00
parent 802650048d
commit 69d906c4f7
2 changed files with 33 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12547,7 +12547,8 @@ int32_t hitscan(const vec3_t *sv, int16_t sectnum, int32_t vx, int32_t vy, int32
const int32_t dasprclipmask = (cliptype>>16); const int32_t dasprclipmask = (cliptype>>16);
hit->sect = -1; hit->wall = -1; hit->sprite = -1; hit->sect = -1; hit->wall = -1; hit->sprite = -1;
if (sectnum < 0) return(-1); if (sectnum < 0)
return -1;
#ifdef YAX_ENABLE #ifdef YAX_ENABLE
restart_grand: restart_grand:

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

@ -3883,52 +3883,61 @@ void G_DisplayRest(int32_t smoothratio)
} }
} }
static void G_DoThirdPerson(const DukePlayer_t *pp, vec3_t *vect, int16_t *vsectnum, int32_t ang, int32_t horiz) static int32_t G_DoThirdPerson(const DukePlayer_t *pp, vec3_t *vect, int16_t *vsectnum, int32_t ang, int32_t horiz)
{ {
spritetype *sp = &sprite[pp->i]; spritetype *sp = &sprite[pp->i];
int32_t i, hx, hy; int32_t i, hx, hy;
int32_t daang; int32_t daang;
int32_t bakcstat = sp->cstat; int32_t bakcstat = sp->cstat;
hitdata_t hit; hitdata_t hit;
vec3_t n = { (sintable[(ang+1536)&2047]>>4), vec3_t n = {
(sintable[(ang+1024)&2047]>>4), sintable[(ang+1536)&2047]>>4,
(horiz-100)*128 sintable[(ang+1024)&2047]>>4,
(horiz-100)*128
}; };
sp->cstat &= (int16_t)~0x101;
updatesectorz(vect->x,vect->y,vect->z,vsectnum); updatesectorz(vect->x,vect->y,vect->z,vsectnum);
hitscan((const vec3_t *)vect,*vsectnum,n.x,n.y,n.z,&hit,CLIPMASK1);
sp->cstat &= ~0x101;
hitscan(vect, *vsectnum, n.x,n.y,n.z, &hit, CLIPMASK1);
sp->cstat = bakcstat;
if (*vsectnum < 0) if (*vsectnum < 0)
{ return -1;
sp->cstat = bakcstat;
return;
}
hx = hit.pos.x-(vect->x); hx = hit.pos.x-(vect->x);
hy = hit.pos.y-(vect->y); hy = hit.pos.y-(vect->y);
if (klabs(n.x)+klabs(n.y) > klabs(hx)+klabs(hy)) if (klabs(n.x)+klabs(n.y) > klabs(hx)+klabs(hy))
{ {
*vsectnum = hit.sect; *vsectnum = hit.sect;
if (hit.wall >= 0) if (hit.wall >= 0)
{ {
daang = getangle(wall[wall[hit.wall].point2].x-wall[hit.wall].x, daang = getangle(wall[wall[hit.wall].point2].x-wall[hit.wall].x,
wall[wall[hit.wall].point2].y-wall[hit.wall].y); wall[wall[hit.wall].point2].y-wall[hit.wall].y);
i = n.x*sintable[daang]+n.y*sintable[(daang+1536)&2047]; i = n.x*sintable[daang] + n.y*sintable[(daang+1536)&2047];
if (klabs(n.x) > klabs(n.y)) hx -= mulscale28(n.x,i);
if (klabs(n.x) > klabs(n.y))
hx -= mulscale28(n.x,i);
else hy -= mulscale28(n.y,i); else hy -= mulscale28(n.y,i);
} }
else if (hit.sprite < 0) else if (hit.sprite < 0)
{ {
if (klabs(n.x) > klabs(n.y)) hx -= (n.x>>5); if (klabs(n.x) > klabs(n.y))
hx -= (n.x>>5);
else hy -= (n.y>>5); else hy -= (n.y>>5);
} }
if (klabs(n.x) > klabs(n.y)) i = divscale16(hx,n.x);
if (klabs(n.x) > klabs(n.y))
i = divscale16(hx,n.x);
else i = divscale16(hy,n.y); else i = divscale16(hy,n.y);
if (i < CAMERADIST) CAMERADIST = i;
if (i < CAMERADIST)
CAMERADIST = i;
} }
vect->x += mulscale16(n.x,CAMERADIST); vect->x += mulscale16(n.x,CAMERADIST);
vect->y += mulscale16(n.y,CAMERADIST); vect->y += mulscale16(n.y,CAMERADIST);
vect->z += mulscale16(n.z,CAMERADIST); vect->z += mulscale16(n.z,CAMERADIST);
@ -3938,7 +3947,7 @@ static void G_DoThirdPerson(const DukePlayer_t *pp, vec3_t *vect, int16_t *vsect
updatesectorz(vect->x,vect->y,vect->z,vsectnum); updatesectorz(vect->x,vect->y,vect->z,vsectnum);
sp->cstat = bakcstat; return 0;
} }
//REPLACE FULLY //REPLACE FULLY
@ -4558,7 +4567,11 @@ void G_DrawRooms(int32_t snum, int32_t smoothratio)
if (p->over_shoulder_on) if (p->over_shoulder_on)
{ {
CAMERA(pos.z) -= 3072; CAMERA(pos.z) -= 3072;
G_DoThirdPerson(p,&CAMERA(pos),&CAMERA(sect),CAMERA(ang),CAMERA(horiz)); if (G_DoThirdPerson(p, &CAMERA(pos), &CAMERA(sect), CAMERA(ang), CAMERA(horiz)) < 0)
{
CAMERA(pos.z) += 3072;
G_DoThirdPerson(p, &CAMERA(pos), &CAMERA(sect), CAMERA(ang), CAMERA(horiz));
}
} }
} }
else else