X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=hit_shape.cc;h=344e45ce4e1b5079db1dd0d838c27fa9447f3782;hb=1801b407a8243791f90465aaff7e32aeb241f00a;hp=28b27780b406ebc197f81228a0bce5682a9c8d00;hpb=3caf13085a6ae1ae41d6f489c8b69206b0ffa48d;p=universe.git diff --git a/hit_shape.cc b/hit_shape.cc index 28b2778..344e45c 100644 --- a/hit_shape.cc +++ b/hit_shape.cc @@ -8,7 +8,7 @@ class MoveSquare : public Task { - int _square_size; + scalar_t _square_size; int _nb_shapes; Polygon **_shapes; bool *_targets; @@ -47,7 +47,7 @@ public: margin + (world_height - 2 * margin) * drand48(), 2 * M_PI * drand48()); p->set_speed(0, 0, 0); - universe->initialize(p); + universe->initialize_polygon(p); p->_nailed = true; if(universe->collide(p)) delete p; else { @@ -73,7 +73,7 @@ public: if(manipulator->grabbing()) { for(int k = 0; k < _nb_shapes; k++) if(_shapes[k] == manipulator->grabbing()) { bool hit = _targets[k]; - if(hit & drand48() < 0.25) { + if(hit && (drand48() < 0.25)) { manipulator->force_release(); scramble(universe); return 1.0;