mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-28 07:02:38 +00:00
Merge branch 'master' into next
This commit is contained in:
commit
d588e3ca9c
2 changed files with 4 additions and 2 deletions
|
@ -690,9 +690,9 @@ linedeftypes
|
|||
title = "Chain Parameters";
|
||||
prefix = "(9)";
|
||||
flags32text = "[5] Swing instead of spin";
|
||||
flags128text = "[7] Make chain from end item";
|
||||
flags64text = "[6] Player-turnable chain";
|
||||
flags128text = "[7] Make chain from maces";
|
||||
flags256text = "[8] Spawn mace at origin";
|
||||
flags256text = "[8] Spawn link at origin";
|
||||
flags512text = "[9] Don't clip inside ground";
|
||||
flags1024text = "[10] No distance check";
|
||||
}
|
||||
|
|
|
@ -2474,6 +2474,8 @@ int M_PathParts(const char *path)
|
|||
int n;
|
||||
const char *p;
|
||||
const char *t;
|
||||
if (path == NULL)
|
||||
return 0;
|
||||
for (n = 0, p = path ;; ++n)
|
||||
{
|
||||
t = p;
|
||||
|
|
Loading…
Reference in a new issue