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

Merge branch 'emerald-disambig' into 'master'

Browse source 
Make default Emerald pickup in extra Sealed Star a fake SA2 yellow-gold Chaos Emerald

See merge request KartKrew/Kart!2268
This commit is contained in:
Oni 2024-04-12 03:40:49 +00:00
commit 3154d8ccf9
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/k_podium.cpp
View file

@ -640,12 +640,15 @@ void podiumData_s::Draw(void)
if (emeraldNum == 0) if (emeraldNum == 0)
{ {
emeraldPatch = static_cast<patch_t*>( W_CachePatchName("K_BLNA", PU_CACHE) ); // Prize -- todo, currently using fake Emerald
emeraldColor = SKINCOLOR_GOLD;
} }
else else
{ {
emeraldColor = static_cast<skincolornum_t>( SKINCOLOR_CHAOSEMERALD1 + ((emeraldNum - 1) % 7) ); emeraldColor = static_cast<skincolornum_t>( SKINCOLOR_CHAOSEMERALD1 + ((emeraldNum - 1) % 7) );
}
{
std::string emeraldName; std::string emeraldName;
if (emeraldNum > 7) if (emeraldNum > 7)
{ {
@ -853,12 +856,15 @@ void podiumData_s::Draw(void)
if (emeraldNum == 0) if (emeraldNum == 0)
{ {
emeraldOverlay = static_cast<patch_t*>( W_CachePatchName("KBLNC0", PU_CACHE) ); // Prize -- todo, currently using fake Emerald
emeraldColor = SKINCOLOR_GOLD;
} }
else else
{ {
emeraldColor = static_cast<skincolornum_t>( SKINCOLOR_CHAOSEMERALD1 + ((emeraldNum - 1) % 7) ); emeraldColor = static_cast<skincolornum_t>( SKINCOLOR_CHAOSEMERALD1 + ((emeraldNum - 1) % 7) );
}
{
if (emeraldNum > 7) if (emeraldNum > 7)
{ {
emeraldOverlay = static_cast<patch_t*>( W_CachePatchName("SEMRA0", PU_CACHE) ); emeraldOverlay = static_cast<patch_t*>( W_CachePatchName("SEMRA0", PU_CACHE) );

3
src/objects/ufo.c
View file

@ -1244,9 +1244,10 @@ static mobj_t *InitSpecialUFO(waypoint_t *start)
} }
else else
{ {
// Prize -- todo, currently using standard Emerald // Prize -- todo, currently using fake Emerald
P_SetMobjState(emerald, S_CHAOSEMERALD1); P_SetMobjState(emerald, S_CHAOSEMERALD1);
P_SetMobjState(overlay, S_CHAOSEMERALD_UNDER); P_SetMobjState(overlay, S_CHAOSEMERALD_UNDER);
emerald->color = SKINCOLOR_GOLD;
} }
P_SetTarget(&emerald->target, ufo); P_SetTarget(&emerald->target, ufo);