thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-inconsistent-cloud-scale' into 'master'

Browse source 
Fix inconsistent cloud scale

Closes #898

See merge request KartKrew/Kart!1818
This commit is contained in:
Oni 2024-01-14 23:02:47 +00:00
commit eebe8f5389
1 changed files with 9 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/objects/cloud.c
View file

@ -42,21 +42,15 @@ void Obj_CloudSpawn(mobj_t *mobj)
return; return;
} }
if (mobj->type != MT_AGZ_CLOUDCLUSTER)
{
mobj->destscale = mapobjectscale * 4; mobj->destscale = mapobjectscale * 4;
P_SetScale(mobj, mobj->destscale); P_SetScale(mobj, mobj->destscale);
}
mobj_t *cloud = P_SpawnMobj(mobj->x, mobj->y, mobj->z, cloudtype); mobj_t *cloud = P_SpawnMobj(mobj->x, mobj->y, mobj->z, cloudtype);
angle_t ang = mobj->angle; angle_t ang = mobj->angle;
UINT8 dist = 128; UINT8 dist = 128;
if (cloudtype == MT_AGZ_CLOUD)
{
cloud->destscale = cloud->scale * 2; cloud->destscale = cloud->scale * 2;
P_SetScale(cloud, cloud->destscale); P_SetScale(cloud, cloud->destscale);
}
for (UINT8 i = 0; i < 4; i++) for (UINT8 i = 0; i < 4; i++)
{ {
@ -65,10 +59,11 @@ void Obj_CloudSpawn(mobj_t *mobj)
cloud = P_SpawnMobj(x, y, mobj->z, cloudtype); cloud = P_SpawnMobj(x, y, mobj->z, cloudtype);
if (cloudtype == MT_AGZ_CLOUD)
{
cloud->destscale = cloud->scale * 2; cloud->destscale = cloud->scale * 2;
P_SetScale(cloud, cloud->destscale); P_SetScale(cloud, cloud->destscale);
if (cloudtype == MT_AGZ_CLOUD)
{
cloud->frame = P_RandomRange(PR_DECORATION, 0, 3); cloud->frame = P_RandomRange(PR_DECORATION, 0, 3);
} }
@ -157,20 +152,8 @@ void Obj_PlayerCloudThink(player_t *player)
if (P_MobjWasRemoved(mo->tracer)) if (P_MobjWasRemoved(mo->tracer))
return; return;
switch(mo->tracer->type) mo->momz = FixedMul(mapobjectscale,
{ (mo->tracer->type == MT_AHZ_CLOUD ? CLOUDB_ZTHRUST : CLOUD_ZTHRUST) * P_MobjFlip(mo->tracer));
case MT_AHZ_CLOUD:
P_SetObjectMomZ(mo, CLOUDB_ZTHRUST, false);
break;
case MT_AGZ_CLOUD:
mo->momz = FixedMul(mapobjectscale, CLOUD_ZTHRUST * P_MobjFlip(mo->tracer));
break;
case MT_SSZ_CLOUD:
P_SetObjectMomZ(mo, CLOUD_ZTHRUST, false);
break;
default:
break;
}
player->cloudlaunch = TICRATE; player->cloudlaunch = TICRATE;
P_InstaThrust(mo, mo->cusval, mo->cvmem); P_InstaThrust(mo, mo->cusval, mo->cvmem);