- merged polyobject branch into trunk and made some adjustments for savegame compatibility.
SVN r2448 (trunk)
This commit is contained in:
parent
3a48da2c56
commit
4ac64b6df7
22 changed files with 1524 additions and 1010 deletions
|
|
@ -39,6 +39,7 @@
|
|||
// State.
|
||||
#include "r_state.h"
|
||||
#include "templates.h"
|
||||
#include "po_man.h"
|
||||
|
||||
static AActor *RoughBlockCheck (AActor *mo, int index, void *);
|
||||
|
||||
|
|
@ -692,9 +693,9 @@ line_t *FBlockLinesIterator::Next()
|
|||
polyLink->polyobj->validcount = validcount;
|
||||
}
|
||||
|
||||
line_t *ld = polyLink->polyobj->lines[polyIndex];
|
||||
line_t *ld = polyLink->polyobj->Linedefs[polyIndex];
|
||||
|
||||
if (++polyIndex >= polyLink->polyobj->numlines)
|
||||
if (++polyIndex >= (int)polyLink->polyobj->Linedefs.Size())
|
||||
{
|
||||
polyLink = polyLink->next;
|
||||
polyIndex = 0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue