--- libgender/oct.h	2004/10/06 00:55:37	1.8
+++ libgender/oct.h	2004/10/09 16:36:31	1.12
@@ -6,10 +6,9 @@
 using namespace std;
 
 #include "util.h"
+#include "view.h"
 
-struct entity_base;
-
-struct octant : protected vector<entity_base *> {
+struct octant : protected vector<entity *>, public recv_occ_query {
   struct octant *parent;
   /* front 23 back 67
    *       01      45 */
@@ -17,13 +16,15 @@
   int fill;
   sector orig;
   uoffs extent;
-  GLuint occ_query;
 
-  void add (entity_base *e);
-  void remove (entity_base *e);
+  void add (entity *e);
+  void remove (entity *e);
 
   void detect_visibility (view &ctx);
   void display (view &ctx);
+  void draw_bbox (view &ctx);
+
+  void event (occ_query &ev);
 
   octant (octant *parent, const sector &orig, uoffs extent);
   ~octant ();