quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix "invalid tracenode: 0" bug

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@374 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
divverent 2009-05-23 18:23:14 +00:00
parent bd6c5c2da0
commit 52098ce5f1
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/quake3/q3map2/light_trace.c
View File

@ -201,6 +201,9 @@ static int AllocTraceNode( void )
memset( &traceNodes[ numTraceNodes ], 0, sizeof( traceNode_t ) ); memset( &traceNodes[ numTraceNodes ], 0, sizeof( traceNode_t ) );
traceNodes[ numTraceNodes ].type = TRACE_LEAF; traceNodes[ numTraceNodes ].type = TRACE_LEAF;
ClearBounds( traceNodes[ numTraceNodes ].mins, traceNodes[ numTraceNodes ].maxs ); ClearBounds( traceNodes[ numTraceNodes ].mins, traceNodes[ numTraceNodes ].maxs );
/* Sys_Printf("alloc node %d\n", numTraceNodes); */
numTraceNodes++; numTraceNodes++;
/* return the count */ /* return the count */
@ -362,7 +365,7 @@ recursively create the initial trace node structure from the bsp tree
static int SetupTraceNodes_r( int bspNodeNum ) static int SetupTraceNodes_r( int bspNodeNum )
{ {
int i, nodeNum, bspLeafNum; int i, nodeNum, bspLeafNum, newNode;
bspPlane_t *plane; bspPlane_t *plane;
bspNode_t *bspNode; bspNode_t *bspNode;
@ -388,7 +391,10 @@ static int SetupTraceNodes_r( int bspNodeNum )
bspLeafNum = -bspNode->children[ i ] - 1; bspLeafNum = -bspNode->children[ i ] - 1;
/* new code */ /* new code */
traceNodes[ nodeNum ].children[ i ] = AllocTraceNode(); newNode = AllocTraceNode();
traceNodes[ nodeNum ].children[ i ] = newNode;
/* have to do this separately, as gcc first executes LHS, then RHS, and if a realloc took place, this fails */
if( bspLeafs[ bspLeafNum ].cluster == -1 ) if( bspLeafs[ bspLeafNum ].cluster == -1 )
traceNodes[ traceNodes[ nodeNum ].children[ i ] ].type = TRACE_LEAF_SOLID; traceNodes[ traceNodes[ nodeNum ].children[ i ] ].type = TRACE_LEAF_SOLID;
} }
@ -397,6 +403,8 @@ static int SetupTraceNodes_r( int bspNodeNum )
else else
traceNodes[ nodeNum ].children[ i ] = SetupTraceNodes_r( bspNode->children[ i ] ); traceNodes[ nodeNum ].children[ i ] = SetupTraceNodes_r( bspNode->children[ i ] );
} }
/* Sys_Printf("node %d children: %d %d\n", nodeNum, traceNodes[ nodeNum ].children[0], traceNodes[ nodeNum ].children[1]); */
/* return node number */ /* return node number */
return nodeNum; return nodeNum;