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

- floatified RR's shootmortar

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-13 23:54:04 +02:00
parent d0a890dd15
commit 66b00cfb52
1 changed files with 29 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
source/games/duke/src/player_r.cpp
View file

@ -826,6 +826,34 @@ static void shootwhip(DDukeActor* actor, int p, DVector3 pos, DAngle ang, int at
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
static void shootmortar(DDukeActor* actor, int p, const DVector3& pos, DAngle ang, int atwith)
{
auto sect = actor->sector();
if (actor->spr.extra >= 0) actor->spr.shade = -96;
double x;
auto plActor = ps[findplayer(actor, &x)].GetActor();
x = (plActor->spr.pos.XY() - actor->spr.pos.XY()).Length();
double zvel = -x * 0.5;
if (zvel < -8)
zvel = -4;
double vel = x / 16.;
ang += DAngle90;
int size = atwith == CHEERBOMB ? 16 : 32;
CreateActor(sect, pos.plusZ(-6) + ang.ToVector() * 4, atwith, -64, size, size, ang.Buildang(), vel * worldtoint, zvel * zworldtoint, actor, 1);
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void shoot_r(DDukeActor* actor, int atwith) void shoot_r(DDukeActor* actor, int atwith)
{ {
int sa, p; int sa, p;
@ -944,26 +972,9 @@ void shoot_r(DDukeActor* actor, int atwith)
case CHEERBOMB: case CHEERBOMB:
if (!isRRRA()) break; if (!isRRRA()) break;
case MORTER: case MORTER:
{ shootmortar(actor, p, spos, sang, atwith);
if (actor->spr.extra >= 0) actor->spr.shade = -96;
auto j = ps[findplayer(actor, &x)].GetActor();
x = ldist(j, actor);
zvel = -x >> 1;
if (zvel < -4096)
zvel = -2048;
vel = x >> 4;
sang += DAngle90;
if (atwith == CHEERBOMB)
CreateActor(sect, spos + DVector3(-sang.Sin() * 4, sang.Cos() * 4, 6), atwith, -64, 16, 16, sa, vel, zvel, actor, 1);
else
CreateActor(sect, spos + DVector3(-sang.Sin() * 4, sang.Cos() * 4, 6), atwith, -64, 32, 32, sa, vel, zvel, actor, 1);
break; break;
} }
}
return; return;
} }