zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- VehicleMoveHit

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-05 00:37:15 +01:00
parent 57fc6ce53a
commit 8af0455f92
3 changed files with 18 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/sw/src/game.h
View file

@ -1661,7 +1661,7 @@ struct SECTOR_OBJECTstruct
soANIMATORp PreMoveAnimator;
soANIMATORp PostMoveAnimator;
soANIMATORp Animator;
SPRITEp controller;
DSWActor* controller;
DSWActor* sp_child; // child sprite that holds info for the sector object

4
source/games/sw/src/player.cpp
View file

@ -5013,7 +5013,7 @@ void DoPlayerBeginOperate(PLAYERp pp)
}
pp->sop = pp->sop_control = sop;
sop->controller = &pp->Actor()->s();
sop->controller = pp->Actor();
pp->angle.oang = pp->angle.ang = buildang(sop->ang);
pp->posx = sop->xmid;
@ -5080,7 +5080,7 @@ void DoPlayerBeginRemoteOperate(PLAYERp pp, SECTOR_OBJECTp sop)
short save_sectnum;
pp->sop_remote = pp->sop = pp->sop_control = sop;
sop->controller = &pp->Actor()->s();
sop->controller = pp->Actor();
// won't operate - broken
if (sop->max_damage != -9999 && sop->max_damage <= 0)

47
source/games/sw/src/weapon.cpp
View file

@ -4214,22 +4214,21 @@ bool VehicleMoveHit(DSWActor* actor)
SECTOR_OBJECTp sop;
SECTOR_OBJECTp hsop;
bool TestKillSectorObject(SECTOR_OBJECTp);
int controller;
if (!u->ret)
if (u->coll.type == kHitNone)
return false;
sop = u->sop_parent;
// sprite controlling sop
cp = sop->controller;
controller = int(cp - sprite);
auto ctrlr = sop->controller;
cp = &ctrlr->s();
switch (TEST(u->ret, HIT_MASK))
switch (u->coll.type)
{
case HIT_SECTOR:
case kHitSector:
{
short hit_sect = NORM_SECTOR(u->ret);
short hit_sect = u->coll.index;
SECTORp sectp = &sector[hit_sect];
if (TEST(sectp->extra, SECTFX_SECTOR_OBJECT))
@ -4240,22 +4239,22 @@ bool VehicleMoveHit(DSWActor* actor)
return true;
}
case HIT_SPRITE:
case kHitSprite:
{
short hit_sprite = NORM_SPRITE(u->ret);
SPRITEp hsp = &sprite[hit_sprite];
auto hitActor = u->coll.actor;
SPRITEp hsp = &hitActor->s();
if (TEST(hsp->extra, SPRX_BREAKABLE))
{
HitBreakSprite(&swActors[hit_sprite], u->ID);
HitBreakSprite(hitActor, u->ID);
return true;
}
if (TEST(hsp->extra, SPRX_PLAYER_OR_ENEMY))
{
if (hit_sprite != cp->owner)
if (hitActor != GetOwner(ctrlr))
{
DoDamage(hit_sprite, controller);
DoDamage(hitActor->GetSpriteIndex(), ctrlr->GetSpriteIndex());
return true;
}
}
@ -4263,7 +4262,7 @@ bool VehicleMoveHit(DSWActor* actor)
{
if (hsp->statnum == STAT_MINE_STUCK)
{
DoDamage(hit_sprite, actor->GetSpriteIndex());
DoDamage(hitActor->GetSpriteIndex(), actor->GetSpriteIndex());
return true;
}
}
@ -4271,9 +4270,9 @@ bool VehicleMoveHit(DSWActor* actor)
return true;
}
case HIT_WALL:
case kHitWall:
{
short hit_wall = NORM_WALL(u->ret);
short hit_wall = u->coll.index;
WALLp wph = &wall[hit_wall];
if (TEST(wph->extra, WALLFX_SECTOR_OBJECT))
@ -4281,27 +4280,11 @@ bool VehicleMoveHit(DSWActor* actor)
// sector object collision
if ((hsop = DetectSectorObjectByWall(wph)))
{
#if 1
SopDamage(hsop, sop->ram_damage);
if (hsop->max_damage <= 0)
SopCheckKill(hsop);
else
DoSpawnSpotsForDamage(hsop->match_event);
#else
// drivable damage is DIE_HARD type
if (hsop->max_damage != -9999 && sop->ram_damage)
{
hsop->max_damage -= sop->ram_damage;
if (hsop->max_damage <= 0)
{
TestKillSectorObject(hsop);
}
else
{
DoSpawnSpotsForDamage(hsop->match_event);
}
}
#endif
}
}