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

Merge branch 'master' into next

Browse source
This commit is contained in:
Alam Ed Arias 2019-12-28 21:43:16 -05:00
commit d588e3ca9c
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extras/conf/SRB2-22.cfg
View file

@ -690,9 +690,9 @@ linedeftypes
title = "Chain Parameters"; title = "Chain Parameters";
prefix = "(9)"; prefix = "(9)";
flags32text = "[5] Swing instead of spin"; flags32text = "[5] Swing instead of spin";
flags128text = "[7] Make chain from end item";
flags64text = "[6] Player-turnable chain"; flags64text = "[6] Player-turnable chain";
flags128text = "[7] Make chain from maces"; flags256text = "[8] Spawn link at origin";
flags256text = "[8] Spawn mace at origin";
flags512text = "[9] Don't clip inside ground"; flags512text = "[9] Don't clip inside ground";
flags1024text = "[10] No distance check"; flags1024text = "[10] No distance check";
} }

2
src/m_misc.c
View file

@ -2474,6 +2474,8 @@ int M_PathParts(const char *path)
int n; int n;
const char *p; const char *p;
const char *t; const char *t;
if (path == NULL)
return 0;
for (n = 0, p = path ;; ++n) for (n = 0, p = path ;; ++n)
{ {
t = p; t = p;