diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2021-02-28 17:05:57 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-28 17:05:57 -0800 |
| commit | 082b0c03a3e5c34a511069e159e9485ced292dbc (patch) | |
| tree | 4284940e28d2c44940dee10bfa352fcd3bee5b1b /src/code_08077B98.c | |
| parent | 6596831a6bff9638c00baf7d81632d6ed1ed7e02 (diff) | |
| parent | e3ee1058bb05edd47321a5554995a1bc78b42289 (diff) | |
Merge pull request #126 from notyourav/ent_enums
create object enum and update entity type struct
Diffstat (limited to 'src/code_08077B98.c')
| -rw-r--r-- | src/code_08077B98.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/code_08077B98.c b/src/code_08077B98.c index 83d0089b..c3fbf5dd 100644 --- a/src/code_08077B98.c +++ b/src/code_08077B98.c @@ -69,8 +69,8 @@ void* sub_08077C54(UnkItemStruct* unk) { item = sub_0805E744(); if (item != NULL) { - item->entityType.subtype = gUnk_0811BE48[unk->field_0x1].unk[3]; - item->entityType.type = 8; + item->id = gUnk_0811BE48[unk->field_0x1].unk[3]; + item->kind = 8; item->flags = 0xa0; item->parent = (Entity*)unk; item->field_0x68.HALF.LO = unk->field_0x1; @@ -95,10 +95,10 @@ Entity* CreatePlayerItem(u32 subtype, u32 form, u32 parameter, u32 unk) { ent = GetEmptyEntity(); if (ent != NULL) { ent->flags = 0x80; - (ent->entityType).type = 8; - (ent->entityType).subtype = subtype; - (ent->entityType).form = form; - (ent->entityType).parameter = parameter; + ent->kind = 8; + ent->id = subtype; + ent->type = form; + ent->type2 = parameter; ent->field_0x68.HALF.LO = unk; AppendEntityToList(ent, 2); } @@ -111,10 +111,10 @@ Entity* sub_08077CF8(u32 subtype, u32 form, u32 parameter, u32 unk) { ent = sub_0805E744(); if (ent != NULL) { ent->flags = 0x80; - (ent->entityType).type = 8; - (ent->entityType).subtype = subtype; - (ent->entityType).form = form; - (ent->entityType).parameter = parameter; + ent->kind = 8; + ent->id = subtype; + ent->type = form; + ent->type2 = parameter; ent->field_0x68.HALF.LO = unk; AppendEntityToList(ent, 2); } |