diff options
Diffstat (limited to 'src/eetg.c')
| -rw-r--r-- | src/eetg.c | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -37,8 +37,8 @@ static unsigned int eetg_rand_next = 1; static void -eetg_object_set(struct eetg_object *object, struct eetg_world *world, - int x, int y, int layer_id) +eetg_object_attach(struct eetg_object *object, struct eetg_world *world, + int x, int y, int layer_id) { assert(object); assert(!object->world); @@ -53,7 +53,7 @@ eetg_object_set(struct eetg_object *object, struct eetg_world *world, } static void -eetg_object_unset(struct eetg_object *object) +eetg_object_detach(struct eetg_object *object) { assert(object); assert(object->world); @@ -164,7 +164,7 @@ eetg_layer_clear(struct eetg_layer *layer) while (object) { struct eetg_object *next = object->next; - eetg_object_unset(object); + eetg_object_detach(object); object = next; } @@ -399,7 +399,7 @@ eetg_world_add(struct eetg_world *world, struct eetg_object *object, layer = &world->layers[layer_id]; eetg_layer_add(layer, object); - eetg_object_set(object, world, x, y, layer_id); + eetg_object_attach(object, world, x, y, layer_id); hit = eetg_world_scan_collisions(world, object); if (hit) { @@ -450,7 +450,7 @@ eetg_world_remove(struct eetg_world *world, struct eetg_object *object) assert(removed); - eetg_object_unset(object); + eetg_object_detach(object); } static void @@ -875,6 +875,7 @@ int eetg_object_get_cell(const struct eetg_object *object, int x, int y) { assert(object); + assert(object->world); x -= object->x; y -= object->y; |