Compare commits
No commits in common. "8a6a0e74936abbeb00d0bb59381ac06ed6639c30" and "59de57fe3adc00cfb98aca3326a67f9152b2da5b" have entirely different histories.
8a6a0e7493
...
59de57fe3a
|
@ -25,7 +25,7 @@ object_t object_default();
|
||||||
|
|
||||||
void object_draw_sprite(object_t* object);
|
void object_draw_sprite(object_t* object);
|
||||||
static inline
|
static inline
|
||||||
int object_is_valid(const object_t* object) {
|
int object_is_valid(object_t* object) {
|
||||||
return object == NULL || object->active == 0;
|
return object == NULL || object->active == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ void object_broadcast_collision(object_t* this, object_t* other) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
short can_collide(const object_t* this) {
|
short can_collide(const object_t* this) {
|
||||||
return object_is_valid(this) && this->enabled;
|
return this->active && this->enabled;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline
|
static inline
|
||||||
|
|
Loading…
Reference in New Issue