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

SW: hitscan

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5202 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2015-05-19 22:01:22 +00:00
parent acba32caf4
commit a97d9c5916
19 changed files with 948 additions and 998 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
polymer/eduke32/source/sw/src/ai.c
View file

@ -316,8 +316,7 @@ CanHitPlayer(short SpriteNum)
{ {
USERp u = User[SpriteNum], hu; USERp u = User[SpriteNum], hu;
SPRITEp sp = User[SpriteNum]->SpriteP, hp; SPRITEp sp = User[SpriteNum]->SpriteP, hp;
int hitx, hity, hitz; hitdata_t hitinfo;
short hitsect, hitwall, hitsprite;
int xvect,yvect,zvect; int xvect,yvect,zvect;
short ang,ret=FALSE; short ang,ret=FALSE;
// if actor can still see the player // if actor can still see the player
@ -357,12 +356,12 @@ CanHitPlayer(short SpriteNum)
xvect, xvect,
yvect, yvect,
zvect, zvect,
&hitsect, &hitwall, &hitsprite, &hitx, &hity, &hitz, CLIPMASK_MISSILE); &hitinfo, CLIPMASK_MISSILE);
if (hitsect < 0) if (hitinfo.sect < 0)
return FALSE; return FALSE;
if (hitsprite == u->tgt_sp - sprite) if (hitinfo.sprite == u->tgt_sp - sprite)
return TRUE; return TRUE;
////DSPRINTF(ds,"CanHit %s",ret ? "TRUE" : "FALSE"); ////DSPRINTF(ds,"CanHit %s",ret ? "TRUE" : "FALSE");

19
polymer/eduke32/source/sw/src/break.c
View file

