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

Add toggle for linedef action 401 to not change the ceiling texture.

Browse source
This commit is contained in:
spherallic 2021-12-02 01:52:45 +01:00 • committed by toaster
parent 1a12b7b58e
commit 6cfe9ad4b3
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
extras/conf/SRB2Kart2.cfg
View file

@ -1760,7 +1760,7 @@ linedeftypes
title = "Set Tagged Sector's Floor Height/Texture"; title = "Set Tagged Sector's Floor Height/Texture";
prefix = "(400)"; prefix = "(400)";
flags8text = "[3] Set delay by backside sector"; flags8text = "[3] Set delay by backside sector";
flags64text = "[6] Keep floor flat"; flags64text = "[6] Don't change floor texture";
} }
401 401
@ -1768,6 +1768,7 @@ linedeftypes
title = "Set Tagged Sector's Ceiling Height/Texture"; title = "Set Tagged Sector's Ceiling Height/Texture";
prefix = "(401)"; prefix = "(401)";
flags8text = "[3] Set delay by backside sector"; flags8text = "[3] Set delay by backside sector";
flags64text = "[6] Don't change ceiling texture";
} }
402 402
@ -1855,7 +1856,7 @@ linedeftypes
prefix = "(403)"; prefix = "(403)";
flags2text = "[1] Trigger linedef executor"; flags2text = "[1] Trigger linedef executor";
flags8text = "[3] Set delay by backside sector"; flags8text = "[3] Set delay by backside sector";
flags64text = "[6] Change floor flat"; flags64text = "[6] Change floor texture";
} }
404 404
@ -1864,7 +1865,7 @@ linedeftypes
prefix = "(404)"; prefix = "(404)";
flags2text = "[1] Trigger linedef executor"; flags2text = "[1] Trigger linedef executor";
flags8text = "[3] Set delay by backside sector"; flags8text = "[3] Set delay by backside sector";
flags64text = "[6] Change ceiling flat"; flags64text = "[6] Change ceiling texture";
} }
405 405

11
src/p_ceilng.c
View file

@ -67,7 +67,8 @@ void T_MoveCeiling(ceiling_t *ceiling)
switch (ceiling->type) switch (ceiling->type)
{ {
case instantMoveCeilingByFrontSector: case instantMoveCeilingByFrontSector:
ceiling->sector->ceilingpic = ceiling->texture; if (ceiling->texture > -1)
ceiling->sector->ceilingpic = ceiling->texture;
ceiling->sector->ceilingdata = NULL; ceiling->sector->ceilingdata = NULL;
ceiling->sector->ceilspeed = 0; ceiling->sector->ceilspeed = 0;
P_RemoveThinker(&ceiling->thinker); P_RemoveThinker(&ceiling->thinker);
@ -186,7 +187,8 @@ void T_MoveCeiling(ceiling_t *ceiling)
break; break;
case instantMoveCeilingByFrontSector: case instantMoveCeilingByFrontSector:
ceiling->sector->ceilingpic = ceiling->texture; if (ceiling->texture > -1)
ceiling->sector->ceilingpic = ceiling->texture;
ceiling->sector->ceilingdata = NULL; ceiling->sector->ceilingdata = NULL;
ceiling->sector->ceilspeed = 0; ceiling->sector->ceilspeed = 0;
P_RemoveThinker(&ceiling->thinker); P_RemoveThinker(&ceiling->thinker);
@ -512,7 +514,10 @@ INT32 EV_DoCeiling(line_t *line, ceiling_e type)
ceiling->direction = -1; ceiling->direction = -1;
ceiling->bottomheight = line->frontsector->ceilingheight; ceiling->bottomheight = line->frontsector->ceilingheight;
} }
ceiling->texture = line->frontsector->ceilingpic; if (line->flags & ML_NOCLIMB)
ceiling->texture = -1;
else
ceiling->texture = line->frontsector->ceilingpic;
break; break;
case moveCeilingByFrontTexture: case moveCeilingByFrontTexture: