incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Readd oil slik, uncomment things from UZB config

Browse source
This commit is contained in:
NepDisk 2024-07-31 18:17:11 -04:00
parent 9742e1775a
commit d7dbe97eb8
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extras/conf/D3R-Config.cfg
View file

@ -472,7 +472,7 @@ sectortypes
768 = "Spring Panel (Speed Capped)";
1024 = "Conveyor Belt";
1280 = "Speed Pad";
//1536 = "Speed Pad (Spin)";
1536 = "Speed Pad (Spin)";
1792 = "Bustable Block Sprite Parameter (ROIA)";
2048 = "Bustable Block Sprite Parameter (ROIB)";
2304 = "Bustable Block Sprite Parameter (ROIC)";
@ -491,7 +491,7 @@ sectortypes
//28672 = "Force Spin";
32768 = "Zoom Tube Start";
36864 = "Zoom Tube End";
40960 = "Circuit Finish Line (Unused)";
40960 = "Circuit Finish Line (Legacy)";
//45056 = "Rope Hang";
//49152 = "Intangible to the Camera";
}

2
src/p_mobj.c
View file

@ -9169,7 +9169,7 @@ void P_MobjThinker(mobj_t *mobj)
// Destroy items sector special
if (P_CanDeleteKartItem(mobj->type))
{
if (mobj->health > 0 && P_MobjTouchingSectorSpecial(mobj, 4, 7, true))
if (mobj->health > 0 && P_MobjTouchingSectorSpecial(mobj, 4, 13, true))
{
if (mobj->type == MT_SSMINE
|| mobj->type == MT_BUBBLESHIELDTRAP

11
src/p_spec.c
View file

@ -4743,7 +4743,12 @@ DoneSection2:
}
break;
case 7: // SRB2Kart: Destroy items
case 7: // SRB2kart 190117 - Oil Slick (deprecated)
if (roversector || isTouching)
{
if (player)
P_DamageMobj(player->mo, NULL, NULL, 1, DMG_NORMAL);
}
break;
case 8: // Zoom Tube Start
@ -4864,7 +4869,7 @@ DoneSection2:
}
case 11: // Unused
case 12: // Camera noclip
case 13: // Unused
case 13: // SRB2Kart: Destroy items
case 14: // Unused
case 15: // Unused
break;
@ -5098,7 +5103,7 @@ static void P_RunSpecialSectorCheck(player_t *player, sector_t *sector)
case 6: // Super Sonic Transform
case 8: // Zoom Tube Start
case 9: // Zoom Tube End
case 10: // Finish line (Unused)
case 10: // Finish line
nofloorneeded = true;
break;
}