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 missing MF_SPECIAL, check for MT_AGZ_CLOUDCLUSTER before scaling

Browse source
This commit is contained in:
wolfy852 2023-12-24 06:40:18 -06:00 • committed by James R
parent ea8c44d6fa
commit 55761769cf
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/info.c
View file

@ -31964,7 +31964,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // mass 0, // mass
0, // damage 0, // damage
sfx_None, // activesound sfx_None, // activesound
MF_NOGRAVITY, // flags MF_SPECIAL, // flags
S_NULL // raisestate S_NULL // raisestate
}, },

17
src/objects/cloud.c
View file

@ -42,8 +42,11 @@ void Obj_CloudSpawn(mobj_t *mobj)
return; return;
} }
mobj->destscale = mapobjectscale * 4; if (mobj->type != MT_AGZ_CLOUDCLUSTER)
P_SetScale(mobj, mobj->destscale); {
mobj->destscale = mapobjectscale * 4;
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;
@ -173,9 +176,6 @@ void Obj_PlayerBulbThink(player_t *player)
{ {
mobj_t *mo = player->mo; mobj_t *mo = player->mo;
if (player->tulipbuf)
player->tulipbuf--;
if (player->tuliplaunch) if (player->tuliplaunch)
{ {
player->tuliplaunch--; player->tuliplaunch--;
@ -184,9 +184,12 @@ void Obj_PlayerBulbThink(player_t *player)
P_SpawnMobj(mo->x + P_RandomRange(PR_DECORATION, -8, 8)*mapobjectscale, mo->y + P_RandomRange(PR_DECORATION, -8, 8)*mapobjectscale, mo->z, MT_DRIFTDUST); P_SpawnMobj(mo->x + P_RandomRange(PR_DECORATION, -8, 8)*mapobjectscale, mo->y + P_RandomRange(PR_DECORATION, -8, 8)*mapobjectscale, mo->z, MT_DRIFTDUST);
} }
if (player->tulipbuf)
player->tulipbuf--;
if (player->tulip) if (player->tulip)
{ {
player->tulip -= 1; player->tulip--;
P_MoveOrigin(mo, mo->tracer->x, mo->tracer->y, mo->tracer->z); P_MoveOrigin(mo, mo->tracer->x, mo->tracer->y, mo->tracer->z);
mo->flags &= ~MF_SHOOTABLE; mo->flags &= ~MF_SHOOTABLE;
mo->renderflags |= RF_DONTDRAW; mo->renderflags |= RF_DONTDRAW;
@ -247,7 +250,7 @@ void Obj_CloudTouched(mobj_t *special, mobj_t *toucher)
toucher->cvmem = mapobjectscale*8; toucher->cvmem = mapobjectscale*8;
P_SetTarget(&toucher->tracer, special); P_SetTarget(&toucher->tracer, special);
S_StartSound(&toucher, sfx_s3k8a); S_StartSound(toucher, sfx_s3k8a);
} }