zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-22 17:01:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- turned adjustfall into a 'gravityfactor' property.

Browse source
This commit is contained in:
Christoph Oelckers 2022-12-30 16:54:04 +01:00
parent 687cfd610f
commit 14bf74c0f9
6 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/core/namedef_custom.h
View file

@ -31,3 +31,4 @@ xx(floating_floordist)
xx(floating_ceilingdist)
xx(landmovefactor)
xx(watermovefactor)
xx(gravityfactor)

14
source/games/duke/src/actors.cpp
View file

@ -49,9 +49,6 @@ This file is a combination of code from the following sources:
BEGIN_DUKE_NS
double adjustfall(DDukeActor* actor, double c);
//---------------------------------------------------------------------------
//
// this is the implementation of DDukeActor::Tick. It is native so that
@ -3770,14 +3767,9 @@ void makeitfall(DDukeActor* actor)
grav = 0;
else
{
if( ceilingspace(actor->sector()) || actor->sector()->lotag == ST_2_UNDERWATER)
grav = gs.gravity/6;
else grav = gs.gravity;
}
if (isRRRA())
{
grav = adjustfall(actor, grav); // this accesses sprite indices and cannot be in shared code. Should be done better. (todo: turn into actor flags)
if (ceilingspace(actor->sector()) || actor->sector()->lotag == ST_2_UNDERWATER)
grav = gs.gravity / 6;
else grav = gs.gravity * actor->FloatVar(NAME_gravityfactor);
}
if ((actor->spr.statnum == STAT_ACTOR || actor->spr.statnum == STAT_PLAYER || actor->spr.statnum == STAT_ZOMBIEACTOR || actor->spr.statnum == STAT_STANDABLE))

4
source/games/duke/src/actors_r.cpp
View file

@ -546,7 +546,7 @@ void handle_se06_r(DDukeActor *actor)
}
if (!hulkspawn)
{
ns = CreateActor(actor->sector(), DVector3(actor->spr.pos.XY(), actor->sector()->ceilingz + 466.5), RTILE_UFOLIGHT, -8, DVector2(0.25, 0.25), nullAngle, 0., 0., actor, 5);
ns = CreateActor(actor->sector(), DVector3(actor->spr.pos.XY(), actor->sector()->ceilingz + 466.5), RedneckUfoLightClass, -8, DVector2(0.25, 0.25), nullAngle, 0., 0., actor, 5);
if (ns)
{
ns->spr.cstat = CSTAT_SPRITE_TRANS_FLIP | CSTAT_SPRITE_TRANSLUCENT;
@ -572,7 +572,7 @@ void handle_se06_r(DDukeActor *actor)
DukeSectIterator it(actor->sector());
while (auto a2 = it.Next())
{
if (a2->spr.picnum == RTILE_UFOBEAM && ufospawn && ++ufocnt == 64)
if (a2->GetClass() == RedneckUfoBeamClass && ufospawn && ++ufocnt == 64)
{
ufocnt = 0;
ufospawn--;

2
source/games/duke/src/classnames.h
View file

@ -81,6 +81,8 @@ xx(RedneckUfo2)
xx(RedneckUfo3)
xx(RedneckUfo4)
xx(RedneckUfoRRRA)
xx(RedneckUfoBeam)
xx(RedneckUfoLight)
xx(DukeShotgunShot)
xx(DukeChaingunShot)
xx(DukeGrowSpark)

3
wadsrc/static/zscript/games/duke/actors/redneckenemies.zs
View file

@ -8,6 +8,7 @@ class RedneckBikerBV2 : DukeActor
+KILLCOUNT;
+LOOKALLAROUND;
watermovefactor 0.5;
gravityfactor 0.125;
}
override void Initialize()
{
@ -25,6 +26,7 @@ class RedneckBikerB : DukeActor
+KILLCOUNT;
+LOOKALLAROUND;
watermovefactor 0.5;
gravityfactor 0.25;
}
override void Initialize()
{
@ -74,6 +76,7 @@ class RedneckCheerleaderB : DukeActor
+KILLCOUNT;
+LOOKALLAROUND;
watermovefactor 0.5;
gravityfactor 0.25;
}
override void Initialize()
{

3
wadsrc/static/zscript/games/duke/dukeactor.zs
View file

@ -124,6 +124,7 @@ class DukeActor : CoreActor native
floating_ceilingdist 66;
landmovefactor 1;
watermovefactor 1;
gravityfactor 1;
}
enum EStatnums
{
@ -258,6 +259,7 @@ class DukeActor : CoreActor native
meta double floating_ceilingdist;
meta double landmovefactor;
meta double watermovefactor;
meta double gravityfactor;
property prefix: none;
property gutsoffset: gutsoffset;
@ -277,6 +279,7 @@ class DukeActor : CoreActor native
property floating_ceilingdist: floating_ceilingdist;
property landmovefactor: landmovefactor;
property watermovefactor: watermovefactor;
property gravityfactor: gravityfactor;
native void SetSpritesetImage(int index);