teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-19 23:51:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Blood: Some small wrapper replacements.

Browse source
This commit is contained in:
Mitchell Richters 2022-09-19 12:45:34 +10:00 committed by Christoph Oelckers
parent 448c52be74
commit 7747205e03
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/games/blood/src/actor.cpp
View file

@ -3859,7 +3859,7 @@ static void actImpactMissile(DBloodActor* missileActor, int hitCode)
if (pWallHit) if (pWallHit)
{ {
auto pFX = gFX.fxSpawnActor(FX_52, missileActor->sector(), missileActor->spr.pos, 0); auto pFX = gFX.fxSpawnActor(FX_52, missileActor->sector(), missileActor->spr.pos, 0);
if (pFX) pFX->set_int_ang((GetWallAngle(pWallHit) + 512) & 2047); if (pFX) pFX->spr.angle = (pWallHit->delta().Angle() + DAngle90).Normalized360();
} }
break; break;
} }
@ -4257,7 +4257,7 @@ static void checkHit(DBloodActor* actor)
{ {
actKickObject(actor, actor2); actKickObject(actor, actor2);
sfxPlay3DSound(actor, 357, -1, 1); sfxPlay3DSound(actor, 357, -1, 1);
int dmg = (mass1 - mass2) + abs(FixedToInt(actor->int_vel().X)); int dmg = (mass1 - mass2) + abs(int(actor->vel.X));
if (dmg > 0) actDamageSprite(actor, actor2, (Chance(0x2000)) ? kDamageFall : kDamageBullet, dmg); if (dmg > 0) actDamageSprite(actor, actor2, (Chance(0x2000)) ? kDamageFall : kDamageBullet, dmg);
} }
} }