stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-04-23 10:41:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix git merge conflict trolling regarding some rogue commit

Browse source 
Merge branch 'udmf-specials' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-specials

# Conflicts:
#	src/p_slopes.c
#	src/p_spec.c
#	src/r_defs.h
This commit is contained in:
Nev3r 2019-12-16 18:55:24 +01:00
commit 3c2862ee34
2 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/p_setup.c
View file

@ -1195,7 +1195,6 @@ static void TextmapLine(UINT32 i, char *param)
#ifdef ADVUDMF
else if (fastcmp(param, "executordelay"))
lines[i].executordelay = atol(M_GetToken(NULL));
#endif
// Flags
else if (fastcmp(param, "blocking") && fastcmp("true", M_GetToken(NULL)))

1
src/r_defs.h
View file

@ -371,7 +371,6 @@ typedef struct sector_s
double lineoutLength;
#endif // ----- end special tricks -----
// This points to the master's floorheight, so it can be changed in realtime!
fixed_t gravity; // per-sector gravity
fixed_t *gravityptr; // For binary format: Read gravity from floor height of master sector
boolean verticalflip; // If gravity < 0, then allow flipped physics