equal
deleted
inserted
replaced
154 * @return New position |
154 * @return New position |
155 */ |
155 */ |
156 void walk(TimeMS, bool right); |
156 void walk(TimeMS, bool right); |
157 Vector walk_one_step(float, bool); |
157 Vector walk_one_step(float, bool); |
158 |
158 |
|
159 public: |
159 /** |
160 /** |
160 * Define object behaviour on collisions. |
161 * Define object behaviour on collisions. |
161 * |
162 * |
162 * XXX: make this pure-virtual |
163 * XXX: make this pure-virtual |
163 */ |
164 */ |
164 virtual void onCollision (Vector collisionPoint, PhysicsObject *other); |
165 virtual void onCollision (Vector collisionPoint, PhysicsObject *other = NULL); |
165 |
166 |
166 public: |
|
167 /** |
167 /** |
168 * Return the type of the physics object (player, projectile...) |
168 * Return the type of the physics object (player, projectile...) |
169 */ |
169 */ |
170 ObjectType getType (void) const; |
170 ObjectType getType (void) const; |
171 |
171 |