added CAP_SHAPES: poly system works, but no shapes are used

floorshapes.cpp

@@ -1,5 +1,5 @@
 namespace hr {
-#if CAP_POLY
+#if CAP_SHAPES
 vector<plain_floorshape*> all_plain_floorshapes;
 vector<escher_floorshape*> all_escher_floorshapes;
 
@@ -591,8 +591,6 @@ namespace gp {
 
 qfloorinfo qfi;
 
-int chasmg;
-
 void set_no_floor() {
   qfi.fshape = NULL;
   qfi.shape = NULL;