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

- completed floatification of ceiling_dist and floor_dist.

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-20 23:39:21 +02:00
parent 5416100ba2
commit 4021d13e8d
8 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/sw/src/coolg.cpp
View file

@ -758,7 +758,7 @@ int DoCoolgDeath(DSWActor* actor)
else
{
DoFindGroundPoint(actor);
actor->user._floor_dist = 0;
actor->user.floor_dist = 0;
DoBeginFall(actor);
}

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

@ -410,8 +410,8 @@ void EnemyDefaults(DSWActor* actor, ACTOR_ACTION_SET* action, PERSONALITY* perso
actor->user.zclip = Z(48);
actor->user.lo_step = Z(32);
actor->user._floor_dist = actor->user.zclip - actor->user.lo_step;
actor->user._ceiling_dist = ActorSizeZ(actor) - actor->user.zclip;
actor->user.floor_dist = (actor->user.zclip - actor->user.lo_step) * zinttoworld;
actor->user.ceiling_dist = (ActorSizeZ(actor) - actor->user.zclip) * zinttoworld;
actor->user.Radius = 400;

2
source/games/sw/src/eel.cpp
View file

@ -519,7 +519,7 @@ int DoEelDeath(DSWActor* actor)
else
{
DoFindGroundPoint(actor);
actor->user._floor_dist = 0;
actor->user.floor_dist = 0;
DoBeginFall(actor);
}

2
source/games/sw/src/hornet.cpp
View file

@ -497,7 +497,7 @@ int DoHornetDeath(DSWActor* actor)
{
actor->spr.cstat &= ~(CSTAT_SPRITE_YCENTER);
actor->user.jump_speed = 0;
actor->user._floor_dist = 0;
actor->user.floor_dist = 0;
DoBeginFall(actor);
DoFindGroundPoint(actor);
actor->user.zclip = actor->user.int_loz();

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

@ -787,8 +787,8 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, USER& w, USER* def
("PainThreshold", w.PainThreshold, def->PainThreshold)
("jump_speed", w.jump_speed, def->jump_speed)
("jump_grav", w.jump_grav, def->jump_grav)
("ceiling_dist", w._ceiling_dist, def->_ceiling_dist)
("floor_dist", w._floor_dist, def->_floor_dist)
("ceiling_dist", w.ceiling_dist, def->ceiling_dist)
("floor_dist", w.floor_dist, def->floor_dist)
("lo_step", w.lo_step, def->lo_step)
("hiz", w.hiz, def->hiz)
("loz", w.loz, def->loz)

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

@ -737,8 +737,8 @@ int SetupSerp(DSWActor* actor)
// size of step can walk off of
actor->user.lo_step = Z(40);
actor->user._floor_dist = actor->user.zclip - actor->user.lo_step;
actor->user._ceiling_dist = ActorSizeZ(actor) - actor->user.zclip;
actor->user.floor_dist = (actor->user.zclip - actor->user.lo_step) * zinttoworld;
actor->user.ceiling_dist = (ActorSizeZ(actor) - actor->user.zclip) * zinttoworld;
return 0;
}

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

@ -1515,8 +1515,8 @@ void SpriteSetupPost(void)
SpawnUser(jActor, 0, nullptr);
change_actor_stat(jActor, STAT_NO_STATE);
jActor->user.ceiling_dist = (4);
jActor->user._floor_dist = -Z(2);
jActor->user.ceiling_dist = 4;
jActor->user.floor_dist = -2;
jActor->user.ActorActionFunc = DoActorDebris;

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

@ -3765,8 +3765,8 @@ AutoShrap:
actor->spr.xvel = p->min_vel*2;
actor->spr.xvel += RandomRange(p->max_vel - p->min_vel);
actor->user._floor_dist = shrap_floor_dist;
actor->user._ceiling_dist = shrap_ceiling_dist;
actor->user.floor_dist = shrap_floor_dist * zinttoworld;
actor->user.ceiling_dist = shrap_ceiling_dist * zinttoworld;
actor->user.jump_speed = p->min_jspeed;
actor->user.jump_speed += RandomRange(p->max_jspeed - p->min_jspeed);
actor->user.jump_speed = -actor->user.jump_speed;
@ -4137,7 +4137,7 @@ int SpawnBlood(DSWActor* actor, DSWActor* weapActor, short hit_ang, int hit_x, i
// so add it in
actorNew->spr.xvel += actor->spr.xvel;
actorNew->user._ceiling_dist = actorNew->user.floor_dist = (2);
actorNew->user.ceiling_dist = actorNew->user.floor_dist = 2;
actorNew->user.jump_speed = p->min_jspeed;
actorNew->user.jump_speed += RandomRange(p->max_jspeed - p->min_jspeed);
actorNew->user.jump_speed = -actorNew->user.jump_speed;
@ -9396,8 +9396,8 @@ int SpawnExtraMicroMini(DSWActor* actor)
NewStateGroup(actorNew, &sg_MicroMini[0]);
actorNew->user.WeaponNum = actor->user.WeaponNum;
actorNew->user.Radius = actor->user.Radius;
actorNew->user._ceiling_dist = actor->user.int_ceiling_dist();
actorNew->user._floor_dist = actor->user.int_floor_dist();
actorNew->user.ceiling_dist = actor->user.ceiling_dist;
actorNew->user.floor_dist = actor->user.floor_dist;
actorNew->spr.cstat = actor->spr.cstat;
actorNew->set_int_ang(NORM_ANGLE(actorNew->int_ang() + RandomRange(64) - 32));
@ -9800,7 +9800,7 @@ void SpawnFireballFlames(DSWActor* actor, DSWActor* enemyActor)
return;
}
actorNew->user._floor_dist = actorNew->user._ceiling_dist = 0;
actorNew->user.floor_dist = actorNew->user.ceiling_dist = 0;
DoFindGround(actorNew);
actorNew->user.jump_speed = 0;
@ -9829,7 +9829,7 @@ int SpawnBreakFlames(DSWActor* actor)
actorNew->user.Radius = 200;
actorNew->user._floor_dist = actorNew->user._ceiling_dist = 0;
actorNew->user.floor_dist = actorNew->user.ceiling_dist = 0;
DoFindGround(actorNew);
actorNew->user.jump_speed = 0;
@ -9861,7 +9861,7 @@ void SpawnBreakStaticFlames(DSWActor* actor)
actorNew->spr.cstat &= ~(CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN);
actorNew->user.Radius = 200;
actorNew->user._floor_dist = actorNew->user._ceiling_dist = 0;
actorNew->user.floor_dist = actorNew->user.ceiling_dist = 0;
actorNew->set_int_z(getflorzofslopeptr(actorNew->sector(), actorNew->int_pos().X, actorNew->int_pos().Y));
PlaySound(DIGI_FIRE1,actorNew,v3df_dontpan|v3df_doppler);
@ -11465,8 +11465,8 @@ void InitVulcanBoulder(DSWActor* actor)
actorNew->user.Radius = 200;
actorNew->spr.cstat |= (CSTAT_SPRITE_YCENTER);
actorNew->spr.clipdist = 256>>2;
actorNew->user._ceiling_dist = zsize/2;
actorNew->user._floor_dist = zsize/2;
actorNew->user.ceiling_dist = zsize/2 * inttoworld;
actorNew->user.floor_dist = zsize/2 * inttoworld;
if (RANDOM_P2(1024) > 512)
actorNew->spr.cstat |= (CSTAT_SPRITE_XFLIP);
if (RANDOM_P2(1024) > 512)
@ -12658,8 +12658,8 @@ int InitStar(PLAYER* pp)
actorNew2->spr.clipdist = actorNew->spr.clipdist;
actorNew2->user.WeaponNum = actorNew->user.WeaponNum;
actorNew2->user.Radius = actorNew->user.Radius;
actorNew2->user._ceiling_dist = actorNew->user.int_ceiling_dist();
actorNew2->user._floor_dist = actorNew->user.int_floor_dist();
actorNew2->user.ceiling_dist = actorNew->user.ceiling_dist;
actorNew2->user.floor_dist = actorNew->user.floor_dist;
actorNew2->user.Flags2 = actorNew->user.Flags2 & ~(SPR2_FLAMEDIE); // mask out any new flags here for safety.
if (pp->Flags & (PF_DIVING) || SpriteInUnderwaterArea(actorNew2))