shithub: nanobsp

Info  •  Files  •  Log  •  Branches

rewrote R_PointInSubsector() for subsector_t/node_t changes.

--- a/r_main.c

+++ b/r_main.c

@@ -702,29 +702,17 @@

 //

 // R_PointInSubsector

 //

-subsector_t*

-R_PointInSubsector

-( fixed_t	x,

-  fixed_t	y )

+subsector_t * R_PointInSubsector (fixed_t x, fixed_t y)

 {

-    node_t*	node;

-    int		side;

-    int		nodenum;

+    node_t * node = root_node;

-    // single subsector is a special case

-    if (!numnodes)				

-	return subsectors;

-		

-    nodenum = numnodes-1;

-

-    while (! (nodenum & NF_SUBSECTOR) )

+    while (node->sub != NULL)

     {

-	node = &nodes[nodenum];

-	side = R_PointOnSide (x, y, node);

-	nodenum = node->children[side];

+        int side = R_PointOnSide (x, y, node);

+        node = side ? node->left : node->right;

     }

-	

-    return &subsectors[nodenum & ~NF_SUBSECTOR];

+

+    return node->sub;

 }

-- 

⑨