diff --git a/src/info.c b/src/info.c index 9e57f5690..0d6577ffc 100644 --- a/src/info.c +++ b/src/info.c @@ -965,10 +965,10 @@ char sprnames[NUMSPRITES + 1][5] = "PUYC", "PUYD", "PUYE", - + // Aerial Highlands "BCLD", - + // Avant Garden "AGTU", "AGTL", @@ -977,7 +977,7 @@ char sprnames[NUMSPRITES + 1][5] = "AGFL", "AGFF", "AGCL", - + // Sky Sanctuary "SSCL", @@ -5703,10 +5703,10 @@ state_t states[NUMSTATES] = {SPR_PUYA, 3, -1, {A_BlendEyePuyoHack}, 0, 0, S_NULL}, // S_BLENDEYE_PUYO_SHOCK, {SPR_PUYA, 4|FF_ANIMATE, 5, {A_BlendEyePuyoHack}, 2, 2, S_NULL}, // S_BLENDEYE_PUYO_DIE, {SPR_PUYA, 5, 2, {A_BlendEyePuyoHack}, 0, 0, S_BLENDEYE_PUYO_DIE}, // S_BLENDEYE_PUYO_DUST, - + // Aerial Highlands {SPR_BCLD, FF_ANIMATE, -1, {NULL}, 3, 6, S_AHZCLOUD}, // S_AHZCLOUD - + // Avant Garden {SPR_AGTL, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_AGZBULB_BASE}, // S_AGZBULB_BASE {SPR_AGTU, 0, -1, {NULL}, 0, 0, S_AGZBULB_NEUTRAL}, // S_AGZBULB_NEUTRAL @@ -5717,7 +5717,7 @@ state_t states[NUMSTATES] = {SPR_AGFL, 0, -1, {NULL}, 0, 0, S_AGFL}, // S_AGFL {SPR_AGFF, 0, -1, {NULL}, 0, 0, S_AGFF}, // S_AGFF {SPR_AGCL, FF_ANIMATE, -1, {NULL}, 3, 6, S_AGZCLOUD}, // S_AGZCLOUD - + // Sky Sanctuary {SPR_SSCL, FF_ANIMATE, -1, {NULL}, 3, 6, S_SSZCLOUD}, // S_SSZCLOUD @@ -31974,7 +31974,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = MF_SCENERY|MF_NOCLIPTHING|MF_NOCLIPHEIGHT|MF_NOGRAVITY, // flags S_NULL // raisestate }, - + { // MT_AHZ_CLOUD -1, // doomednum S_AHZCLOUD, // spawnstate @@ -32001,7 +32001,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = MF_NOGRAVITY|MF_SPECIAL, // flags S_NULL // raisestate }, - + { // MT_AHZ_CLOUDCLUSTER 3486, // doomednum S_INVISIBLE, // spawnstate @@ -32028,7 +32028,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = MF_NOGRAVITY, // flags S_NULL // raisestate }, - + { // MT_AGZ_BULB 3445, // doomednum S_INVISIBLE, // spawnstate @@ -32055,7 +32055,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = MF_SPECIAL, // flags S_NULL // raisestate }, - + { // MT_AGZ_BULB_PART -1, // doomednum S_INVISIBLE, // spawnstate @@ -32082,7 +32082,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = MF_NOGRAVITY, // flags S_NULL // raisestate }, - + { // MT_AGZ_TREE 3447, // doomednum S_AGTR, // spawnstate @@ -32109,7 +32109,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 0, // flags S_NULL // raisestate }, - + { // MT_AGZ_AGFL 3448, // doomednum S_AGFL, // spawnstate @@ -32136,7 +32136,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 0, // flags S_NULL // raisestate }, - + { // MT_AGZ_AGFF 3449, // doomednum S_AGFF, // spawnstate @@ -32163,7 +32163,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 0, // flags S_NULL // raisestate }, - + { // MT_AGZ_CLOUD -1, // doomednum S_AGZCLOUD, // spawnstate @@ -32190,7 +32190,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = MF_NOGRAVITY|MF_SPECIAL, // flags S_NULL // raisestate }, - + { // MT_AGZ_CLOUDCLUSTER 3446, // doomednum S_INVISIBLE, // spawnstate @@ -32217,7 +32217,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = MF_NOGRAVITY, // flags S_NULL // raisestate }, - + { // MT_SSZ_CLOUD -1, // doomednum S_SSZCLOUD, // spawnstate @@ -32244,7 +32244,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = MF_NOGRAVITY|MF_SPECIAL, // flags S_NULL // raisestate }, - + { // MT_SSZ_CLOUDCLUSTER 3456, // doomednum S_INVISIBLE, // spawnstate @@ -34120,8 +34120,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL, // xdeathstate sfx_None, // deathsound 0, // speed - 32*4*FRACUNIT,// radius - 64*4*FRACUNIT,// height + 32*FRACUNIT,// radius + 64*FRACUNIT,// height 0, // dispoffset 0, // mass 0, // damage diff --git a/src/objects/sealed-star.c b/src/objects/sealed-star.c index bf7b9c342..971e51bc3 100644 --- a/src/objects/sealed-star.c +++ b/src/objects/sealed-star.c @@ -613,8 +613,7 @@ void Obj_SSChainMobjThink(mobj_t* mo) void Obj_SSGachaTargetMobjSpawn(mobj_t* mo) { - mo->scale *= 4; - mo->destscale = mo->scale; + P_InstaScale(mo, 4*mo->scale); } void Obj_SSCabotronMobjSpawn(mobj_t* mo)