Merge branch 'zmaster'

This commit is contained in:
Christoph Oelckers 2016-02-27 23:36:52 +01:00
commit e305f5211a
20 changed files with 465 additions and 47 deletions

View file

@ -1558,8 +1558,6 @@ void P_SpawnSpecials (void)
}
// [RH] Start running any open scripts on this map
FBehavior::StaticStartTypedScripts (SCRIPT_Open, NULL, false);
P_FinalizePortals();
P_CreateLinkedPortals();
}
// killough 2/28/98:
@ -1888,7 +1886,7 @@ static void P_SpawnScrollers(void)
switch (special)
{
register int s;
int s;
case Scroll_Ceiling:
{
@ -2420,7 +2418,7 @@ static void P_SpawnPushers ()
{
int i;
line_t *l = lines;
register int s;
int s;
for (i = 0; i < numlines; i++, l++)
{