stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 01:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'emblem-fix' into 'next'

Browse source 
Move emblem float option to args[1], since args[0] is already occupied for NiGHTS emblems

Closes #963

See merge request STJr/SRB2!1935
This commit is contained in:
sphere 2023-02-28 13:59:32 +00:00
commit 684566ebc4
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extras/conf/udb/Includes/SRB222_things.cfg
View file

@ -4546,7 +4546,7 @@ udmf
sprite = "EMBMA0"; sprite = "EMBMA0";
width = 16; width = 16;
height = 30; height = 30;
arg0 arg1
{ {
title = "Float?"; title = "Float?";
type = 11; type = 11;

5
src/p_mobj.c
View file

@ -11849,7 +11849,6 @@ fixed_t P_GetMapThingSpawnHeight(const mobjtype_t mobjtype, const mapthing_t* mt
case MT_EMERHUNT: case MT_EMERHUNT:
case MT_EMERALDSPAWN: case MT_EMERALDSPAWN:
case MT_TOKEN: case MT_TOKEN:
case MT_EMBLEM:
case MT_RING: case MT_RING:
case MT_REDTEAMRING: case MT_REDTEAMRING:
case MT_BLUETEAMRING: case MT_BLUETEAMRING:
@ -11861,6 +11860,10 @@ fixed_t P_GetMapThingSpawnHeight(const mobjtype_t mobjtype, const mapthing_t* mt
offset += mthing->args[0] ? 0 : 24*FRACUNIT; offset += mthing->args[0] ? 0 : 24*FRACUNIT;
break; break;
case MT_EMBLEM:
offset += mthing->args[1] ? 0 : 24 * FRACUNIT;
break;
// Remaining objects. // Remaining objects.
default: default:
if (P_WeaponOrPanel(mobjtype)) if (P_WeaponOrPanel(mobjtype))

4
src/p_setup.c
View file

@ -6308,7 +6308,6 @@ static void P_ConvertBinaryThingTypes(void)
case 312: //Emerald token case 312: //Emerald token
case 320: //Emerald hunt location case 320: //Emerald hunt location
case 321: //Match chaos emerald spawn case 321: //Match chaos emerald spawn
case 322: //Emblem
case 330: //Bounce ring panel case 330: //Bounce ring panel
case 331: //Rail ring panel case 331: //Rail ring panel
case 332: //Automatic ring panel case 332: //Automatic ring panel
@ -6321,6 +6320,9 @@ static void P_ConvertBinaryThingTypes(void)
case 1800: //Coin case 1800: //Coin
mapthings[i].args[0] = !(mapthings[i].options & MTF_AMBUSH); mapthings[i].args[0] = !(mapthings[i].options & MTF_AMBUSH);
break; break;
case 322: //Emblem
mapthings[i].args[1] = !(mapthings[i].options & MTF_AMBUSH);
break;
case 409: //Extra life monitor case 409: //Extra life monitor
mapthings[i].args[2] = !(mapthings[i].options & (MTF_AMBUSH|MTF_OBJECTSPECIAL)); mapthings[i].args[2] = !(mapthings[i].options & (MTF_AMBUSH|MTF_OBJECTSPECIAL));
break; break;