etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-10-19 03:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add null checks to spawn_object.c

Browse source
This commit is contained in:
MysterD 2022-05-28 01:29:19 -07:00
parent 71b50c721e
commit 123abbbc37
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/game/spawn_object.c
View file

@ -59,6 +59,7 @@ void unused_init_free_list(struct LinkedList *usedList, struct LinkedList **pFre
*/ */
struct LinkedList *unused_try_allocate(struct LinkedList *destList, struct LinkedList *unused_try_allocate(struct LinkedList *destList,
struct LinkedList *freeList) { struct LinkedList *freeList) {
if (!destList || !freeList) { return; }
struct LinkedList *node = freeList->next; struct LinkedList *node = freeList->next;
if (node != NULL) { if (node != NULL) {
@ -117,6 +118,7 @@ struct Object *try_allocate_object(struct ObjectNode *destList, struct ObjectNod
* This function seems to have been replaced by deallocate_object. * This function seems to have been replaced by deallocate_object.
*/ */
void unused_deallocate(struct LinkedList *freeList, struct LinkedList *node) { void unused_deallocate(struct LinkedList *freeList, struct LinkedList *node) {
if (!node || !freeList) { return; }
// Remove from doubly linked list // Remove from doubly linked list
node->next->prev = node->prev; node->next->prev = node->prev;
node->prev->next = node->next; node->prev->next = node->next;
@ -130,6 +132,7 @@ void unused_deallocate(struct LinkedList *freeList, struct LinkedList *node) {
* insert it at the beginning of the free list (singly linked). * insert it at the beginning of the free list (singly linked).
*/ */
static void deallocate_object(struct ObjectNode *freeList, struct ObjectNode *obj) { static void deallocate_object(struct ObjectNode *freeList, struct ObjectNode *obj) {
if (!obj || !freeList) { return; }
// Remove from object list // Remove from object list
obj->next->prev = obj->prev; obj->next->prev = obj->prev;
obj->prev->next = obj->next; obj->prev->next = obj->next;
@ -163,6 +166,7 @@ void init_free_object_list(void) {
* Clear each object list, without adding the objects back to the free list. * Clear each object list, without adding the objects back to the free list.
*/ */
void clear_object_lists(struct ObjectNode *objLists) { void clear_object_lists(struct ObjectNode *objLists) {
if (!objLists) { return; }
for (s32 i = 0; i < NUM_OBJ_LISTS; i++) { for (s32 i = 0; i < NUM_OBJ_LISTS; i++) {
objLists[i].next = &objLists[i]; objLists[i].next = &objLists[i];
objLists[i].prev = &objLists[i]; objLists[i].prev = &objLists[i];
@ -173,6 +177,7 @@ void clear_object_lists(struct ObjectNode *objLists) {
* Delete the leaf graph nodes under obj and obj's siblings. * Delete the leaf graph nodes under obj and obj's siblings.
*/ */
static void unused_delete_leaf_nodes(struct Object *obj) { static void unused_delete_leaf_nodes(struct Object *obj) {
if (!obj) { return; }
struct Object *children; struct Object *children;
struct Object *sibling; struct Object *sibling;
struct Object *obj0 = obj; struct Object *obj0 = obj;
@ -194,6 +199,7 @@ static void unused_delete_leaf_nodes(struct Object *obj) {
* Free the given object. * Free the given object.
*/ */
void unload_object(struct Object *obj) { void unload_object(struct Object *obj) {
if (!obj) { return; }
obj->activeFlags = ACTIVE_FLAG_DEACTIVATED; obj->activeFlags = ACTIVE_FLAG_DEACTIVATED;
obj->prevObj = NULL; obj->prevObj = NULL;
@ -235,6 +241,7 @@ void unload_object(struct Object *obj) {
* infinite loop. * infinite loop.
*/ */
struct Object *allocate_object(struct ObjectNode *objList) { struct Object *allocate_object(struct ObjectNode *objList) {
if (!objList) { return NULL; }
struct Object *obj = try_allocate_object(objList, &gFreeObjectList); struct Object *obj = try_allocate_object(objList, &gFreeObjectList);
// The object list is full if the newly created pointer is NULL. // The object list is full if the newly created pointer is NULL.
@ -329,6 +336,7 @@ struct Object *allocate_object(struct ObjectNode *objList) {
* If the object is close to being on the floor, move it to be exactly on the floor. * If the object is close to being on the floor, move it to be exactly on the floor.
*/ */
static void snap_object_to_floor(struct Object *obj) { static void snap_object_to_floor(struct Object *obj) {
if (!obj) { return; }
struct Surface *surface; struct Surface *surface;
obj->oFloorHeight = find_floor(obj->oPosX, obj->oPosY, obj->oPosZ, &surface); obj->oFloorHeight = find_floor(obj->oPosX, obj->oPosY, obj->oPosZ, &surface);
@ -343,6 +351,7 @@ static void snap_object_to_floor(struct Object *obj) {
* Spawn an object at the origin with the behavior script at virtual address bhvScript. * Spawn an object at the origin with the behavior script at virtual address bhvScript.
*/ */
struct Object *create_object(const BehaviorScript *bhvScript) { struct Object *create_object(const BehaviorScript *bhvScript) {
if (!bhvScript) { return NULL; }
s32 objListIndex = OBJ_LIST_DEFAULT; s32 objListIndex = OBJ_LIST_DEFAULT;
const BehaviorScript *behavior = smlua_override_behavior(bhvScript); const BehaviorScript *behavior = smlua_override_behavior(bhvScript);
@ -390,6 +399,7 @@ struct Object *create_object(const BehaviorScript *bhvScript) {
* Mark an object to be unloaded at the end of the frame. * Mark an object to be unloaded at the end of the frame.
*/ */
void mark_obj_for_deletion(struct Object *obj) { void mark_obj_for_deletion(struct Object *obj) {
if (!obj) { return; }
//! Same issue as obj_mark_for_deletion //! Same issue as obj_mark_for_deletion
obj->activeFlags = ACTIVE_FLAG_DEACTIVATED; obj->activeFlags = ACTIVE_FLAG_DEACTIVATED;
} }