diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2024-10-28 21:16:46 -0700 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2024-10-28 21:16:46 -0700 |
| commit | 70044ec8dd10369b64cc52424fb62f913fcfbed0 (patch) | |
| tree | 652d5da5de32e932457eacdf730e02e4d1bcf611 /src/d/actor/d_a_am2.cpp | |
| parent | 9388725dd313e8228c6549746a06fa6a7b00a354 (diff) | |
Clean up cc enums
Diffstat (limited to 'src/d/actor/d_a_am2.cpp')
| -rw-r--r-- | src/d/actor/d_a_am2.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp index 78bbd3dd..18e4f4f5 100644 --- a/src/d/actor/d_a_am2.cpp +++ b/src/d/actor/d_a_am2.cpp @@ -1319,7 +1319,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ AT_TYPE_NORMAL_ARROW | AT_TYPE_FIRE_ARROW | AT_TYPE_ICE_ARROW | AT_TYPE_LIGHT_ARROW | AT_TYPE_GRAPPLING_HOOK, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, @@ -1330,7 +1330,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_CON_HIT | G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoConHit_e | dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS @@ -1351,7 +1351,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, @@ -1362,7 +1362,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_CON_HIT | G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoConHit_e | dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS @@ -1383,18 +1383,18 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK4 | CO_SPRM_VSGRP, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsPlayer_e | cCcD_CoSPrm_VsGrpAll_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, - /* SrcGObjTg HitMark */ G_TG_MARK_PURPLE_HIT, + /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_SHIELD | G_TG_SPRM_NO_CON_HIT, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_Shield_e | dCcG_TgSPrm_NoConHit_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS @@ -1413,20 +1413,20 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) { /* Flags */ 0, /* SrcObjAt Type */ AT_TYPE_UNK1000, /* SrcObjAt Atp */ 1, - /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_PLAYER, + /* SrcObjAt SPrm */ cCcD_AtSPrm_Set_e | cCcD_AtSPrm_VsPlayer_e, /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_VS_UNK4 | CO_SPRM_VS_UNK8, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_VsPlayer_e | cCcD_CoSPrm_VsOther_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ dCcG_At_Spl_UNK6, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, - /* SrcGObjTg HitMark */ G_TG_MARK_PURPLE_HIT, + /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_SHIELD | G_TG_SPRM_NO_CON_HIT, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_Shield_e | dCcG_TgSPrm_NoConHit_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS |