diff options
| author | theo3 <arisstephenson2@gmail.com> | 2021-03-21 22:59:52 -0700 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2021-03-21 22:59:52 -0700 |
| commit | f56a1cade6911129ea32d48727a70ce8f9bc783f (patch) | |
| tree | a3bb7d9a96555fd227aae887921af20c228e9e71 /src/createEntity.c | |
| parent | 8734f766b467b5f469afd6b24b5cf07be7e53ad0 (diff) | |
| parent | 41684172807db9cb74cfe2879e527eb2fcb6b230 (diff) | |
fix merge conflict
Diffstat (limited to 'src/createEntity.c')
| -rw-r--r-- | src/createEntity.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/createEntity.c b/src/createEntity.c index e83312a1..9948a780 100644 --- a/src/createEntity.c +++ b/src/createEntity.c @@ -2,8 +2,8 @@ // #include "entityData.h" // #include "global.h" -// extern Entity * FindEntityBySubtype(u32, u32); -// extern Entity * GetEmptyEntityByType(); +// extern Entity * DeepFindEntityByID(u32, u32); +// extern Entity * GetEmptyEntityByKind(); // extern void RegisterRoomEntity(Entity *, EntityData *); // extern u32 sub_0804AF0C(Entity *, EntityData *); // extern void sub_08016A30(Entity *); @@ -17,11 +17,11 @@ // type = param_1->entityType & 15; // if (((param_1->field_0x1 & 240) == 80) && -// (preexisting = FindEntityBySubtype(type,param_1->entitySubtype), preexisting != NULL)) { +// (preexisting = DeepFindEntityByID(type,param_1->entitySubtype), preexisting != NULL)) { // entity = NULL; // } // else { -// entity = GetEmptyEntityByType(); //Get empty entity +// entity = GetEmptyEntityByKind(); //Get empty entity // if (entity != NULL) { // (entity->entityType).type = type; // (entity->entityType).subtype = param_1->entitySubtype; |