@ -555,7 +555,7 @@ short FindBreakSpriteMatch(short match)
// WALL // WALL
// //
int AutoBreakWall(WALLp wallp, int hitx, int hity, int hitz, short ang, short type) int AutoBreakWall(WALLp wallp, int hit_x, int hit_y, int hit_z, short ang, short type)
{ {
BREAK_INFOp break_info; BREAK_INFOp break_info;
short BreakSprite; short BreakSprite;
@ -597,8 +597,9 @@ int AutoBreakWall(WALLp wallp, int hitx, int hity, int hitz, short ang, short ty
// Check to see if it should break with current weapon type // Check to see if it should break with current weapon type
if (!CheckBreakToughness(break_info, type)) return FALSE; if (!CheckBreakToughness(break_info, type)) return FALSE;
if (hitx != MAXLONG) if (hit_x != MAXLONG)
{ {
vec3_t hit_pos = { hit_x, hit_y, hit_z };
// need correct location for spawning shrap // need correct location for spawning shrap
BreakSprite = COVERinsertsprite(0, STAT_DEFAULT); BreakSprite = COVERinsertsprite(0, STAT_DEFAULT);
ASSERT(BreakSprite >= 0); ASSERT(BreakSprite >= 0);
@ -608,7 +609,7 @@ int AutoBreakWall(WALLp wallp, int hitx, int hity, int hitz, short ang, short ty
bsp->ang = ang; bsp->ang = ang;
bsp->picnum = ST1; bsp->picnum = ST1;
bsp->xrepeat = bsp->yrepeat = 64; bsp->xrepeat = bsp->yrepeat = 64;
setspritez(BreakSprite, hitx, hity, hitz); setspritez(BreakSprite, &hit_pos);
// pass Break Info Globally // pass Break Info Globally
GlobBreakInfo = break_info; GlobBreakInfo = break_info;
@ -751,7 +752,7 @@ SWBOOL UserBreakWall(WALLp wp, short UNUSED(ang))
return FALSE; return FALSE;
} }
int WallBreakPosition(short hitwall, short *sectnum, int *x, int *y, int *z, short *ang) int WallBreakPosition(short hit_wall, short *sectnum, int *x, int *y, int *z, short *ang)
{ {
short w,nw; short w,nw;
WALLp wp; WALLp wp;
@ -759,7 +760,7 @@ int WallBreakPosition(short hitwall, short *sectnum, int *x, int *y, int *z, sho
short wall_ang; short wall_ang;
int ret=0; int ret=0;
w = hitwall; w = hit_wall;
wp = &wall[w]; wp = &wall[w];
nw = wall[w].point2; nw = wall[w].point2;
@ -818,7 +819,7 @@ int WallBreakPosition(short hitwall, short *sectnum, int *x, int *y, int *z, sho
} }
// If the tough parameter is not set, then it can't break tough walls and sprites // If the tough parameter is not set, then it can't break tough walls and sprites
SWBOOL HitBreakWall(WALLp wp, int hitx, int hity, int hitz, short ang, short type) SWBOOL HitBreakWall(WALLp wp, int hit_x, int hit_y, int hit_z, short ang, short type)
{ {
short SpriteNum; short SpriteNum;
short match = wp->hitag; short match = wp->hitag;
@ -829,13 +830,13 @@ SWBOOL HitBreakWall(WALLp wp, int hitx, int hity, int hitz, short ang, short typ
return TRUE; return TRUE;
} }
//if (hitx == MAXLONG) //if (hit_x == MAXLONG)
{ {
short sectnum; short sectnum;
WallBreakPosition(wp - wall, &sectnum, &hitx, &hity, &hitz, &ang); WallBreakPosition(wp - wall, &sectnum, &hit_x, &hit_y, &hit_z, &ang);
} }
AutoBreakWall(wp, hitx, hity, hitz, ang, type); AutoBreakWall(wp, hit_x, hit_y, hit_z, ang, type);
return TRUE; return TRUE;
} }

2
polymer/eduke32/source/sw/src/break.h
View file

@ -49,7 +49,7 @@ short FindBreakSpriteMatch(short match);
SWBOOL HitBreakWall(WALLp wp, int, int, int, short ang, short type); SWBOOL HitBreakWall(WALLp wp, int, int, int, short ang, short type);
int HitBreakSprite(short BreakSprite, short type); int HitBreakSprite(short BreakSprite, short type);
SWBOOL CheckBreakToughness(BREAK_INFOp break_info, short ID); SWBOOL CheckBreakToughness(BREAK_INFOp break_info, short ID);
int WallBreakPosition(short hitwall, short *sectnum, int *x, int *y, int *z, short *ang); int WallBreakPosition(short hit_wall, short *sectnum, int *x, int *y, int *z, short *ang);
void SortBreakInfo(void); void SortBreakInfo(void);
#endif #endif

18
polymer/eduke32/source/sw/src/bunny.c
View file

@ -977,9 +977,9 @@ DoBunnyQuickJump(short SpriteNum)
// Random Chance of like sexes fighting // Random Chance of like sexes fighting
if (u->lo_sp) if (u->lo_sp)
{ {
short hitsprite = u->lo_sp - sprite; short hit_sprite = u->lo_sp - sprite;
SPRITEp tsp = u->lo_sp; SPRITEp tsp = u->lo_sp;
USERp tu = User[hitsprite]; USERp tu = User[hit_sprite];
if (!tu || tu->ID != BUNNY_RUN_R0) return FALSE; if (!tu || tu->ID != BUNNY_RUN_R0) return FALSE;
@ -999,14 +999,14 @@ DoBunnyQuickJump(short SpriteNum)
tu->Health = 0; tu->Health = 0;
// Blood fountains // Blood fountains
InitBloodSpray(hitsprite,TRUE,-1); InitBloodSpray(hit_sprite,TRUE,-1);
if (SpawnShrap(hitsprite, SpriteNum)) if (SpawnShrap(hit_sprite, SpriteNum))
{ {
SetSuicide(hitsprite); SetSuicide(hit_sprite);
} }
else else
DoActorDie(hitsprite, SpriteNum); DoActorDie(hit_sprite, SpriteNum);
Bunny_Count--; // Bunny died Bunny_Count--; // Bunny died
@ -1019,9 +1019,9 @@ DoBunnyQuickJump(short SpriteNum)
// Get layed! // Get layed!
if (u->lo_sp && u->spal == PALETTE_PLAYER8) // Only males check this if (u->lo_sp && u->spal == PALETTE_PLAYER8) // Only males check this
{ {
short hitsprite = u->lo_sp - sprite; short hit_sprite = u->lo_sp - sprite;
SPRITEp tsp = u->lo_sp; SPRITEp tsp = u->lo_sp;
USERp tu = User[hitsprite]; USERp tu = User[hit_sprite];
if (!tu || tu->ID != BUNNY_RUN_R0) return FALSE; if (!tu || tu->ID != BUNNY_RUN_R0) return FALSE;
@ -1088,7 +1088,7 @@ DoBunnyQuickJump(short SpriteNum)
tu->Vis = tsp->ang; tu->Vis = tsp->ang;
NewStateGroup(SpriteNum, sg_BunnyScrew); NewStateGroup(SpriteNum, sg_BunnyScrew);
NewStateGroup(hitsprite, sg_BunnyScrew); NewStateGroup(hit_sprite, sg_BunnyScrew);
if (gs.ParentalLock || Global_PLock) if (gs.ParentalLock || Global_PLock)
{ {
SET(sp->cstat, CSTAT_SPRITE_INVISIBLE); // Turn em' invisible SET(sp->cstat, CSTAT_SPRITE_INVISIBLE); // Turn em' invisible

85
polymer/eduke32/source/sw/src/draw.c
View file

@ -1110,11 +1110,11 @@ ViewOutsidePlayerRecurse(PLAYERp pp, int32_t* vx, int32_t* vy, int32_t* vz, int1
{ {
case HIT_SPRITE: case HIT_SPRITE:
{ {
short hitsprite; short hit_sprite;
SPRITEp sp; SPRITEp sp;
hitsprite = NORM_SPRITE(ret); hit_sprite = NORM_SPRITE(ret);
sp = &sprite[hitsprite]; sp = &sprite[hit_sprite];
// if you hit a sprite that's not a wall sprite - try again // if you hit a sprite that's not a wall sprite - try again
if (!TEST(sp->cstat, CSTAT_SPRITE_WALL)) if (!TEST(sp->cstat, CSTAT_SPRITE_WALL))
@ -1149,9 +1149,11 @@ ViewOutsidePlayerRecurse(PLAYERp pp, int32_t* vx, int32_t* vy, int32_t* vz, int1
void void
BackView(int *nx, int *ny, int *nz, short *vsect, short *nang, short horiz) BackView(int *nx, int *ny, int *nz, short *vsect, short *nang, short horiz)
{ {
vec3_t n = { *nx, *ny, *nz };
SPRITEp sp; SPRITEp sp;
int i, vx, vy, vz, hx, hy, hz, hitx, hity, hitz; hitdata_t hitinfo;
short bakcstat, hitsect, hitwall, hitsprite, daang; int i, vx, vy, vz, hx, hy, hz;
short bakcstat, daang;
PLAYERp pp = &Player[screenpeek]; PLAYERp pp = &Player[screenpeek];
short ang; short ang;
@ -1173,25 +1175,25 @@ BackView(int *nx, int *ny, int *nz, short *vsect, short *nang, short horiz)
// Make sure sector passed to FAFhitscan is correct // Make sure sector passed to FAFhitscan is correct
//COVERupdatesector(*nx, *ny, vsect); //COVERupdatesector(*nx, *ny, vsect);
hitscan(*nx, *ny, *nz, *vsect, vx, vy, vz, hitscan(&n, *vsect, vx, vy, vz,
&hitsect, &hitwall, &hitsprite, &hitx, &hity, &hitz, CLIPMASK_PLAYER); &hitinfo, CLIPMASK_PLAYER);
ASSERT(*vsect >= 0 && *vsect < MAXSECTORS); ASSERT(*vsect >= 0 && *vsect < MAXSECTORS);
sp->cstat = bakcstat; // Restore cstat sp->cstat = bakcstat; // Restore cstat
hx = hitx - (*nx); hx = hitinfo.pos.x - (*nx);
hy = hity - (*ny); hy = hitinfo.pos.y - (*ny);
// If something is in the way, make pp->camera_dist lower if necessary // If something is in the way, make pp->camera_dist lower if necessary
if (klabs(vx) + klabs(vy) > klabs(hx) + klabs(hy)) if (klabs(vx) + klabs(vy) > klabs(hx) + klabs(hy))
{ {
if (hitwall >= 0) // Push you a little bit off the wall if (hitinfo.wall >= 0) // Push you a little bit off the wall
{ {
*vsect = hitsect; *vsect = hitinfo.sect;
daang = getangle(wall[wall[hitwall].point2].x - wall[hitwall].x, daang = getangle(wall[wall[hitinfo.wall].point2].x - wall[hitinfo.wall].x,
wall[wall[hitwall].point2].y - wall[hitwall].y); wall[wall[hitinfo.wall].point2].y - wall[hitinfo.wall].y);
i = vx * sintable[daang] + vy * sintable[NORM_ANGLE(daang + 1536)]; i = vx * sintable[daang] + vy * sintable[NORM_ANGLE(daang + 1536)];
if (klabs(vx) > klabs(vy)) if (klabs(vx) > klabs(vy))
@ -1199,9 +1201,9 @@ BackView(int *nx, int *ny, int *nz, short *vsect, short *nang, short horiz)
else else
hy -= mulscale28(vy, i); hy -= mulscale28(vy, i);
} }
else if (hitsprite < 0) // Push you off the ceiling/floor else if (hitinfo.sprite < 0) // Push you off the ceiling/floor
{ {
*vsect = hitsect; *vsect = hitinfo.sect;
if (klabs(vx) > klabs(vy)) if (klabs(vx) > klabs(vy))
hx -= (vx >> 5); hx -= (vx >> 5);
@ -1210,7 +1212,7 @@ BackView(int *nx, int *ny, int *nz, short *vsect, short *nang, short horiz)
} }
else else
{ {
SPRITEp hsp = &sprite[hitsprite]; SPRITEp hsp = &sprite[hitinfo.sprite];
int flag_backup; int flag_backup;
// if you hit a sprite that's not a wall sprite - try again // if you hit a sprite that's not a wall sprite - try again
@ -1266,9 +1268,11 @@ BackView(int *nx, int *ny, int *nz, short *vsect, short *nang, short horiz)
void void
CircleCamera(int *nx, int *ny, int *nz, short *vsect, short *nang, short horiz) CircleCamera(int *nx, int *ny, int *nz, short *vsect, short *nang, short horiz)
{ {
vec3_t n = { *nx, *ny, *nz };
SPRITEp sp; SPRITEp sp;
int i, vx, vy, vz, hx, hy, hz, hitx, hity, hitz; hitdata_t hitinfo;
short bakcstat, hitsect, hitwall, hitsprite, daang; int i, vx, vy, vz, hx, hy, hz;
short bakcstat, daang;
PLAYERp pp = &Player[screenpeek]; PLAYERp pp = &Player[screenpeek];
short ang; short ang;
@ -1293,24 +1297,24 @@ CircleCamera(int *nx, int *ny, int *nz, short *vsect, short *nang, short horiz)
// Make sure sector passed to hitscan is correct // Make sure sector passed to hitscan is correct
//COVERupdatesector(*nx, *ny, vsect); //COVERupdatesector(*nx, *ny, vsect);
hitscan(*nx, *ny, *nz, *vsect, vx, vy, vz, hitscan(&n, *vsect, vx, vy, vz,
&hitsect, &hitwall, &hitsprite, &hitx, &hity, &hitz, CLIPMASK_MISSILE); &hitinfo, CLIPMASK_MISSILE);
sp->cstat = bakcstat; // Restore cstat sp->cstat = bakcstat; // Restore cstat
//ASSERT(hitsect >= 0); //ASSERT(hitinfo.sect >= 0);
hx = hitx - (*nx); hx = hitinfo.pos.x - (*nx);
hy = hity - (*ny); hy = hitinfo.pos.y - (*ny);
// If something is in the way, make pp->circle_camera_dist lower if necessary // If something is in the way, make pp->circle_camera_dist lower if necessary
if (klabs(vx) + klabs(vy) > klabs(hx) + klabs(hy)) if (klabs(vx) + klabs(vy) > klabs(hx) + klabs(hy))
{ {
if (hitwall >= 0) // Push you a little bit off the wall if (hitinfo.wall >= 0) // Push you a little bit off the wall
{ {
*vsect = hitsect; *vsect = hitinfo.sect;
daang = getangle(wall[wall[hitwall].point2].x - wall[hitwall].x, daang = getangle(wall[wall[hitinfo.wall].point2].x - wall[hitinfo.wall].x,
wall[wall[hitwall].point2].y - wall[hitwall].y); wall[wall[hitinfo.wall].point2].y - wall[hitinfo.wall].y);
i = vx * sintable[daang] + vy * sintable[NORM_ANGLE(daang + 1536)]; i = vx * sintable[daang] + vy * sintable[NORM_ANGLE(daang + 1536)];
if (klabs(vx) > klabs(vy)) if (klabs(vx) > klabs(vy))
@ -1318,9 +1322,9 @@ CircleCamera(int *nx, int *ny, int *nz, short *vsect, short *nang, short horiz)
else else
hy -= mulscale28(vy, i); hy -= mulscale28(vy, i);
} }
else if (hitsprite < 0) // Push you off the ceiling/floor else if (hitinfo.sprite < 0) // Push you off the ceiling/floor
{ {
*vsect = hitsect; *vsect = hitinfo.sect;
if (klabs(vx) > klabs(vy)) if (klabs(vx) > klabs(vy))
hx -= (vx >> 5); hx -= (vx >> 5);
@ -1329,7 +1333,7 @@ CircleCamera(int *nx, int *ny, int *nz, short *vsect, short *nang, short horiz)
} }
else else
{ {
SPRITEp hsp = &sprite[hitsprite]; SPRITEp hsp = &sprite[hitinfo.sprite];
int flag_backup; int flag_backup;
// if you hit a sprite that's not a wall sprite - try again // if you hit a sprite that's not a wall sprite - try again
@ -1444,27 +1448,26 @@ void PrintSpriteInfo(PLAYERp pp)
int y = windowy1+2; int y = windowy1+2;
SPRITEp sp; SPRITEp sp;
USERp u; USERp u;
short hitsprite;
if (SpriteInfo && !LocationInfo) if (SpriteInfo && !LocationInfo)
{ {
hitsprite = DoPickTarget(pp->SpriteP, 32, 2); short hit_sprite = DoPickTarget(pp->SpriteP, 32, 2);
sp = &sprite[hitsprite]; sp = &sprite[hit_sprite];
u = User[hitsprite]; u = User[hit_sprite];
sp->hitag = 9997; // Special tag to make the actor glow red for one frame sp->hitag = 9997; // Special tag to make the actor glow red for one frame
y += Y_STEP; y += Y_STEP;
if (hitsprite == -1) if (hit_sprite == -1)
{ {
sprintf(buffer, "SPRITENUM: NONE TARGETED"); sprintf(buffer, "SPRITENUM: NONE TARGETED");
printext256(x, y, 1, -1, buffer, 1); printext256(x, y, 1, -1, buffer, 1);
return; return;
} }
else else
sprintf(buffer, "SPRITENUM:%d", hitsprite); sprintf(buffer, "SPRITENUM:%d", hit_sprite);
printext256(x, y, 1, -1, buffer, 1); printext256(x, y, 1, -1, buffer, 1);
y += Y_STEP; y += Y_STEP;
@ -1821,22 +1824,22 @@ void DrawCrosshair(PLAYERp pp)
if (gs.AutoAim) if (gs.AutoAim)
{ {
int daz; int daz;
short hitsprite, daang; short hit_sprite, daang;
static int handle=-1; static int handle=-1;
daz = pp->posz + pp->bob_z; daz = pp->posz + pp->bob_z;
daang = 32; daang = 32;
if ((hitsprite = WeaponAutoAimHitscan(pp->SpriteP, &daz, &daang, FALSE)) != -1) if ((hit_sprite = WeaponAutoAimHitscan(pp->SpriteP, &daz, &daang, FALSE)) != -1)
{ {
SPRITEp hp = &sprite[hitsprite]; SPRITEp hp = &sprite[hit_sprite];
USERp hu = User[hitsprite]; USERp hu = User[hit_sprite];
int dx,dy,dz; int dx,dy,dz;
// Find the delta coordinates from player to monster that is targeted // Find the delta coordinates from player to monster that is targeted
dx = hp->x - pp->posx; dx = hp->x - pp->posx;
dy = hp->y - pp->posy; dy = hp->y - pp->posy;
dz = ((hp->z - (SPRITE_SIZE_Z(hitsprite)/2)) - pp->posz) >> 4; dz = ((hp->z - (SPRITE_SIZE_Z(hit_sprite)/2)) - pp->posz) >> 4;
rotatepoint(0,0,dx,dy,(-pp->pang)&2047,&dx,&dy); rotatepoint(0,0,dx,dy,(-pp->pang)&2047,&dx,&dy);

9
polymer/eduke32/source/sw/src/game.h
View file

@ -830,12 +830,12 @@ typedef enum {WATER_FOOT, BLOOD_FOOT} FOOT_TYPE;
extern FOOT_TYPE FootMode; extern FOOT_TYPE FootMode;
extern SWBOOL InGame; // Declared in game.c extern SWBOOL InGame; // Declared in game.c
extern SWBOOL Global_PLock; // Game.c extern SWBOOL Global_PLock; // Game.c
int QueueFloorBlood(short hitsprite); // Weapon.c int QueueFloorBlood(short hit_sprite); // Weapon.c
int QueueFootPrint(short hitsprite); // Weapon.c int QueueFootPrint(short hit_sprite); // Weapon.c
int QueueGeneric(short SpriteNum, short pic); // Weapon.c int QueueGeneric(short SpriteNum, short pic); // Weapon.c
int QueueLoWangs(short SpriteNum); // Weapon.c int QueueLoWangs(short SpriteNum); // Weapon.c
int SpawnShell(short SpriteNum, short ShellNum); // Weapon.c int SpawnShell(short SpriteNum, short ShellNum); // Weapon.c
void UnlockKeyLock(short key_num, short hitsprite); // JSector.c void UnlockKeyLock(short key_num, short hit_sprite); // JSector.c
#define MAX_PAIN 5 #define MAX_PAIN 5
extern int PlayerPainVocs[MAX_PAIN]; extern int PlayerPainVocs[MAX_PAIN];
@ -2166,8 +2166,7 @@ SWBOOL PlayerFloorHit(PLAYERp pp, int zlimit);
void FAFhitscan(int32_t x, int32_t y, int32_t z, int16_t sectnum, void FAFhitscan(int32_t x, int32_t y, int32_t z, int16_t sectnum,
int32_t xvect, int32_t yvect, int32_t zvect, int32_t xvect, int32_t yvect, int32_t zvect,
int16_t* hitsect, int16_t* hitwall, int16_t* hitsprite, hitdata_t* hitinfo, int32_t clipmask);
int32_t* hitx, int32_t* hity, int32_t* hitz, int32_t clipmask);
SWBOOL FAFcansee(int32_t xs, int32_t ys, int32_t zs, int16_t sects, int32_t xe, int32_t ye, int32_t ze, int16_t secte); SWBOOL FAFcansee(int32_t xs, int32_t ys, int32_t zs, int16_t sects, int32_t xe, int32_t ye, int32_t ze, int16_t secte);

62
polymer/eduke32/source/sw/src/jplayer.c
View file

@ -415,10 +415,10 @@ char dashow2dsector[(MAXSECTORS+7)>>3];
void computergetinput(int snum, SW_PACKET *syn) void computergetinput(int snum, SW_PACKET *syn)
{ {
int i, j, k, l, x1, y1, z1, x2, y2, z2, x3, y3, z3, dx, dy, nextj; int i, j, k, l, x1, y1, z1, x2, y2, z2, dx, dy, nextj;
int dist, daang, zang, fightdist, damyang, damysect; int dist, daang, zang, fightdist, damyang, damysect;
int startsect, endsect, splc, send, startwall, endwall; int startsect, endsect, splc, send, startwall, endwall;
short dasect, dawall, daspr; hitdata_t hitinfo;
PLAYERp p; PLAYERp p;
walltype *wal; walltype *wal;
int myx, myy, myz, myang, mycursectnum; int myx, myy, myz, myang, mycursectnum;
@ -535,33 +535,33 @@ void computergetinput(int snum, SW_PACKET *syn)
} }
if (k) if (k)
{ {
x3 = sprite[j].x; hitinfo.pos.x = sprite[j].x;
y3 = sprite[j].y; hitinfo.pos.y = sprite[j].y;
z3 = sprite[j].z; hitinfo.pos.z = sprite[j].z;
for (l=0; l<=8; l++) for (l=0; l<=8; l++)
{ {
if (tmulscale11(x3-x1,x3-x1,y3-y1,y3-y1,(z3-z1)>>4,(z3-z1)>>4) < 3072) if (tmulscale11(hitinfo.pos.x-x1,hitinfo.pos.x-x1,hitinfo.pos.y-y1,hitinfo.pos.y-y1,(hitinfo.pos.z-z1)>>4,(hitinfo.pos.z-z1)>>4) < 3072)
{ {
dx = sintable[(sprite[j].ang+512)&2047]; dx = sintable[(sprite[j].ang+512)&2047];
dy = sintable[sprite[j].ang&2047]; dy = sintable[sprite[j].ang&2047];
if ((x1-x3)*dy > (y1-y3)*dx) i = -k*512; else i = k*512; if ((x1-hitinfo.pos.x)*dy > (y1-hitinfo.pos.y)*dx) i = -k*512; else i = k*512;
syn->vel -= mulscale17(dy,i); syn->vel -= mulscale17(dy,i);
syn->svel += mulscale17(dx,i); syn->svel += mulscale17(dx,i);
} }
if (l < 7) if (l < 7)
{ {
x3 += (mulscale14(sprite[j].xvel,sintable[(sprite[j].ang+512)&2047])<<2); hitinfo.pos.x += (mulscale14(sprite[j].xvel,sintable[(sprite[j].ang+512)&2047])<<2);
y3 += (mulscale14(sprite[j].xvel,sintable[sprite[j].ang&2047])<<2); hitinfo.pos.y += (mulscale14(sprite[j].xvel,sintable[sprite[j].ang&2047])<<2);
z3 += (sprite[j].zvel<<2); hitinfo.pos.z += (sprite[j].zvel<<2);
} }
else else
{ {
hitscan(sprite[j].x,sprite[j].y,sprite[j].z,sprite[j].sectnum, hitscan((vec3_t *)&sprite[j],sprite[j].sectnum,
mulscale14(sprite[j].xvel,sintable[(sprite[j].ang+512)&2047]), mulscale14(sprite[j].xvel,sintable[(sprite[j].ang+512)&2047]),
mulscale14(sprite[j].xvel,sintable[sprite[j].ang&2047]), mulscale14(sprite[j].xvel,sintable[sprite[j].ang&2047]),
(int)sprite[j].zvel, (int)sprite[j].zvel,
&dasect,&dawall,&daspr,&x3,&y3,&z3,CLIPMASK1); &hitinfo,CLIPMASK1);
} }
} }
} }
@ -596,10 +596,10 @@ void computergetinput(int snum, SW_PACKET *syn)
// Only fire explosive type weaps if you are not too close to the target! // Only fire explosive type weaps if you are not too close to the target!
if (u->WeaponNum == WPN_MICRO || u->WeaponNum == WPN_GRENADE || u->WeaponNum == WPN_RAIL) if (u->WeaponNum == WPN_MICRO || u->WeaponNum == WPN_GRENADE || u->WeaponNum == WPN_RAIL)
{ {
int x4,y4,z4; vec3_t hit_pos = { x1, y1, z1-PLAYER_HEIGHT };
hitscan(x1,y1,z1-PLAYER_HEIGHT,damysect,sintable[(damyang+512)&2047],sintable[damyang&2047], hitscan(&hit_pos,damysect,sintable[(damyang+512)&2047],sintable[damyang&2047],
(100-p->horiz-p->horizoff)*32,&dasect,&dawall,&daspr,&x4,&y4,&z4,CLIPMASK1); (100-p->horiz-p->horizoff)*32,&hitinfo,CLIPMASK1);
if ((x4-x1)*(x4-x1)+(y4-y1)*(y4-y1) < 2560*2560) syn->bits &= ~(1<<SK_SHOOT); if ((hitinfo.pos.x-x1)*(hitinfo.pos.x-x1)+(hitinfo.pos.y-y1)*(hitinfo.pos.y-y1) < 2560*2560) syn->bits &= ~(1<<SK_SHOOT);
} }
// Get fighting distance based on you and your opponents current weapons // Get fighting distance based on you and your opponents current weapons
@ -613,10 +613,10 @@ void computergetinput(int snum, SW_PACKET *syn)
zang = 100-((z2-z1)*8)/dist; zang = 100-((z2-z1)*8)/dist;
fightdist = max(fightdist,(klabs(z2-z1)>>4)); fightdist = max(fightdist,(klabs(z2-z1)>>4));
x3 = x2+((x1-x2)*fightdist/dist); hitinfo.pos.x = x2+((x1-x2)*fightdist/dist);
y3 = y2+((y1-y2)*fightdist/dist); hitinfo.pos.y = y2+((y1-y2)*fightdist/dist);
syn->vel += (x3-x1)*2047/dist; syn->vel += (hitinfo.pos.x-x1)*2047/dist;
syn->svel += (y3-y1)*2047/dist; syn->svel += (hitinfo.pos.y-y1)*2047/dist;
//Strafe attack //Strafe attack
if (fightdist) if (fightdist)
@ -703,14 +703,14 @@ void computergetinput(int snum, SW_PACKET *syn)
goalsect[snum] = searchsect[k]; goalsect[snum] = searchsect[k];
startwall = sector[goalsect[snum]].wallptr; startwall = sector[goalsect[snum]].wallptr;
endwall = startwall+sector[goalsect[snum]].wallnum; endwall = startwall+sector[goalsect[snum]].wallnum;
x3 = y3 = 0; hitinfo.pos.x = hitinfo.pos.y = 0;
for (i=startwall; i<endwall; i++) for (i=startwall; i<endwall; i++)
{ {
x3 += wall[i].x; hitinfo.pos.x += wall[i].x;
y3 += wall[i].y; hitinfo.pos.y += wall[i].y;
} }
x3 /= (endwall-startwall); hitinfo.pos.x /= (endwall-startwall);
y3 /= (endwall-startwall); hitinfo.pos.y /= (endwall-startwall);
startwall = sector[startsect].wallptr; startwall = sector[startsect].wallptr;
endwall = startwall+sector[startsect].wallnum; endwall = startwall+sector[startsect].wallnum;
@ -723,8 +723,8 @@ void computergetinput(int snum, SW_PACKET *syn)
//if (dx*(y1-wall[i].y) <= dy*(x1-wall[i].x)) //if (dx*(y1-wall[i].y) <= dy*(x1-wall[i].x))
// if (dx*(y2-wall[i].y) >= dy*(x2-wall[i].x)) // if (dx*(y2-wall[i].y) >= dy*(x2-wall[i].x))
if ((x3-x1)*(wall[i].y-y1) <= (y3-y1)*(wall[i].x-x1)) if ((hitinfo.pos.x-x1)*(wall[i].y-y1) <= (hitinfo.pos.y-y1)*(wall[i].x-x1))
if ((x3-x1)*(wall[wall[i].point2].y-y1) >= (y3-y1)*(wall[wall[i].point2].x-x1)) if ((hitinfo.pos.x-x1)*(wall[wall[i].point2].y-y1) >= (hitinfo.pos.y-y1)*(wall[wall[i].point2].x-x1))
{ k = i; break; } { k = i; break; }
dist = ksqrt(dx*dx+dy*dy); dist = ksqrt(dx*dx+dy*dy);
@ -814,12 +814,12 @@ void computergetinput(int snum, SW_PACKET *syn)
goalsprite[snum] = -1; goalsprite[snum] = -1;
#endif #endif
x3 = p->posx; y3 = p->posy; z3 = p->posz; dasect = p->cursectnum; hitinfo.pos.x = p->posx; hitinfo.pos.y = p->posy; hitinfo.pos.z = p->posz; hitinfo.sect = p->cursectnum;
i = clipmove_old(&x3,&y3,&z3,&dasect,p->xvect,p->yvect,164L,4L<<8,4L<<8,CLIPMASK0); i = clipmove(&hitinfo.pos,&hitinfo.sect,p->xvect,p->yvect,164L,4L<<8,4L<<8,CLIPMASK0);
if (!i) if (!i)
{ {
x3 = p->posx; y3 = p->posy; z3 = p->posz+(24<<8); dasect = p->cursectnum; hitinfo.pos.x = p->posx; hitinfo.pos.y = p->posy; hitinfo.pos.z = p->posz+(24<<8); hitinfo.sect = p->cursectnum;
i = clipmove_old(&x3,&y3,&z3,&dasect,p->xvect,p->yvect,164L,4L<<8,4L<<8,CLIPMASK0); i = clipmove(&hitinfo.pos,&hitinfo.sect,p->xvect,p->yvect,164L,4L<<8,4L<<8,CLIPMASK0);
} }
if (i) if (i)
{ {

6
polymer/eduke32/source/sw/src/jsector.c
View file

@ -1406,7 +1406,7 @@ JS_ToggleLockouts(void)
//////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////
void void
UnlockKeyLock(short key_num, short hitsprite) UnlockKeyLock(short key_num, short hit_sprite)
{ {
SPRITEp sp; SPRITEp sp;
int SpriteNum = 0, NextSprite = 0, color = 0; int SpriteNum = 0, NextSprite = 0, color = 0;
@ -1450,7 +1450,7 @@ UnlockKeyLock(short key_num, short hitsprite)
if (sp->pal == color) if (sp->pal == color)
{ {
PlaySound(DIGI_UNLOCK, &sp->x, &sp->y, &sp->z, v3df_doppler | v3df_dontpan); PlaySound(DIGI_UNLOCK, &sp->x, &sp->y, &sp->z, v3df_doppler | v3df_dontpan);
if (SpriteNum == hitsprite) if (SpriteNum == hit_sprite)
sp->picnum = SKEL_UNLOCKED; sp->picnum = SKEL_UNLOCKED;
} }
break; break;
@ -1465,7 +1465,7 @@ UnlockKeyLock(short key_num, short hitsprite)
if (sp->pal == color) if (sp->pal == color)
{ {
PlaySound(DIGI_RAMUNLOCK, &sp->x, &sp->y, &sp->z, v3df_doppler | v3df_dontpan); PlaySound(DIGI_RAMUNLOCK, &sp->x, &sp->y, &sp->z, v3df_doppler | v3df_dontpan);
if (SpriteNum == hitsprite) if (SpriteNum == hit_sprite)
sp->picnum = CARD_UNLOCKED; sp->picnum = CARD_UNLOCKED;
else else
sp->picnum = CARD_UNLOCKED+1; sp->picnum = CARD_UNLOCKED+1;

115
polymer/eduke32/source/sw/src/jweapon.c
View file

@ -425,14 +425,9 @@ DoBloodSpray(int16_t Weapon)
case HIT_SPRITE: case HIT_SPRITE:
{ {
short wall_ang, dang; short wall_ang, dang;
short hitsprite = -2; short hit_sprite = NORM_SPRITE(u->ret);
SPRITEp hsp; SPRITEp hsp = &sprite[hit_sprite];
USERp hu; USERp hu = User[hit_sprite];
hitsprite = NORM_SPRITE(u->ret);
hsp = &sprite[hitsprite];
hu = User[hitsprite];
if (TEST(hsp->cstat, CSTAT_SPRITE_WALL)) if (TEST(hsp->cstat, CSTAT_SPRITE_WALL))
{ {
@ -457,12 +452,12 @@ DoBloodSpray(int16_t Weapon)
case HIT_WALL: case HIT_WALL:
{ {
short hitwall, nw, wall_ang, dang; short hit_wall, nw, wall_ang, dang;
WALLp wph; WALLp wph;
short wb; short wb;
hitwall = NORM_WALL(u->ret); hit_wall = NORM_WALL(u->ret);
wph = &wall[hitwall]; wph = &wall[hit_wall];
if (wph->lotag == TAG_WALL_BREAK) if (wph->lotag == TAG_WALL_BREAK)
{ {
@ -472,7 +467,7 @@ DoBloodSpray(int16_t Weapon)
} }
nw = wall[hitwall].point2; nw = wall[hit_wall].point2;
wall_ang = NORM_ANGLE(getangle(wall[nw].x - wph->x, wall[nw].y - wph->y) + 512); wall_ang = NORM_ANGLE(getangle(wall[nw].x - wph->x, wall[nw].y - wph->y) + 512);
SpawnMidSplash(Weapon); SpawnMidSplash(Weapon);
@ -497,7 +492,7 @@ DoBloodSpray(int16_t Weapon)
sp->y = sprite[wb].y; sp->y = sprite[wb].y;
// !FRANK! bit of a hack // !FRANK! bit of a hack
// yvel is the hitwall // yvel is the hit_wall
if (sprite[wb].yvel >= 0) if (sprite[wb].yvel >= 0)
{ {
short wallnum = sprite[wb].yvel; short wallnum = sprite[wb].yvel;
@ -520,8 +515,6 @@ DoBloodSpray(int16_t Weapon)
case HIT_SECTOR: case HIT_SECTOR:
{ {
SWBOOL hitwall;
// hit floor // hit floor
if (sp->z > DIV2(u->hiz + u->loz)) if (sp->z > DIV2(u->hiz + u->loz))
{ {
@ -646,14 +639,14 @@ DoPhosphorus(int16_t Weapon)
case HIT_SPRITE: case HIT_SPRITE:
{ {
short wall_ang, dang; short wall_ang, dang;
short hitsprite = -2; short hit_sprite = -2;
SPRITEp hsp; SPRITEp hsp;
USERp hu; USERp hu;
hitsprite = NORM_SPRITE(u->ret); hit_sprite = NORM_SPRITE(u->ret);
hsp = &sprite[hitsprite]; hsp = &sprite[hit_sprite];
hu = User[hitsprite]; hu = User[hit_sprite];
if (TEST(hsp->cstat, CSTAT_SPRITE_WALL)) if (TEST(hsp->cstat, CSTAT_SPRITE_WALL))
{ {
@ -666,10 +659,10 @@ DoPhosphorus(int16_t Weapon)
if (TEST(hsp->extra, SPRX_BURNABLE)) if (TEST(hsp->extra, SPRX_BURNABLE))
{ {
if (!hu) if (!hu)
hu = SpawnUser(hitsprite, hsp->picnum, NULL); hu = SpawnUser(hit_sprite, hsp->picnum, NULL);
SpawnFireballExp(Weapon); SpawnFireballExp(Weapon);
if (hu) if (hu)
SpawnFireballFlames(Weapon, hitsprite); SpawnFireballFlames(Weapon, hit_sprite);
DoFlamesDamageTest(Weapon); DoFlamesDamageTest(Weapon);
} }
u->xchange = u->ychange = 0; u->xchange = u->ychange = 0;
@ -683,11 +676,11 @@ DoPhosphorus(int16_t Weapon)
case HIT_WALL: case HIT_WALL:
{ {
short hitwall, nw, wall_ang, dang; short hit_wall, nw, wall_ang, dang;
WALLp wph; WALLp wph;
hitwall = NORM_WALL(u->ret); hit_wall = NORM_WALL(u->ret);
wph = &wall[hitwall]; wph = &wall[hit_wall];
if (wph->lotag == TAG_WALL_BREAK) if (wph->lotag == TAG_WALL_BREAK)
{ {
@ -697,7 +690,7 @@ DoPhosphorus(int16_t Weapon)
} }
nw = wall[hitwall].point2; nw = wall[hit_wall].point2;
wall_ang = NORM_ANGLE(getangle(wall[nw].x - wph->x, wall[nw].y - wph->y) + 512); wall_ang = NORM_ANGLE(getangle(wall[nw].x - wph->x, wall[nw].y - wph->y) + 512);
WallBounce(Weapon, wall_ang); WallBounce(Weapon, wall_ang);
@ -707,11 +700,11 @@ DoPhosphorus(int16_t Weapon)
case HIT_SECTOR: case HIT_SECTOR:
{ {
SWBOOL hitwall; SWBOOL did_hit_wall;
if (SlopeBounce(Weapon, &hitwall)) if (SlopeBounce(Weapon, &did_hit_wall))
{ {
if (hitwall) if (did_hit_wall)
{ {
// hit a wall // hit a wall
ScaleSpriteVector(Weapon, 28000); ScaleSpriteVector(Weapon, 28000);
@ -873,14 +866,14 @@ DoChemBomb(int16_t Weapon)
case HIT_SPRITE: case HIT_SPRITE:
{ {
short wall_ang, dang; short wall_ang, dang;
short hitsprite = -2; short hit_sprite;
SPRITEp hsp; SPRITEp hsp;
if (!TEST(sp->cstat, CSTAT_SPRITE_INVISIBLE)) if (!TEST(sp->cstat, CSTAT_SPRITE_INVISIBLE))
PlaySound(DIGI_CHEMBOUNCE, &sp->x, &sp->y, &sp->z, v3df_dontpan); PlaySound(DIGI_CHEMBOUNCE, &sp->x, &sp->y, &sp->z, v3df_dontpan);
hitsprite = NORM_SPRITE(u->ret); hit_sprite = NORM_SPRITE(u->ret);
hsp = &sprite[hitsprite]; hsp = &sprite[hit_sprite];
if (TEST(hsp->cstat, CSTAT_SPRITE_WALL)) if (TEST(hsp->cstat, CSTAT_SPRITE_WALL))
{ {
@ -910,11 +903,11 @@ DoChemBomb(int16_t Weapon)
case HIT_WALL: case HIT_WALL:
{ {
short hitwall, nw, wall_ang, dang; short hit_wall, nw, wall_ang, dang;
WALLp wph; WALLp wph;
hitwall = NORM_WALL(u->ret); hit_wall = NORM_WALL(u->ret);
wph = &wall[hitwall]; wph = &wall[hit_wall];
if (wph->lotag == TAG_WALL_BREAK) if (wph->lotag == TAG_WALL_BREAK)
{ {
@ -926,7 +919,7 @@ DoChemBomb(int16_t Weapon)
if (!TEST(sp->cstat, CSTAT_SPRITE_INVISIBLE)) if (!TEST(sp->cstat, CSTAT_SPRITE_INVISIBLE))
PlaySound(DIGI_CHEMBOUNCE, &sp->x, &sp->y, &sp->z, v3df_dontpan); PlaySound(DIGI_CHEMBOUNCE, &sp->x, &sp->y, &sp->z, v3df_dontpan);
nw = wall[hitwall].point2; nw = wall[hit_wall].point2;
wall_ang = NORM_ANGLE(getangle(wall[nw].x - wph->x, wall[nw].y - wph->y) + 512); wall_ang = NORM_ANGLE(getangle(wall[nw].x - wph->x, wall[nw].y - wph->y) + 512);
WallBounce(Weapon, wall_ang); WallBounce(Weapon, wall_ang);
@ -936,11 +929,11 @@ DoChemBomb(int16_t Weapon)
case HIT_SECTOR: case HIT_SECTOR:
{ {
SWBOOL hitwall; SWBOOL did_hit_wall;
if (SlopeBounce(Weapon, &hitwall)) if (SlopeBounce(Weapon, &did_hit_wall))
{ {
if (hitwall) if (did_hit_wall)
{ {
// hit a wall // hit a wall
ScaleSpriteVector(Weapon, 28000); ScaleSpriteVector(Weapon, 28000);
@ -1132,13 +1125,13 @@ DoCaltrops(int16_t Weapon)
case HIT_SPRITE: case HIT_SPRITE:
{ {
short wall_ang, dang; short wall_ang, dang;
short hitsprite = -2; short hit_sprite;
SPRITEp hsp; SPRITEp hsp;
PlaySound(DIGI_CALTROPS, &sp->x, &sp->y, &sp->z, v3df_dontpan); PlaySound(DIGI_CALTROPS, &sp->x, &sp->y, &sp->z, v3df_dontpan);
hitsprite = NORM_SPRITE(u->ret); hit_sprite = NORM_SPRITE(u->ret);
hsp = &sprite[hitsprite]; hsp = &sprite[hit_sprite];
if (TEST(hsp->cstat, CSTAT_SPRITE_WALL)) if (TEST(hsp->cstat, CSTAT_SPRITE_WALL))
{ {
@ -1158,11 +1151,11 @@ DoCaltrops(int16_t Weapon)
case HIT_WALL: case HIT_WALL:
{ {
short hitwall, nw, wall_ang, dang; short hit_wall, nw, wall_ang, dang;
WALLp wph; WALLp wph;
hitwall = NORM_WALL(u->ret); hit_wall = NORM_WALL(u->ret);
wph = &wall[hitwall]; wph = &wall[hit_wall];
if (wph->lotag == TAG_WALL_BREAK) if (wph->lotag == TAG_WALL_BREAK)
{ {
@ -1173,7 +1166,7 @@ DoCaltrops(int16_t Weapon)
PlaySound(DIGI_CALTROPS, &sp->x, &sp->y, &sp->z, v3df_dontpan); PlaySound(DIGI_CALTROPS, &sp->x, &sp->y, &sp->z, v3df_dontpan);
nw = wall[hitwall].point2; nw = wall[hit_wall].point2;
wall_ang = NORM_ANGLE(getangle(wall[nw].x - wph->x, wall[nw].y - wph->y) + 512); wall_ang = NORM_ANGLE(getangle(wall[nw].x - wph->x, wall[nw].y - wph->y) + 512);
WallBounce(Weapon, wall_ang); WallBounce(Weapon, wall_ang);
@ -1183,11 +1176,11 @@ DoCaltrops(int16_t Weapon)
case HIT_SECTOR: case HIT_SECTOR:
{ {
SWBOOL hitwall; SWBOOL did_hit_wall;
if (SlopeBounce(Weapon, &hitwall)) if (SlopeBounce(Weapon, &did_hit_wall))
{ {
if (hitwall) if (did_hit_wall)
{ {
// hit a wall // hit a wall
ScaleSpriteVector(Weapon, 1000); ScaleSpriteVector(Weapon, 1000);
@ -1385,7 +1378,7 @@ PlayerInitChemBomb(PLAYERp pp)
USERp wu; USERp wu;
SPRITEp wp; SPRITEp wp;
int nx, ny, nz; int nx, ny, nz;
short w, hitsprite; short w, hit_sprite;
short oclipdist; short oclipdist;
int dist; int dist;
@ -1469,7 +1462,7 @@ InitSpriteChemBomb(int16_t SpriteNum)
USERp wu; USERp wu;
SPRITEp sp = &sprite[SpriteNum], wp; SPRITEp sp = &sprite[SpriteNum], wp;
int nx, ny, nz; int nx, ny, nz;
short w, hitsprite; short w, hit_sprite;
short oclipdist; short oclipdist;
int dist; int dist;
@ -1525,7 +1518,7 @@ InitChemBomb(short SpriteNum)
USERp wu; USERp wu;
SPRITEp wp; SPRITEp wp;
int nx, ny, nz; int nx, ny, nz;
short w, hitsprite; short w, hit_sprite;
short oclipdist; short oclipdist;
int dist; int dist;
@ -1830,7 +1823,7 @@ PlayerInitCaltrops(PLAYERp pp)
USERp wu; USERp wu;
SPRITEp wp; SPRITEp wp;
int nx, ny, nz; int nx, ny, nz;
short w, hitsprite; short w, hit_sprite;
short oclipdist, i; short oclipdist, i;
int dist; int dist;
@ -1912,7 +1905,7 @@ InitCaltrops(int16_t SpriteNum)
USERp wu; USERp wu;
SPRITEp wp; SPRITEp wp;
int nx, ny, nz; int nx, ny, nz;
short w, hitsprite; short w, hit_sprite;
short oclipdist, i; short oclipdist, i;
int dist; int dist;
@ -1965,7 +1958,7 @@ InitPhosphorus(int16_t SpriteNum)
USERp wu; USERp wu;
SPRITEp wp; SPRITEp wp;
int nx, ny, nz; int nx, ny, nz;
short w, hitsprite; short w, hit_sprite;
short oclipdist, i, daang; short oclipdist, i, daang;
int dist; int dist;
@ -2025,7 +2018,7 @@ InitBloodSpray(int16_t SpriteNum, SWBOOL dogib, short velocity)
USERp wu; USERp wu;
SPRITEp wp; SPRITEp wp;
int nx, ny, nz; int nx, ny, nz;
short w, hitsprite; short w, hit_sprite;
short oclipdist, i, cnt, ang, vel, rnd; short oclipdist, i, cnt, ang, vel, rnd;
int dist; int dist;
@ -2449,13 +2442,13 @@ DoFlag(int16_t Weapon)
{ {
SPRITEp sp = &sprite[Weapon]; SPRITEp sp = &sprite[Weapon];
USERp u = User[Weapon]; USERp u = User[Weapon];
int16_t hitsprite = -1; int16_t hit_sprite = -1;
hitsprite = DoFlagRangeTest(Weapon, 1000); hit_sprite = DoFlagRangeTest(Weapon, 1000);
if (hitsprite != -1) if (hit_sprite != -1)
{ {
SPRITEp hsp = &sprite[hitsprite]; SPRITEp hsp = &sprite[hit_sprite];
SetCarryFlag(Weapon); SetCarryFlag(Weapon);
@ -2464,7 +2457,7 @@ DoFlag(int16_t Weapon)
{ {
// attach weapon to sprite // attach weapon to sprite
RESET(sp->cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN); RESET(sp->cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN);
SetAttach(hitsprite, Weapon); SetAttach(hit_sprite, Weapon);
u->sz = hsp->z - DIV2(SPRITEp_SIZE_Z(hsp)); u->sz = hsp->z - DIV2(SPRITEp_SIZE_Z(hsp));
//u->sz = hsp->z - SPRITEp_MID(hsp); // Set mid way up who it hit //u->sz = hsp->z - SPRITEp_MID(hsp); // Set mid way up who it hit
} }
@ -2481,7 +2474,7 @@ InitShell(int16_t SpriteNum, int16_t ShellNum)
USERp wu; USERp wu;
SPRITEp sp = &sprite[SpriteNum], wp; SPRITEp sp = &sprite[SpriteNum], wp;
int nx, ny, nz; int nx, ny, nz;
short w, hitsprite; short w;
short oclipdist,id=0,velocity=0; short oclipdist,id=0,velocity=0;
int dist; int dist;
STATEp p=NULL; STATEp p=NULL;

4
polymer/eduke32/source/sw/src/ninja.c
View file

@ -1917,7 +1917,7 @@ DoNinjaHariKari(short SpriteNum)
{ {
USERp u = User[SpriteNum]; USERp u = User[SpriteNum];
SPRITEp sp = User[SpriteNum]->SpriteP; SPRITEp sp = User[SpriteNum]->SpriteP;
int SpawnBlood(short SpriteNum, short Weapon, short hitang, int hitx, int hity, int hitz); int SpawnBlood(short SpriteNum, short Weapon, short hit_ang, int hit_x, int hit_y, int hit_z);
short cnt,i; short cnt,i;
UpdateSinglePlayKills(SpriteNum); UpdateSinglePlayKills(SpriteNum);
@ -1948,7 +1948,7 @@ DoNinjaGrabThroat(short SpriteNum)
{ {
USERp u = User[SpriteNum]; USERp u = User[SpriteNum];
SPRITEp sp = User[SpriteNum]->SpriteP; SPRITEp sp = User[SpriteNum]->SpriteP;
int SpawnBlood(short SpriteNum, short Weapon, short hitang, int hitx, int hity, int hitz); int SpawnBlood(short SpriteNum, short Weapon, short hit_ang, int hit_x, int hit_y, int hit_z);
short cnt,i; short cnt,i;
if ((u->WaitTics -= ACTORMOVETICS) <= 0) if ((u->WaitTics -= ACTORMOVETICS) <= 0)

61
polymer/eduke32/source/sw/src/player.c
View file

@ -3330,8 +3330,7 @@ DoPlayerMoveTank(PLAYERp pp)
if (RectClip) if (RectClip)
{ {
int nx,ny; int nx,ny;
int hitx,hity,hitz; hitdata_t hitinfo;
short hitsect, hitwall, hitsprite;
int vel; int vel;
int ret; int ret;
@ -3349,23 +3348,22 @@ DoPlayerMoveTank(PLAYERp pp)
if (vel > 13000) if (vel > 13000)
{ {
nx = DIV2(x[0] + x[1]); vec3_t hit_pos = { DIV2(x[0] + x[1]), DIV2(y[0] + y[1]), sector[pp->cursectnum].floorz - Z(10) };
ny = DIV2(y[0] + y[1]);
hitscan(nx, ny, sector[pp->cursectnum].floorz - Z(10), pp->cursectnum, hitscan(&hit_pos, pp->cursectnum,
//pp->xvect, pp->yvect, 0, //pp->xvect, pp->yvect, 0,
MOVEx(256, pp->pang), MOVEy(256, pp->pang), 0, MOVEx(256, pp->pang), MOVEy(256, pp->pang), 0,
&hitsect, &hitwall, &hitsprite, &hitx, &hity, &hitz, CLIPMASK_PLAYER); &hitinfo, CLIPMASK_PLAYER);
////DSPRINTF(ds,"hitsect %d, hitwall %d, hitx %d, hity %d, hitz %d",hitsect, hitwall, hitx, hity, hitz); ////DSPRINTF(ds,"hitinfo.sect %d, hitinfo.wall %d, hitinfo.pos.x %d, hitinfo.pos.y %d, hitinfo.pos.z %d",hitinfo.sect, hitinfo.wall, hitinfo.pos.x, hitinfo.pos.y, hitinfo.pos.z);
//MONO_PRINT(ds); //MONO_PRINT(ds);
if (FindDistance2D(hitx - nx, hity - ny) < 800) if (FindDistance2D(hitinfo.pos.x - hit_pos.x, hitinfo.pos.y - hit_pos.y) < 800)
{ {
if (hitwall >= 0) if (hitinfo.wall >= 0)
u->ret = hitwall|HIT_WALL; u->ret = hitinfo.wall|HIT_WALL;
else if (hitsprite >= 0) else if (hitinfo.sprite >= 0)
u->ret = hitsprite|HIT_SPRITE; u->ret = hitinfo.sprite|HIT_SPRITE;
else else
u->ret = 0; u->ret = 0;
@ -4095,8 +4093,7 @@ DoPlayerClimb(PLAYERp pp)
int int
DoPlayerWadeSuperJump(PLAYERp pp) DoPlayerWadeSuperJump(PLAYERp pp)
{ {
int hitx, hity, hitz; hitdata_t hitinfo;
short hitsect, hitwall, hitsprite;
USERp u = User[pp->PlayerSprite]; USERp u = User[pp->PlayerSprite];
unsigned i; unsigned i;
//short angs[3]; //short angs[3];
@ -4111,15 +4108,15 @@ DoPlayerWadeSuperJump(PLAYERp pp)
sintable[NORM_ANGLE(pp->pang + angs[i] + 512)], // X vector of 3D ang sintable[NORM_ANGLE(pp->pang + angs[i] + 512)], // X vector of 3D ang
sintable[NORM_ANGLE(pp->pang + angs[i])], // Y vector of 3D ang sintable[NORM_ANGLE(pp->pang + angs[i])], // Y vector of 3D ang
0, // Z vector of 3D ang 0, // Z vector of 3D ang
&hitsect, &hitwall, &hitsprite, &hitx, &hity, &hitz, CLIPMASK_MISSILE); &hitinfo, CLIPMASK_MISSILE);
if (hitwall >= 0 && hitsect >= 0) if (hitinfo.wall >= 0 && hitinfo.sect >= 0)
{ {
hitsect = wall[hitwall].nextsector; hitinfo.sect = wall[hitinfo.wall].nextsector;
if (labs(sector[hitsect].floorz - pp->posz) < Z(50)) if (labs(sector[hitinfo.sect].floorz - pp->posz) < Z(50))
{ {
if (Distance(pp->posx, pp->posy, hitx, hity) < ((((int)pp->SpriteP->clipdist)<<2) + 256)) if (Distance(pp->posx, pp->posy, hitinfo.pos.x, hitinfo.pos.y) < ((((int)pp->SpriteP->clipdist)<<2) + 256))
return TRUE; return TRUE;
} }
} }
@ -4542,8 +4539,7 @@ PlayerOnLadder(PLAYERp pp)
unsigned i; unsigned i;
USERp u = User[pp->PlayerSprite]; USERp u = User[pp->PlayerSprite];
SPRITEp lsp; SPRITEp lsp;
int hitx,hity,hitz; hitdata_t hitinfo;
short hitsprite,hitsect,hitwall;
int dir; int dir;
int neartaghitdist; int neartaghitdist;
@ -4582,16 +4578,16 @@ PlayerOnLadder(PLAYERp pp)
sintable[NORM_ANGLE(pp->pang + angles[i] + 512)], sintable[NORM_ANGLE(pp->pang + angles[i] + 512)],
sintable[NORM_ANGLE(pp->pang + angles[i])], sintable[NORM_ANGLE(pp->pang + angles[i])],
0, 0,
&hitsect, &hitwall, &hitsprite, &hitx, &hity, &hitz, CLIPMASK_MISSILE); &hitinfo, CLIPMASK_MISSILE);
dist = DIST(pp->posx, pp->posy, hitx, hity); dist = DIST(pp->posx, pp->posy, hitinfo.pos.x, hitinfo.pos.y);
if (hitsprite >= 0) if (hitinfo.sprite >= 0)
{ {
// if the sprite blocking you hit is not a wall sprite there is something between // if the sprite blocking you hit is not a wall sprite there is something between
// you and the ladder // you and the ladder
if (TEST(sprite[hitsprite].cstat, CSTAT_SPRITE_BLOCK) && if (TEST(sprite[hitinfo.sprite].cstat, CSTAT_SPRITE_BLOCK) &&
!TEST(sprite[hitsprite].cstat, CSTAT_SPRITE_WALL)) !TEST(sprite[hitinfo.sprite].cstat, CSTAT_SPRITE_WALL))
{ {
return FALSE; return FALSE;
} }
@ -4599,7 +4595,7 @@ PlayerOnLadder(PLAYERp pp)
else else
{ {
// if you hit a wall and it is not a climb wall - forget it // if you hit a wall and it is not a climb wall - forget it
if (hitwall >= 0 && wall[hitwall].lotag != TAG_WALL_CLIMB) if (hitinfo.wall >= 0 && wall[hitinfo.wall].lotag != TAG_WALL_CLIMB)
return FALSE; return FALSE;
} }
} }
@ -7065,13 +7061,13 @@ void DoPlayerDeathMoveHead(PLAYERp pp)
case HIT_SPRITE: case HIT_SPRITE:
{ {
short wall_ang, dang; short wall_ang, dang;
short hitsprite = -2; short hit_sprite = -2;
SPRITEp hsp; SPRITEp hsp;
//PlaySound(DIGI_DHCLUNK, &pp->posx, &pp->posy, &pp->posz, v3df_dontpan); //PlaySound(DIGI_DHCLUNK, &pp->posx, &pp->posy, &pp->posz, v3df_dontpan);
hitsprite = NORM_SPRITE(u->ret); hit_sprite = NORM_SPRITE(u->ret);
hsp = &sprite[hitsprite]; hsp = &sprite[hit_sprite];
if (!TEST(hsp->cstat, CSTAT_SPRITE_WALL)) if (!TEST(hsp->cstat, CSTAT_SPRITE_WALL))
break; break;
@ -7086,13 +7082,12 @@ void DoPlayerDeathMoveHead(PLAYERp pp)
} }
case HIT_WALL: case HIT_WALL:
{ {
short hitwall,w,nw,wall_ang,dang; short w,nw,wall_ang,dang;
//PlaySound(DIGI_DHCLUNK, &pp->posx, &pp->posy, &pp->posz, v3df_dontpan); //PlaySound(DIGI_DHCLUNK, &pp->posx, &pp->posy, &pp->posz, v3df_dontpan);
hitwall = NORM_WALL(u->ret); w = NORM_WALL(u->ret);
w = hitwall;
nw = wall[w].point2; nw = wall[w].point2;
wall_ang = NORM_ANGLE(getangle(wall[nw].x - wall[w].x, wall[nw].y - wall[w].y)-512); wall_ang = NORM_ANGLE(getangle(wall[nw].x - wall[w].x, wall[nw].y - wall[w].y)-512);

20
polymer/eduke32/source/sw/src/ripper.c
View file

@ -943,9 +943,7 @@ InitRipperHang(short SpriteNum)
int dist; int dist;
short ang2; short ang2;
short hitwall; hitdata_t hitinfo = { { 0, 0, 0 }, -2, 0, -2 };
short hitsprite = -2, hitsect = -2;
int hitx, hity, hitz;
SWBOOL Found = FALSE; SWBOOL Found = FALSE;
short dang, tang; short dang, tang;
@ -958,15 +956,15 @@ InitRipperHang(short SpriteNum)
sintable[NORM_ANGLE(tang + 512)], // X vector of 3D ang sintable[NORM_ANGLE(tang + 512)], // X vector of 3D ang
sintable[tang], // Y vector of 3D ang sintable[tang], // Y vector of 3D ang
0, // Z vector of 3D ang 0, // Z vector of 3D ang
&hitsect, &hitwall, &hitsprite, &hitx, &hity, &hitz, CLIPMASK_MISSILE); &hitinfo, CLIPMASK_MISSILE);
//ASSERT(hitsect >= 0); //ASSERT(hitinfo.sect >= 0);
if (hitsect < 0) if (hitinfo.sect < 0)
continue; continue;
dist = Distance(sp->x, sp->y, hitx, hity); dist = Distance(sp->x, sp->y, hitinfo.pos.x, hitinfo.pos.y);
if (hitwall < 0 || dist < 2000 || dist > 7000) if (hitinfo.wall < 0 || dist < 2000 || dist > 7000)
{ {
continue; continue;
} }
@ -1033,16 +1031,16 @@ DoRipperMoveHang(short SpriteNum)
{ {
case HIT_WALL: case HIT_WALL:
{ {
short hitwall; short hit_wall;
short w, nw; short w, nw;
hitwall = NORM_WALL(u->ret); hit_wall = NORM_WALL(u->ret);
NewStateGroup(SpriteNum, u->ActorActionSet->Special[1]); NewStateGroup(SpriteNum, u->ActorActionSet->Special[1]);
u->WaitTics = 2 + ((RANDOM_P2(4 << 8) >> 8) * 120); u->WaitTics = 2 + ((RANDOM_P2(4 << 8) >> 8) * 120);
// hang flush with the wall // hang flush with the wall
w = hitwall; w = hit_wall;
nw = wall[w].point2; nw = wall[w].point2;
sp->ang = NORM_ANGLE(getangle(wall[nw].x - wall[w].x, wall[nw].y - wall[w].y) - 512); sp->ang = NORM_ANGLE(getangle(wall[nw].x - wall[w].x, wall[nw].y - wall[w].y) - 512);

18
polymer/eduke32/source/sw/src/ripper2.c
View file

@ -942,9 +942,7 @@ InitRipper2Hang(short SpriteNum)
int dist; int dist;
short ang2; short ang2;
short hitwall; hitdata_t hitinfo = { { 0, 0, 0 }, -2, 0, -2 };
short hitsprite = -2, hitsect = -2;
int hitx, hity, hitz;
SWBOOL Found = FALSE; SWBOOL Found = FALSE;
short dang, tang; short dang, tang;
@ -957,14 +955,14 @@ InitRipper2Hang(short SpriteNum)
sintable[NORM_ANGLE(tang + 512)], // X vector of 3D ang sintable[NORM_ANGLE(tang + 512)], // X vector of 3D ang
sintable[tang], // Y vector of 3D ang sintable[tang], // Y vector of 3D ang
0, // Z vector of 3D ang 0, // Z vector of 3D ang
&hitsect, &hitwall, &hitsprite, &hitx, &hity, &hitz, CLIPMASK_MISSILE); &hitinfo, CLIPMASK_MISSILE);
if (hitsect < 0) if (hitinfo.sect < 0)
continue; continue;
dist = Distance(sp->x, sp->y, hitx, hity); dist = Distance(sp->x, sp->y, hitinfo.pos.x, hitinfo.pos.y);
if (hitwall < 0 || dist < 2000 || dist > 7000) if (hitinfo.wall < 0 || dist < 2000 || dist > 7000)
{ {
continue; continue;
} }
@ -1032,14 +1030,14 @@ DoRipper2MoveHang(short SpriteNum)
{ {
case HIT_WALL: case HIT_WALL:
{ {
short hitwall; short hit_wall;
short w, nw; short w, nw;
// Don't keep clinging and going ever higher! // Don't keep clinging and going ever higher!
if (abs(sp->z - u->tgt_sp->z) > (4000<<4)) if (abs(sp->z - u->tgt_sp->z) > (4000<<4))
break; break;
hitwall = NORM_WALL(u->ret); hit_wall = NORM_WALL(u->ret);
NewStateGroup(SpriteNum, u->ActorActionSet->Special[1]); NewStateGroup(SpriteNum, u->ActorActionSet->Special[1]);
if (RANDOM_P2(1024<<8)>>8 > 500) if (RANDOM_P2(1024<<8)>>8 > 500)
@ -1048,7 +1046,7 @@ DoRipper2MoveHang(short SpriteNum)
u->WaitTics = 0; // Double jump u->WaitTics = 0; // Double jump
// hang flush with the wall // hang flush with the wall
w = hitwall; w = hit_wall;
nw = wall[w].point2; nw = wall[w].point2;
sp->ang = NORM_ANGLE(getangle(wall[nw].x - wall[w].x, wall[nw].y - wall[w].y) - 512); sp->ang = NORM_ANGLE(getangle(wall[nw].x - wall[w].x, wall[nw].y - wall[w].y) - 512);

146
polymer/eduke32/source/sw/src/rooms.c
View file

@ -149,56 +149,50 @@ void ResetWallWarpHitscan(short sectnum)
void void
FAFhitscan(int32_t x, int32_t y, int32_t z, int16_t sectnum, FAFhitscan(int32_t x, int32_t y, int32_t z, int16_t sectnum,
int32_t xvect, int32_t yvect, int32_t zvect, int32_t xvect, int32_t yvect, int32_t zvect,
int16_t* hitsect, int16_t* hitwall, int16_t* hitsprite, hitdata_t* hitinfo, int32_t clipmask)
int32_t* hitx, int32_t* hity, int32_t* hitz, int32_t clipmask)
{ {
vec3_t firstpos = { x, y, z };
int loz, hiz; int loz, hiz;
short newsectnum = sectnum; short newsectnum = sectnum;
int startclipmask = 0; int startclipmask = 0;
SWBOOL plax_found = FALSE; SWBOOL plax_found = FALSE;
int sx,sy,sz;
if (clipmask == CLIPMASK_MISSILE) if (clipmask == CLIPMASK_MISSILE)
startclipmask = CLIPMASK_WARP_HITSCAN; startclipmask = CLIPMASK_WARP_HITSCAN;
hitscan(x, y, z, sectnum, xvect, yvect, zvect, hitscan(&firstpos, sectnum, xvect, yvect, zvect,
hitsect, hitwall, hitsprite, hitinfo, startclipmask);
hitx, hity, hitz, startclipmask);
if (*hitsect < 0) if (hitinfo->sect < 0)
return; return;
if (*hitwall >= 0) if (hitinfo->wall >= 0)
{ {
// hitscan warping // hitscan warping
if (TEST(wall[*hitwall].cstat, CSTAT_WALL_WARP_HITSCAN)) if (TEST(wall[hitinfo->wall].cstat, CSTAT_WALL_WARP_HITSCAN))
{ {
short src_sect = *hitsect; short src_sect = hitinfo->sect;
short dest_sect; short dest_sect;
sx = *hitx;
sy = *hity;
sz = *hitz;
//DSPRINTF(ds,"sx %d, sy %d, sz %d, xvect %d, yvect %d",sx, sy, sz,xvect,yvect);
MONO_PRINT(ds); MONO_PRINT(ds);
// back it up a bit to get a correct warp location // back it up a bit to get a correct warp location
*hitx -= xvect>>9; hitinfo->pos.x -= xvect>>9;
*hity -= yvect>>9; hitinfo->pos.y -= yvect>>9;
// warp to new x,y,z, sectnum // warp to new x,y,z, sectnum
if (Warp(hitx, hity, hitz, hitsect)) if (Warp(&hitinfo->pos.x, &hitinfo->pos.y, &hitinfo->pos.z, &hitinfo->sect))
{ {
dest_sect = *hitsect; vec3_t pos = hitinfo->pos;
dest_sect = hitinfo->sect;
// hitscan needs to pass through dest sect // hitscan needs to pass through dest sect
ResetWallWarpHitscan(dest_sect); ResetWallWarpHitscan(dest_sect);
// NOTE: This could be recursive I think if need be // NOTE: This could be recursive I think if need be
hitscan(*hitx, *hity, *hitz, *hitsect, xvect, yvect, zvect, hitscan(&pos, hitinfo->sect, xvect, yvect, zvect,
hitsect, hitwall, hitsprite, hitinfo, startclipmask);
hitx, hity, hitz, startclipmask);
// reset hitscan block for dest sect // reset hitscan block for dest sect
SetWallWarpHitscan(dest_sect); SetWallWarpHitscan(dest_sect);
@ -207,7 +201,7 @@ FAFhitscan(int32_t x, int32_t y, int32_t z, int16_t sectnum,
} }
else else
{ {
//DSPRINTF(ds,"hitx %d, hity %d, hitz %d",*hitx, *hity, *hitz); //DSPRINTF(ds,"hitinfo->pos.x %d, hitinfo->pos.y %d, hitinfo->pos.z %d",hitinfo->pos.x, hitinfo->pos.y, hitinfo->pos.z);
MONO_PRINT(ds); MONO_PRINT(ds);
ASSERT(TRUE == FALSE); ASSERT(TRUE == FALSE);
} }
@ -215,49 +209,49 @@ FAFhitscan(int32_t x, int32_t y, int32_t z, int16_t sectnum,
} }
// make sure it hit JUST a sector before doing a check // make sure it hit JUST a sector before doing a check
if (*hitwall < 0 && *hitsprite < 0) if (hitinfo->wall < 0 && hitinfo->sprite < 0)
{ {
if (TEST(sector[*hitsect].extra, SECTFX_WARP_SECTOR)) if (TEST(sector[hitinfo->sect].extra, SECTFX_WARP_SECTOR))
{ {
if (TEST(wall[sector[*hitsect].wallptr].cstat, CSTAT_WALL_WARP_HITSCAN)) if (TEST(wall[sector[hitinfo->sect].wallptr].cstat, CSTAT_WALL_WARP_HITSCAN))
{ {
// hit the floor of a sector that is a warping sector // hit the floor of a sector that is a warping sector
if (Warp(hitx, hity, hitz, hitsect)) if (Warp(&hitinfo->pos.x, &hitinfo->pos.y, &hitinfo->pos.z, &hitinfo->sect))
{ {
hitscan(*hitx, *hity, *hitz, *hitsect, xvect, yvect, zvect, vec3_t pos = hitinfo->pos;
hitsect, hitwall, hitsprite, hitscan(&pos, hitinfo->sect, xvect, yvect, zvect,
hitx, hity, hitz, clipmask); hitinfo, clipmask);
return; return;
} }
} }
else else
{ {
if (WarpPlane(hitx, hity, hitz, hitsect)) if (WarpPlane(&hitinfo->pos.x, &hitinfo->pos.y, &hitinfo->pos.z, &hitinfo->sect))
{ {
hitscan(*hitx, *hity, *hitz, *hitsect, xvect, yvect, zvect, vec3_t pos = hitinfo->pos;
hitsect, hitwall, hitsprite, hitscan(&pos, hitinfo->sect, xvect, yvect, zvect,
hitx, hity, hitz, clipmask); hitinfo, clipmask);
return; return;
} }
} }
} }
getzsofslope(*hitsect, *hitx, *hity, &hiz, &loz); getzsofslope(hitinfo->sect, hitinfo->pos.x, hitinfo->pos.y, &hiz, &loz);
if (labs(*hitz - loz) < Z(4)) if (labs(hitinfo->pos.z - loz) < Z(4))
{ {
if (FAF_ConnectFloor(*hitsect) && !TEST(sector[*hitsect].floorstat, FLOOR_STAT_FAF_BLOCK_HITSCAN)) if (FAF_ConnectFloor(hitinfo->sect) && !TEST(sector[hitinfo->sect].floorstat, FLOOR_STAT_FAF_BLOCK_HITSCAN))
{ {
updatesectorz(*hitx, *hity, *hitz + Z(12), &newsectnum); updatesectorz(hitinfo->pos.x, hitinfo->pos.y, hitinfo->pos.z + Z(12), &newsectnum);
plax_found = TRUE; plax_found = TRUE;
} }
} }
else if (labs(*hitz - hiz) < Z(4)) else if (labs(hitinfo->pos.z - hiz) < Z(4))
{ {
if (FAF_ConnectCeiling(*hitsect) && !TEST(sector[*hitsect].floorstat, CEILING_STAT_FAF_BLOCK_HITSCAN)) if (FAF_ConnectCeiling(hitinfo->sect) && !TEST(sector[hitinfo->sect].floorstat, CEILING_STAT_FAF_BLOCK_HITSCAN))
{ {
updatesectorz(*hitx, *hity, *hitz - Z(12), &newsectnum); updatesectorz(hitinfo->pos.x, hitinfo->pos.y, hitinfo->pos.z - Z(12), &newsectnum);
plax_found = TRUE; plax_found = TRUE;
} }
} }
@ -265,9 +259,9 @@ FAFhitscan(int32_t x, int32_t y, int32_t z, int16_t sectnum,
if (plax_found) if (plax_found)
{ {
hitscan(*hitx, *hity, *hitz, newsectnum, xvect, yvect, zvect, vec3_t pos = hitinfo->pos;
hitsect, hitwall, hitsprite, hitscan(&pos, newsectnum, xvect, yvect, zvect,
hitx, hity, hitz, clipmask); hitinfo, clipmask);
} }
} }
@ -279,10 +273,10 @@ FAFcansee(int32_t xs, int32_t ys, int32_t zs, int16_t sects,
short newsectnum = sects; short newsectnum = sects;
int xvect, yvect, zvect; int xvect, yvect, zvect;
short ang; short ang;
short hitsect, hitwall, hitsprite; hitdata_t hitinfo;
int hitx, hity, hitz;
int dist; int dist;
SWBOOL plax_found = FALSE; SWBOOL plax_found = FALSE;
vec3_t s = { xs, ys, zs };
ASSERT(sects >= 0 && secte >= 0); ASSERT(sects >= 0 && secte >= 0);
@ -291,9 +285,6 @@ FAFcansee(int32_t xs, int32_t ys, int32_t zs, int16_t sects,
{ {
return cansee(xs,ys,zs,sects,xe,ye,ze,secte); return cansee(xs,ys,zs,sects,xe,ye,ze,secte);
} }
else
{
}
// get angle // get angle
ang = getangle(xe - xs, ye - ys); ang = getangle(xe - xs, ye - ys);
@ -317,30 +308,29 @@ FAFcansee(int32_t xs, int32_t ys, int32_t zs, int16_t sects,
else else
zvect = 0; zvect = 0;
hitscan(xs, ys, zs, sects, xvect, yvect, zvect, hitscan(&s, sects, xvect, yvect, zvect,
&hitsect, &hitwall, &hitsprite, &hitinfo, CLIPMASK_MISSILE);
&hitx, &hity, &hitz, CLIPMASK_MISSILE);
if (hitsect < 0) if (hitinfo.sect < 0)
return FALSE; return FALSE;
// make sure it hit JUST a sector before doing a check // make sure it hit JUST a sector before doing a check
if (hitwall < 0 && hitsprite < 0) if (hitinfo.wall < 0 && hitinfo.sprite < 0)
{ {
getzsofslope(hitsect, hitx, hity, &hiz, &loz); getzsofslope(hitinfo.sect, hitinfo.pos.x, hitinfo.pos.y, &hiz, &loz);
if (labs(hitz - loz) < Z(4)) if (labs(hitinfo.pos.z - loz) < Z(4))
{ {
if (FAF_ConnectFloor(hitsect)) if (FAF_ConnectFloor(hitinfo.sect))
{ {
updatesectorz(hitx, hity, hitz + Z(12), &newsectnum); updatesectorz(hitinfo.pos.x, hitinfo.pos.y, hitinfo.pos.z + Z(12), &newsectnum);
plax_found = TRUE; plax_found = TRUE;
} }
} }
else if (labs(hitz - hiz) < Z(4)) else if (labs(hitinfo.pos.z - hiz) < Z(4))
{ {
if (FAF_ConnectCeiling(hitsect)) if (FAF_ConnectCeiling(hitinfo.sect))
{ {
updatesectorz(hitx, hity, hitz - Z(12), &newsectnum); updatesectorz(hitinfo.pos.x, hitinfo.pos.y, hitinfo.pos.z - Z(12), &newsectnum);
plax_found = TRUE; plax_found = TRUE;
} }
} }
@ -351,7 +341,7 @@ FAFcansee(int32_t xs, int32_t ys, int32_t zs, int16_t sects,
} }
if (plax_found) if (plax_found)
return cansee(hitx,hity,hitz,newsectnum,xe,ye,ze,secte); return cansee(hitinfo.pos.x,hitinfo.pos.y,hitinfo.pos.z,newsectnum,xe,ye,ze,secte);
return FALSE; return FALSE;
} }
@ -392,19 +382,19 @@ SWBOOL SectorZadjust(int ceilhit, int32_t* hiz, short florhit, int32_t* loz)
{ {
case HIT_SECTOR: case HIT_SECTOR:
{ {
short hitsector = NORM_SECTOR(florhit); short hit_sector = NORM_SECTOR(florhit);
// don't jack with connect sectors // don't jack with connect sectors
if (FAF_ConnectFloor(hitsector)) if (FAF_ConnectFloor(hit_sector))
{ {
// rippers were dying through the floor in $rock // rippers were dying through the floor in $rock
if (TEST(sector[hitsector].floorstat, CEILING_STAT_FAF_BLOCK_HITSCAN)) if (TEST(sector[hit_sector].floorstat, CEILING_STAT_FAF_BLOCK_HITSCAN))
break; break;
if (TEST(sector[hitsector].extra, SECTFX_Z_ADJUST)) if (TEST(sector[hit_sector].extra, SECTFX_Z_ADJUST))
{ {
// see if a z adjust ST1 is around // see if a z adjust ST1 is around
z_amt = GetZadjustment(hitsector, FLOOR_Z_ADJUST); z_amt = GetZadjustment(hit_sector, FLOOR_Z_ADJUST);
if (z_amt) if (z_amt)
{ {
@ -417,11 +407,11 @@ SWBOOL SectorZadjust(int ceilhit, int32_t* hiz, short florhit, int32_t* loz)
break; break;
} }
if (!TEST(sector[hitsector].extra, SECTFX_Z_ADJUST)) if (!TEST(sector[hit_sector].extra, SECTFX_Z_ADJUST))
break; break;
// see if a z adjust ST1 is around // see if a z adjust ST1 is around
z_amt = GetZadjustment(hitsector, FLOOR_Z_ADJUST); z_amt = GetZadjustment(hit_sector, FLOOR_Z_ADJUST);
if (z_amt) if (z_amt)
{ {
@ -430,7 +420,7 @@ SWBOOL SectorZadjust(int ceilhit, int32_t* hiz, short florhit, int32_t* loz)
} }
else else
// default adjustment for plax // default adjustment for plax
if (TEST(sector[hitsector].floorstat, FLOOR_STAT_PLAX)) if (TEST(sector[hit_sector].floorstat, FLOOR_STAT_PLAX))
{ {
*loz += PlaxFloorGlobZadjust; *loz += PlaxFloorGlobZadjust;
} }
@ -446,15 +436,15 @@ SWBOOL SectorZadjust(int ceilhit, int32_t* hiz, short florhit, int32_t* loz)
{ {
case HIT_SECTOR: case HIT_SECTOR:
{ {
short hitsector = NORM_SECTOR(ceilhit); short hit_sector = NORM_SECTOR(ceilhit);
// don't jack with connect sectors // don't jack with connect sectors
if (FAF_ConnectCeiling(hitsector)) if (FAF_ConnectCeiling(hit_sector))
{ {
if (TEST(sector[hitsector].extra, SECTFX_Z_ADJUST)) if (TEST(sector[hit_sector].extra, SECTFX_Z_ADJUST))
{ {
// see if a z adjust ST1 is around // see if a z adjust ST1 is around
z_amt = GetZadjustment(hitsector, CEILING_Z_ADJUST); z_amt = GetZadjustment(hit_sector, CEILING_Z_ADJUST);
if (z_amt) if (z_amt)
{ {
@ -467,11 +457,11 @@ SWBOOL SectorZadjust(int ceilhit, int32_t* hiz, short florhit, int32_t* loz)
break; break;
} }
if (!TEST(sector[hitsector].extra, SECTFX_Z_ADJUST)) if (!TEST(sector[hit_sector].extra, SECTFX_Z_ADJUST))
break; break;
// see if a z adjust ST1 is around // see if a z adjust ST1 is around
z_amt = GetZadjustment(hitsector, CEILING_Z_ADJUST); z_amt = GetZadjustment(hit_sector, CEILING_Z_ADJUST);
if (z_amt) if (z_amt)
{ {
@ -480,7 +470,7 @@ SWBOOL SectorZadjust(int ceilhit, int32_t* hiz, short florhit, int32_t* loz)
} }
else else
// default adjustment for plax // default adjustment for plax
if (TEST(sector[hitsector].ceilingstat, CEILING_STAT_PLAX)) if (TEST(sector[hit_sector].ceilingstat, CEILING_STAT_PLAX))
{ {
*hiz -= PlaxCeilGlobZadjust; *hiz -= PlaxCeilGlobZadjust;
} }
@ -566,7 +556,7 @@ void FAFgetzrange(int32_t x, int32_t y, int32_t z, int16_t sectnum,
{ {
case HIT_SECTOR: case HIT_SECTOR:
{ {
short hitsector = NORM_SECTOR(*florhit); short hit_sector = NORM_SECTOR(*florhit);
break; break;
} }
case HIT_SPRITE: case HIT_SPRITE:

20
polymer/eduke32/source/sw/src/sector.c
View file

@ -2469,37 +2469,33 @@ SWBOOL NearThings(PLAYERp pp)
} }
// This only gets called if nothing else worked, check for nearness to a wall // This only gets called if nothing else worked, check for nearness to a wall
{ {
short hitsect, hitwall, hitsprite, dang; hitdata_t hitinfo = { { 0, 0, 0 }, 0, 0, 0 };
int hitx, hity, hitz; short dang = pp->pang;
hitsect = hitwall = hitsprite = 0;
dang = pp->pang;
FAFhitscan(pp->posx, pp->posy, pp->posz - Z(30), pp->cursectnum, // Start position FAFhitscan(pp->posx, pp->posy, pp->posz - Z(30), pp->cursectnum, // Start position
sintable[NORM_ANGLE(dang + 512)], // X vector of 3D ang sintable[NORM_ANGLE(dang + 512)], // X vector of 3D ang
sintable[NORM_ANGLE(dang)], // Y vector of 3D ang sintable[NORM_ANGLE(dang)], // Y vector of 3D ang
0, // Z vector of 3D ang 0, // Z vector of 3D ang
&hitsect, &hitwall, &hitsprite, &hitx, &hity, &hitz, CLIPMASK_MISSILE); &hitinfo, CLIPMASK_MISSILE);
if (hitsect < 0) if (hitinfo.sect < 0)
return FALSE; return FALSE;
if (Distance(hitx, hity, pp->posx, pp->posy) > 1500) if (Distance(hitinfo.pos.x, hitinfo.pos.y, pp->posx, pp->posy) > 1500)
return FALSE; return FALSE;
// hit a sprite? // hit a sprite?
if (hitsprite >= 0) if (hitinfo.sprite >= 0)
return FALSE; return FALSE;
if (neartagsect >= 0) if (neartagsect >= 0)
return TRUE; return TRUE;
if (hitwall >= 0) if (hitinfo.wall >= 0)
{ {
WALLp wp; WALLp wp;
wp = &wall[hitwall]; wp = &wall[hitinfo.wall];
// Near a plain old vanilla wall. Can't do anything but grunt. // Near a plain old vanilla wall. Can't do anything but grunt.
if (!TEST(wp->extra, WALLFX_DONT_STICK) && pp == Player+myconnectindex) if (!TEST(wp->extra, WALLFX_DONT_STICK) && pp == Player+myconnectindex)

26
polymer/eduke32/source/sw/src/sprite.c
View file

@ -2104,22 +2104,22 @@ SpriteSetup(void)
case SECT_WALL_PAN_SPEED: case SECT_WALL_PAN_SPEED:
{ {
short i, found = FALSE; short i, found = FALSE;
short hitsect, hitwall, hitsprite; vec3_t hit_pos = { sp->x, sp->y, sp->z - Z(8) };
int hitx, hity, hitz; hitdata_t hitinfo;
hitscan(sp->x, sp->y, sp->z - Z(8), sp->sectnum, // Start position hitscan(&hit_pos, sp->sectnum, // Start position
sintable[NORM_ANGLE(sp->ang + 512)], // X vector of 3D ang sintable[NORM_ANGLE(sp->ang + 512)], // X vector of 3D ang
sintable[sp->ang], // Y vector of 3D ang sintable[sp->ang], // Y vector of 3D ang
0, // Z vector of 3D ang 0, // Z vector of 3D ang
&hitsect, &hitwall, &hitsprite, &hitx, &hity, &hitz, CLIPMASK_MISSILE); &hitinfo, CLIPMASK_MISSILE);
if (hitwall == -1) if (hitinfo.wall == -1)
{ {
KillSprite(SpriteNum); KillSprite(SpriteNum);
break; break;
} }
sp->owner = hitwall; sp->owner = hitinfo.wall;
// if moves with SO // if moves with SO
if (TEST_BOOL1(sp)) if (TEST_BOOL1(sp))
sp->xvel = 0; sp->xvel = 0;
@ -2127,29 +2127,29 @@ SpriteSetup(void)
sp->xvel = sp->lotag; sp->xvel = sp->lotag;
sp->ang = SP_TAG6(sp); sp->ang = SP_TAG6(sp);
// attach to the sector that contains the wall // attach to the sector that contains the wall
changespritesect(SpriteNum, hitsect); changespritesect(SpriteNum, hitinfo.sect);
change_sprite_stat(SpriteNum, STAT_WALL_PAN); change_sprite_stat(SpriteNum, STAT_WALL_PAN);
break; break;
} }
case WALL_DONT_STICK: case WALL_DONT_STICK:
{ {
short hitsect, hitwall, hitsprite; vec3_t hit_pos = { sp->x, sp->y, sp->z - Z(8) };
int hitx, hity, hitz; hitdata_t hitinfo;
hitscan(sp->x, sp->y, sp->z - Z(8), sp->sectnum, // Start position hitscan(&hit_pos, sp->sectnum, // Start position
sintable[NORM_ANGLE(sp->ang + 512)], // X vector of 3D ang sintable[NORM_ANGLE(sp->ang + 512)], // X vector of 3D ang
sintable[sp->ang], // Y vector of 3D ang sintable[sp->ang], // Y vector of 3D ang
0, // Z vector of 3D ang 0, // Z vector of 3D ang
&hitsect, &hitwall, &hitsprite, &hitx, &hity, &hitz, CLIPMASK_MISSILE); &hitinfo, CLIPMASK_MISSILE);
if (hitwall == -1) if (hitinfo.wall == -1)
{ {
KillSprite(SpriteNum); KillSprite(SpriteNum);
break; break;
} }
SET(wall[hitwall].extra, WALLFX_DONT_STICK); SET(wall[hitinfo.wall].extra, WALLFX_DONT_STICK);
KillSprite(SpriteNum); KillSprite(SpriteNum);
break; break;
} }

29
polymer/eduke32/source/sw/src/track.c
View file

@ -3142,7 +3142,7 @@ ScanToWall
sintable[NORM_ANGLE(lsp->ang + 1024 + 512)], sintable[NORM_ANGLE(lsp->ang + 1024 + 512)],
sintable[lsp->ang + 1024], sintable[lsp->ang + 1024],
0, 0,
&hitsect, &hitwall, &hitsprite, &hitx, &hity, &hitz); &hitinfo);
*/ */
@ -3271,8 +3271,8 @@ ActorTrackDecide(TRACK_POINTp tpoint, short SpriteNum)
{ {
int DoActorMoveJump(short SpriteNum); int DoActorMoveJump(short SpriteNum);
int PickJumpSpeed(short SpriteNum, int pix_height); int PickJumpSpeed(short SpriteNum, int pix_height);
short hitsect, hitwall, hitsprite; int zdiff;
int hitx, hity, hitz, zdiff; hitdata_t hitinfo;
sp->ang = tpoint->ang; sp->ang = tpoint->ang;
@ -3291,19 +3291,19 @@ ActorTrackDecide(TRACK_POINTp tpoint, short SpriteNum)
sintable[NORM_ANGLE(sp->ang + 512)], // X vector of 3D ang sintable[NORM_ANGLE(sp->ang + 512)], // X vector of 3D ang
sintable[sp->ang], // Y vector of 3D ang sintable[sp->ang], // Y vector of 3D ang
0, // Z vector of 3D ang 0, // Z vector of 3D ang
&hitsect, &hitwall, &hitsprite, &hitx, &hity, &hitz, CLIPMASK_MISSILE); &hitinfo, CLIPMASK_MISSILE);
SET(sp->cstat, CSTAT_SPRITE_BLOCK); SET(sp->cstat, CSTAT_SPRITE_BLOCK);
ASSERT(hitsect >= 0); ASSERT(hitinfo.sect >= 0);
if (hitsprite >= 0) if (hitinfo.sprite >= 0)
return FALSE; return FALSE;
if (hitwall < 0) if (hitinfo.wall < 0)
return FALSE; return FALSE;
zdiff = labs(sp->z - sector[wall[hitwall].nextsector].floorz) >> 8; zdiff = labs(sp->z - sector[wall[hitinfo.wall].nextsector].floorz) >> 8;
u->jump_speed = PickJumpSpeed(SpriteNum, zdiff); u->jump_speed = PickJumpSpeed(SpriteNum, zdiff);
} }
@ -3602,8 +3602,7 @@ ActorTrackDecide(TRACK_POINTp tpoint, short SpriteNum)
if (u->ActorActionSet->Jump) if (u->ActorActionSet->Jump)
{ {
int hitx, hity, hitz; short hit_sect, hit_wall, hit_sprite;
short hitsect, hitwall, hitsprite;
int bos_z,nx,ny; int bos_z,nx,ny;
int dist; int dist;
SPRITEp lsp; SPRITEp lsp;
@ -3636,26 +3635,26 @@ ActorTrackDecide(TRACK_POINTp tpoint, short SpriteNum)
neartag(sp->x, sp->y, SPRITEp_TOS(sp) - DIV2(SPRITEp_SIZE_Z(sp)), sp->sectnum, neartag(sp->x, sp->y, SPRITEp_TOS(sp) - DIV2(SPRITEp_SIZE_Z(sp)), sp->sectnum,
sp->ang, sp->ang,
&hitsect, &hitwall, &hitsprite, &hit_sect, &hit_wall, &hit_sprite,
&dist, 600L, NTAG_SEARCH_LO_HI, NULL); &dist, 600L, NTAG_SEARCH_LO_HI, NULL);
if (hitwall < 0) if (hit_wall < 0)
{ {
ActorLeaveTrack(SpriteNum); ActorLeaveTrack(SpriteNum);
return FALSE; return FALSE;
} }
#if DEBUG #if DEBUG
if (wall[hitwall].nextsector < 0) if (wall[hit_wall].nextsector < 0)
{ {
TerminateGame(); TerminateGame();
printf("Take out white wall ladder x = %d, y = %d",wall[hitwall].x, wall[hitwall].y); printf("Take out white wall ladder x = %d, y = %d",wall[hit_wall].x, wall[hit_wall].y);
exit(0); exit(0);
} }
#endif #endif
// destination z for climbing // destination z for climbing
u->sz = sector[wall[hitwall].nextsector].floorz; u->sz = sector[wall[hit_wall].nextsector].floorz;
DoActorZrange(SpriteNum); DoActorZrange(SpriteNum);

1283
polymer/eduke32/source/sw/src/weapon.c
View file

File diff suppressed because it is too large Load diff

14
polymer/eduke32/source/sw/src/weapon.h
View file

@ -67,11 +67,11 @@ void DoPlayerBeginRecoil(PLAYERp pp, short pix_amt);
SECTOR_OBJECTp DetectSectorObject(SECTORp); SECTOR_OBJECTp DetectSectorObject(SECTORp);
SECTOR_OBJECTp DetectSectorObjectByWall(WALLp); SECTOR_OBJECTp DetectSectorObjectByWall(WALLp);
void ScaleSpriteVector(short SpriteNum, int scale); void ScaleSpriteVector(short SpriteNum, int scale);
int QueueHole(short ang, short hitsect, short hitwall, int hitx, int hity, int hitz); int QueueHole(short ang, short hit_sect, short hit_wall, int hit_x, int hit_y, int hit_z);
int QueueWallBlood(short hitsprite,short ang); int QueueWallBlood(short hit_sprite, short ang);
SWBOOL SlopeBounce(short SpriteNum, SWBOOL *hitwall); SWBOOL SlopeBounce(short SpriteNum, SWBOOL *hit_wall);
SWBOOL HitscanSpriteAdjust(short SpriteNum, short hitwall); SWBOOL HitscanSpriteAdjust(short SpriteNum, short hit_wall);
int SpawnSwordSparks(PLAYERp pp, short hitsect, short hitwall, int hitx, int hity, int hitz, short hitang); int SpawnSwordSparks(PLAYERp pp, short hit_sect, short hit_wall, int hit_x, int hit_y, int hit_z, short hit_ang);
int SpawnBubble(short SpriteNum); int SpawnBubble(short SpriteNum);
int SpawnFireballExp(int16_t Weapon); int SpawnFireballExp(int16_t Weapon);
int SpawnFireballFlames(int16_t SpriteNum,int16_t enemy); int SpawnFireballFlames(int16_t SpriteNum,int16_t enemy);
@ -152,7 +152,7 @@ extern short target_ang;
SWBOOL SpriteOverlap(short, short); SWBOOL SpriteOverlap(short, short);
int SpawnShotgunSparks(PLAYERp pp, short hitsect, short hitwall, int hitx, int hity, int hitz, short hitang); int SpawnShotgunSparks(PLAYERp pp, short hit_sect, short hit_wall, int hit_x, int hit_y, int hit_z, short hit_ang);
int DoActorBeginSlide(short SpriteNum, short ang, short vel, short dec); int DoActorBeginSlide(short SpriteNum, short ang, short vel, short dec);
int GetOverlapSector(int x, int y, short *over, short *under); int GetOverlapSector(int x, int y, short *over, short *under);
SWBOOL MissileHitDiveArea(short SpriteNum); SWBOOL MissileHitDiveArea(short SpriteNum);
@ -230,7 +230,7 @@ int SpawnNuclearExp(int16_t Weapon);
int SpawnBoltExp(int16_t Weapon); int SpawnBoltExp(int16_t Weapon);
int SpawnTracerExp(int16_t Weapon); int SpawnTracerExp(int16_t Weapon);
int SpawnGoroFireballExp(int16_t Weapon); int SpawnGoroFireballExp(int16_t Weapon);
SWBOOL MissileHitMatch(short Weapon,short WeaponNum,short hitsprite); SWBOOL MissileHitMatch(short Weapon,short WeaponNum,short hit_sprite);
int DoItemFly(int16_t SpriteNum); int DoItemFly(int16_t SpriteNum);
int SpawnVehicleSmoke(short SpriteNum); int SpawnVehicleSmoke(short SpriteNum);
short PrevWall(short wall_num); short PrevWall(short wall_num);