diff options
| author | robojumper <robojumper@gmail.com> | 2026-05-24 23:08:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-24 23:08:30 +0200 |
| commit | 483ac7b934e4e3443366640320ae9b1ade65fe90 (patch) | |
| tree | 2015b1c591f4c006241dd44ef272c9987e48b233 /src/d/a/obj/d_a_obj_tbox.cpp | |
| parent | 388abef134a6c7156f1309d6453ac2eb260642e1 (diff) | |
| parent | 174f848c281a6bdc77531b6b0a7a59f1bd99565e (diff) | |
Merge pull request #311 from robojumper/item_mdl
some item model stuff
Diffstat (limited to 'src/d/a/obj/d_a_obj_tbox.cpp')
| -rw-r--r-- | src/d/a/obj/d_a_obj_tbox.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/a/obj/d_a_obj_tbox.cpp b/src/d/a/obj/d_a_obj_tbox.cpp index 931dc459..7f219bc4 100644 --- a/src/d/a/obj/d_a_obj_tbox.cpp +++ b/src/d/a/obj/d_a_obj_tbox.cpp @@ -92,7 +92,7 @@ static char *const sOpenEventNames[] = { // TODO just copied from somewhere const cCcD_SrcGObj dAcTbox_c::sColSrc = { /* mObjAt */ {0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0}, - /* mObjTg */ {~(AT_TYPE_BUGNET | AT_TYPE_BEETLE | AT_TYPE_0x80000 | AT_TYPE_0x8000 | AT_TYPE_WIND), 0, {0, 0, 0x407}, 0, 0}, + /* mObjTg */ {~(AT_TYPE_BUGNET | AT_TYPE_BEETLE | AT_TYPE_GLITTERING_SPORES | AT_TYPE_0x8000 | AT_TYPE_WIND), 0, {0, 0, 0x407}, 0, 0}, /* mObjCo */ {0xE9} }; // clang-format on @@ -1079,7 +1079,7 @@ int dAcTbox_c::create() { // clang-format off static const dCcD_SrcUnk s3 = {{ /* mObjAt */ {0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0}, - /* mObjTg */ {~(AT_TYPE_BUGNET | AT_TYPE_BEETLE | AT_TYPE_0x80000 | AT_TYPE_0x8000 | AT_TYPE_WIND), 0x1010111, {7, 0x407}, 0, 0}, + /* mObjTg */ {~(AT_TYPE_BUGNET | AT_TYPE_BEETLE | AT_TYPE_GLITTERING_SPORES | AT_TYPE_0x8000 | AT_TYPE_WIND), 0x1010111, {7, 0x407}, 0, 0}, /* mObjCo */ {0x0}}, {0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f}, }; @@ -1090,7 +1090,7 @@ int dAcTbox_c::create() { // clang-format off static const dCcD_SrcUnk s4 = {{ /* mObjAt */ {0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0}, - /* mObjTg */ {~(AT_TYPE_BUGNET | AT_TYPE_BEETLE | AT_TYPE_0x80000 | AT_TYPE_0x8000 | AT_TYPE_WIND), 0x1010111, {6, 0x407}, 0, 0}, + /* mObjTg */ {~(AT_TYPE_BUGNET | AT_TYPE_BEETLE | AT_TYPE_GLITTERING_SPORES | AT_TYPE_0x8000 | AT_TYPE_WIND), 0x1010111, {6, 0x407}, 0, 0}, /* mObjCo */ {0x0}}, {0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f}, }; @@ -1962,7 +1962,7 @@ void dAcTbox_c::initializeState_Open() { if (item != nullptr) { mItemRef.link(item); const char *evName; - if (dAcItem_c::getItemGetEventName(itemId, &evName)) { + if (dAcItem_c::getItemGetTboxEventName(itemId, &evName)) { Event ev(evName, 300, 4, (void *)dAcItem_c::itemGetEventStart, (void *)dAcItem_c::itemGetEventEnd); EventManager::changeOwnEvent(this, item, &ev, 0); } |