Sara
/
basic-game-framework
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: Sara:c1fa6e2956ed5520fde067f61a49618ba541698f
Branches Tags
Sara:development
Sara:main
...
compare: Sara:6a52f2795d06e05718368965edd54ab60c8b87ee
Branches Tags
Sara:development
Sara:main

2 Commits
c1fa6e2956 ... 6a52f2795d

Author SHA1 Message Date
Sara 6a52f2795d object_is_valid now does not attempt to validate internals if object is NULL 2023-07-12 02:25:32 +02:00
Sara d915047bd1 removed uses of world_num_objects from world.c and replaced them with _world_objects.num 2023-07-12 02:25:11 +02:00
2 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

2
src/corelib/object.h
View File

@ -26,7 +26,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(object_t* object) { int object_is_valid(object_t* object) {
return object != NULL || object->active <= 0; return object != NULL && object->active <= 0;
} }
#endif /* _object_h */ #endif /* _object_h */

4
src/corelib/world.c
View File

@ -64,7 +64,7 @@ object_t* instantiate_object(const object_t *original) {
} }
void world_update() { void world_update() {
for(int i = 0; i < world_num_objects(); ++i) { for(int i = 0; i < _world_objects.num; ++i) {
object_t* object = world_get_object(i); object_t* object = world_get_object(i);
if(!object_is_valid(object) if(!object_is_valid(object)
&& object->evt_update != NULL) { && object->evt_update != NULL) {
@ -74,7 +74,7 @@ void world_update() {
} }
void world_draw() { void world_draw() {
for(int i = 0; i < world_num_objects(); ++i) { for(int i = 0; i < _world_objects.num; ++i) {
object_t* object = world_get_object(i); object_t* object = world_get_object(i);
if(!object_is_valid(object) if(!object_is_valid(object)
&& object->evt_draw != NULL) { && object->evt_draw != NULL) {