- merged automap branch into trunk.

SVN r2609 (trunk)
This commit is contained in:
Christoph Oelckers 2010-08-27 15:20:05 +00:00
commit 9a4abe0915
47 changed files with 3355 additions and 609 deletions

View file

@ -302,7 +302,7 @@ void AActor::LinkToWorld (bool buggy)
// link into subsector
sector_t *sec;
if (!buggy || numnodes == 0)
if (!buggy || numgamenodes == 0)
{
sec = P_PointInSector (x, y);
}
@ -322,6 +322,7 @@ void AActor::LinkToWorld (sector_t *sec)
return;
}
Sector = sec;
subsector = R_PointInSubsector(x, y); // this is from the rendering nodes, not the gameplay nodes!
if ( !(flags & MF_NOSECTOR) )
{
@ -460,7 +461,7 @@ static int R_PointOnSideSlow (fixed_t x, fixed_t y, node_t *node)
sector_t *AActor::LinkToWorldForMapThing ()
{
node_t *node = nodes + numnodes - 1;
node_t *node = gamenodes + numgamenodes - 1;
do
{