- Synced the scripting branch with trunk.
SVN r2166 (scripting)
This commit is contained in:
commit
913555aa4e
284 changed files with 13322 additions and 7494 deletions
|
|
@ -624,11 +624,11 @@ static void LoadWalls (walltype *walls, int numwalls, sectortype *bsec)
|
|||
int sidenum = int(intptr_t(lines[linenum].sidedef[1]));
|
||||
if (bsec->floorstat & 64)
|
||||
{ // floor is aligned to first wall
|
||||
R_AlignFlat (linenum, (DWORD)sidenum == (DWORD)bsec->wallptr, 0);
|
||||
R_AlignFlat (linenum, sidenum == bsec->wallptr, 0);
|
||||
}
|
||||
if (bsec->ceilingstat & 64)
|
||||
{ // ceiling is aligned to first wall
|
||||
R_AlignFlat (linenum, (DWORD)sidenum == (DWORD)bsec->wallptr, 0);
|
||||
R_AlignFlat (linenum, sidenum == bsec->wallptr, 0);
|
||||
}
|
||||
}
|
||||
for(i = 0; i < numsides; i++)
|
||||
|
|
@ -827,4 +827,4 @@ void ACustomSprite::BeginPlay ()
|
|||
renderflags |= RF_XFLIP;
|
||||
if (args[4] & 8)
|
||||
renderflags |= RF_YFLIP;
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue