projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Had a bit of time today and worked on supertux:
[supertux.git]
/
src
/
collision_grid.h
diff --git
a/src/collision_grid.h
b/src/collision_grid.h
index
8a507d1
..
7822c31
100644
(file)
--- a/
src/collision_grid.h
+++ b/
src/collision_grid.h
@@
-20,7
+20,6
@@
public:
void add_object(MovingObject* object);
void remove_object(MovingObject* object);
void add_object(MovingObject* object);
void remove_object(MovingObject* object);
- void move_object(MovingObject* object);
void check_collisions();
void check_collisions();
@@
-47,9
+46,10
@@
private:
ObjectWrapper* object_wrapper;
};
ObjectWrapper* object_wrapper;
};
- void remove_object_from_gridcell(int gridcell,
MovingObject* object
);
+ void remove_object_from_gridcell(int gridcell,
ObjectWrapper* wrapper
);
void collide_object(ObjectWrapper* wrapper);
void collide_object_object(ObjectWrapper* wrapper, ObjectWrapper* wrapper2);
void collide_object(ObjectWrapper* wrapper);
void collide_object_object(ObjectWrapper* wrapper, ObjectWrapper* wrapper2);
+ void move_object(ObjectWrapper* wrapper);
typedef std::vector<GridEntry*> GridEntries;
GridEntries grid;
typedef std::vector<GridEntry*> GridEntries;
GridEntries grid;