--- libgender/oct.h	2004/10/07 23:39:43	1.11
+++ 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;
-
-struct octant : protected vector<entity *> {
+struct octant : protected vector<entity *>, public recv_occ_query {
   struct octant *parent;
   /* front 23 back 67
    *       01      45 */
@@ -17,7 +16,6 @@
   int fill;
   sector orig;
   uoffs extent;
-  GLuint occ_query;
 
   void add (entity *e);
   void remove (entity *e);
@@ -26,12 +24,13 @@
   void display (view &ctx);
   void draw_bbox (view &ctx);
 
+  void event (occ_query &ev);
+
   octant (octant *parent, const sector &orig, uoffs extent);
   ~octant ();
 };
 
 extern octant world;
-GLuint occ_query_result (GLuint id);
 
 #endif