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

Hardcoding: fix cloud compiler errors (except one)

Browse source
This commit is contained in:
James R 2023-12-02 19:31:29 -08:00
parent d0f01a35ca
commit 5248c2748b
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_objects.h
View file

@ -360,7 +360,7 @@ 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, mobjtype_t cloudtype); 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);

7
src/objects/cloud.c
View file

@ -29,11 +29,12 @@ void Obj_CloudSpawn(mobj_t *mobj)
P_SetScale(mobj, mobj->destscale); P_SetScale(mobj, mobj->destscale);
} }
void Obj_CloudClusterThink(mobj_t *mobj, mobjtype_t cloudtype) void Obj_CloudClusterThink(mobj_t *mobj)
{ {
if (mobj->extravalue1) if (mobj->extravalue1)
return; 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;
@ -96,7 +97,7 @@ void Obj_TulipSpawnerThink(mobj_t *mobj)
b->eflags = mobj->eflags; b->eflags = mobj->eflags;
b->color = SKINCOLOR_MAGENTA; b->color = SKINCOLOR_MAGENTA;
if (b->state == S_AGZBULB_ANIM2) if (b->state == &states[S_AGZBULB_ANIM2])
{ {
if (leveltime & 1) if (leveltime & 1)
b->colorized = true; b->colorized = true;
@ -267,4 +268,4 @@ void Obj_BulbTouched(mobj_t *special, mobj_t *toucher)
// set bulb state: // set bulb state:
P_SetMobjState(special->tracer, S_AGZBULB_ANIM1); P_SetMobjState(special->tracer, S_AGZBULB_ANIM1);
} }

4
src/p_inter.c
View file

@ -962,11 +962,11 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
case MT_AHZ_CLOUD: case MT_AHZ_CLOUD:
case MT_AGZ_CLOUD: case MT_AGZ_CLOUD:
case MT_SSZ_CLOUD: case MT_SSZ_CLOUD:
Obj_CloudTouched(special, player); Obj_CloudTouched(special, toucher);
return; return;
case MT_AGZ_BULB: case MT_AGZ_BULB:
Obj_BulbTouched(special, player); Obj_BulbTouched(special, toucher);
return; return;
case MT_BALLSWITCH_BALL: case MT_BALLSWITCH_BALL:

2
src/p_mobj.c
View file

@ -10275,7 +10275,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
case MT_AHZ_CLOUDCLUSTER: case MT_AHZ_CLOUDCLUSTER:
case MT_AGZ_CLOUDCLUSTER: case MT_AGZ_CLOUDCLUSTER:
case MT_SSZ_CLOUDCLUSTER: case MT_SSZ_CLOUDCLUSTER:
Obj_CloudClusterThink(mobj, mobj->type); Obj_CloudClusterThink(mobj);
break; break;
case MT_AGZ_BULB: case MT_AGZ_BULB: