From 5248c2748b4e1b3110c7ba45cc8af014ba47b61f Mon Sep 17 00:00:00 2001 From: James R Date: Sat, 2 Dec 2023 19:31:29 -0800 Subject: [PATCH] Hardcoding: fix cloud compiler errors (except one) --- src/k_objects.h | 2 +- src/objects/cloud.c | 7 ++++--- src/p_inter.c | 4 ++-- src/p_mobj.c | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/k_objects.h b/src/k_objects.h index ad0d43f23..b7f699c07 100644 --- a/src/k_objects.h +++ b/src/k_objects.h @@ -360,7 +360,7 @@ void Obj_TrickBalloonTouchSpecial(mobj_t* special, mobj_t* toucher); /* AHZ/AGZ/SSZ Clouds */ 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_PlayerCloudThink(player_t *player); void Obj_PlayerBulbThink(player_t *player); diff --git a/src/objects/cloud.c b/src/objects/cloud.c index 0f05f29fd..a8795c976 100644 --- a/src/objects/cloud.c +++ b/src/objects/cloud.c @@ -29,11 +29,12 @@ void Obj_CloudSpawn(mobj_t *mobj) P_SetScale(mobj, mobj->destscale); } -void Obj_CloudClusterThink(mobj_t *mobj, mobjtype_t cloudtype) +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); angle_t ang = mobj->angle; UINT8 dist = 128; @@ -96,7 +97,7 @@ void Obj_TulipSpawnerThink(mobj_t *mobj) b->eflags = mobj->eflags; b->color = SKINCOLOR_MAGENTA; - if (b->state == S_AGZBULB_ANIM2) + if (b->state == &states[S_AGZBULB_ANIM2]) { if (leveltime & 1) b->colorized = true; @@ -267,4 +268,4 @@ void Obj_BulbTouched(mobj_t *special, mobj_t *toucher) // set bulb state: P_SetMobjState(special->tracer, S_AGZBULB_ANIM1); -} \ No newline at end of file +} diff --git a/src/p_inter.c b/src/p_inter.c index 48075e1bb..7b4237c9f 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -962,11 +962,11 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) case MT_AHZ_CLOUD: case MT_AGZ_CLOUD: case MT_SSZ_CLOUD: - Obj_CloudTouched(special, player); + Obj_CloudTouched(special, toucher); return; case MT_AGZ_BULB: - Obj_BulbTouched(special, player); + Obj_BulbTouched(special, toucher); return; case MT_BALLSWITCH_BALL: diff --git a/src/p_mobj.c b/src/p_mobj.c index f573335e1..3fe4f048f 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -10275,7 +10275,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj) case MT_AHZ_CLOUDCLUSTER: case MT_AGZ_CLOUDCLUSTER: case MT_SSZ_CLOUDCLUSTER: - Obj_CloudClusterThink(mobj, mobj->type); + Obj_CloudClusterThink(mobj); break; case MT_AGZ_BULB: