From d6c379cb3e9dfe45a87e9531573e3397083099f6 Mon Sep 17 00:00:00 2001 From: Henny022p Date: Tue, 9 Mar 2021 04:22:03 +0100 Subject: big cleanup part 1 --- src/createObject.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'src/createObject.c') diff --git a/src/createObject.c b/src/createObject.c index 62c67062..f0a79d43 100644 --- a/src/createObject.c +++ b/src/createObject.c @@ -1,22 +1,21 @@ #include "global.h" #include "entity.h" +#include "position.h" #include "room.h" - -extern Entity* GetEmptyEntity(); -extern void AppendEntityToList(Entity*, u8); +#include "functions.h" Entity* CreateObject(u32 subtype, u32 form, u32 parameter) { - Entity* ent; - - ent = GetEmptyEntity(); - if (ent != NULL) { - ent->kind = 6; - ent->id = subtype; - ent->type = form; - ent->type2 = parameter; - AppendEntityToList(ent, 6); + Entity* entity; + + entity = GetEmptyEntity(); + if (entity != NULL) { + entity->kind = 6; + entity->id = subtype; + entity->type = form; + entity->type2 = parameter; + AppendEntityToList(entity, 6); } - return ent; + return entity; } Entity* CreateObjectWithParent(Entity* parentEnt, u32 subtype, u32 form, u32 parameter) { -- cgit v1.2.3 From a563bfbc285a24be6b17a32364aa3236170acc60 Mon Sep 17 00:00:00 2001 From: Henny022p Date: Mon, 15 Mar 2021 23:40:11 +0100 Subject: more cleanup --- src/createObject.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/createObject.c') diff --git a/src/createObject.c b/src/createObject.c index f0a79d43..dc8de778 100644 --- a/src/createObject.c +++ b/src/createObject.c @@ -2,7 +2,7 @@ #include "entity.h" #include "position.h" #include "room.h" -#include "functions.h" +#include "createObject.h" Entity* CreateObject(u32 subtype, u32 form, u32 parameter) { Entity* entity; -- cgit v1.2.3 From bd50d449de5fc85ecb6f08f27a6ba0a45bfed6ec Mon Sep 17 00:00:00 2001 From: theo3 Date: Sun, 21 Mar 2021 20:51:08 -0700 Subject: collapse TUs --- src/createObject.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/createObject.c') diff --git a/src/createObject.c b/src/createObject.c index dc8de778..16f5df16 100644 --- a/src/createObject.c +++ b/src/createObject.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "position.h" +#include "coord.h" #include "room.h" #include "createObject.h" -- cgit v1.2.3