thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hardcoding: fix spawned cloud type

Browse source
This commit is contained in:
James R 2023-12-03 14:35:52 -08:00
parent 5248c2748b
commit 6428f1afb3
3 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/k_objects.h
View file

@ -360,7 +360,6 @@ void Obj_TrickBalloonTouchSpecial(mobj_t* special, mobj_t* toucher);
/* AHZ/AGZ/SSZ Clouds */ /* AHZ/AGZ/SSZ Clouds */
void Obj_CloudSpawn(mobj_t *mobj); void Obj_CloudSpawn(mobj_t *mobj);
void Obj_CloudClusterThink(mobj_t *mobj);
void Obj_TulipSpawnerThink(mobj_t *mobj); void Obj_TulipSpawnerThink(mobj_t *mobj);
void Obj_PlayerCloudThink(player_t *player); void Obj_PlayerCloudThink(player_t *player);
void Obj_PlayerBulbThink(player_t *player); void Obj_PlayerBulbThink(player_t *player);

26
src/objects/cloud.c
View file

@ -25,16 +25,26 @@
void Obj_CloudSpawn(mobj_t *mobj) void Obj_CloudSpawn(mobj_t *mobj)
{ {
mobjtype_t cloudtype;
switch (mobj->type)
{
case MT_AHZ_CLOUDCLUSTER:
cloudtype = MT_AHZ_CLOUD;
break;
case MT_AGZ_CLOUDCLUSTER:
cloudtype = MT_AGZ_CLOUD;
break;
case MT_SSZ_CLOUDCLUSTER:
cloudtype = MT_SSZ_CLOUD;
break;
default:
return;
}
mobj->destscale = mapobjectscale * 4; mobj->destscale = mapobjectscale * 4;
P_SetScale(mobj, mobj->destscale); P_SetScale(mobj, mobj->destscale);
}
void Obj_CloudClusterThink(mobj_t *mobj)
{
if (mobj->extravalue1)
return;
mobjtype_t cloudtype = mobj->type;
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;
@ -57,8 +67,6 @@ void Obj_CloudClusterThink(mobj_t *mobj)
ang += ANGLE_90; ang += ANGLE_90;
} }
mobj->extravalue1 = 1;
} }
void Obj_TulipSpawnerThink(mobj_t *mobj) void Obj_TulipSpawnerThink(mobj_t *mobj)

7
src/p_mobj.c
View file

@ -10272,12 +10272,6 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
Obj_GPZSeasawThink(mobj); Obj_GPZSeasawThink(mobj);
break; break;
case MT_AHZ_CLOUDCLUSTER:
case MT_AGZ_CLOUDCLUSTER:
case MT_SSZ_CLOUDCLUSTER:
Obj_CloudClusterThink(mobj);
break;
case MT_AGZ_BULB: case MT_AGZ_BULB:
Obj_TulipSpawnerThink(mobj); Obj_TulipSpawnerThink(mobj);
break; break;
@ -11814,6 +11808,7 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
Obj_WPZTurbineSpawn(mobj); Obj_WPZTurbineSpawn(mobj);
break; break;
case MT_AHZ_CLOUDCLUSTER: case MT_AHZ_CLOUDCLUSTER:
case MT_AGZ_CLOUDCLUSTER:
case MT_SSZ_CLOUDCLUSTER: case MT_SSZ_CLOUDCLUSTER:
Obj_CloudSpawn(mobj); Obj_CloudSpawn(mobj);
break; break;