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

Merge branch 'sealed-star-lamp-fixes' into 'master'

Browse source 
Remove fullbright from Sealed Star Lamps and re-add missing bulb segment

See merge request KartKrew/Kart!2086
This commit is contained in:
AJ Martinez 2024-03-12 00:07:43 +00:00
commit 33fe1a140d
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/info.c
View file

@ -3521,7 +3521,7 @@ state_t states[NUMSTATES] =
{SPR_SSLA, 0|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_SS_LAMP {SPR_SSLA, 0|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_SS_LAMP
// MT_SS_LAMP_BULB // MT_SS_LAMP_BULB
{SPR_SSLA, 1|FF_PAPERSPRITE|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_SS_LAMP_BULB {SPR_SSLA, 1|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_SS_LAMP_BULB
{SPR_SSLA, 3|FF_ANIMATE|FF_FULLBRIGHT|FF_ADD, -1, {NULL}, 1, 1, S_NULL}, // S_SS_LAMP_AURA {SPR_SSLA, 3|FF_ANIMATE|FF_FULLBRIGHT|FF_ADD, -1, {NULL}, 1, 1, S_NULL}, // S_SS_LAMP_AURA
// MT_SSWINDOW // MT_SSWINDOW

4
src/objects/sealed-star.c
View file

@ -466,7 +466,7 @@ void Obj_SSLampMapThingSpawn(mobj_t* mo, mapthing_t* mt)
// we need this because linkdrawing to a papersprite results in all linked mobjs becoming invisible when the papersprite is viewed parallel to its angle // we need this because linkdrawing to a papersprite results in all linked mobjs becoming invisible when the papersprite is viewed parallel to its angle
core = P_SpawnMobjFromMobj(mo, bulbX, bulbY, BULB_VERTICAL_OFFSET, MT_SS_LAMP_BULB); core = P_SpawnMobjFromMobj(mo, bulbX, bulbY, BULB_VERTICAL_OFFSET, MT_SS_LAMP_BULB);
P_SetTarget(&core->tracer, mo); P_SetTarget(&core->tracer, mo);
P_SetMobjState(core, S_SHADOW); core->frame = 5; // no flags needed, just a plain invisible sprite
// parallel bulb // parallel bulb
part = P_SpawnMobjFromMobj(core, 0, 0, 0, MT_SS_LAMP_BULB); part = P_SpawnMobjFromMobj(core, 0, 0, 0, MT_SS_LAMP_BULB);
@ -479,7 +479,7 @@ void Obj_SSLampMapThingSpawn(mobj_t* mo, mapthing_t* mt)
bulbX = FixedMul(core->info->radius, FCOS(angle)); bulbX = FixedMul(core->info->radius, FCOS(angle));
bulbY = FixedMul(core->info->radius, FSIN(angle)); bulbY = FixedMul(core->info->radius, FSIN(angle));
part = core; part = core;
for (i = 0; i < 1; i++) for (i = 0; i < 2; i++)
{ {
P_SetTarget(&part->hnext, P_SpawnMobjFromMobj(core, bulbX, bulbY, 0, MT_SS_LAMP_BULB)); P_SetTarget(&part->hnext, P_SpawnMobjFromMobj(core, bulbX, bulbY, 0, MT_SS_LAMP_BULB));
P_SetTarget(&part->hnext->hprev, part); P_SetTarget(&part->hnext->hprev, part);