Merge branch 'master' into m4a

1 files changed, 12 insertions, 13 deletions

diff --git a/src/createObject.c b/src/createObject.c
index 62c67062..16f5df16 100644
--- a/src/createObject.c
+++ b/src/createObject.c
@@ -1,22 +1,21 @@
 #include "global.h"
 #include "entity.h"
+#include "coord.h"
 #include "room.h"
-
-extern Entity* GetEmptyEntity();
-extern void AppendEntityToList(Entity*, u8);
+#include "createObject.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) {