summaryrefslogtreecommitdiff
path: root/src/REL/d/a/obj/d_a_obj_barrel.cpp
diff options
context:
space:
mode:
authorrobojumper <robojumper@gmail.com>2026-05-24 23:08:30 +0200
committerGitHub <noreply@github.com>2026-05-24 23:08:30 +0200
commit483ac7b934e4e3443366640320ae9b1ade65fe90 (patch)
tree2015b1c591f4c006241dd44ef272c9987e48b233 /src/REL/d/a/obj/d_a_obj_barrel.cpp
parent388abef134a6c7156f1309d6453ac2eb260642e1 (diff)
parent174f848c281a6bdc77531b6b0a7a59f1bd99565e (diff)
Merge pull request #311 from robojumper/item_mdl
some item model stuff
Diffstat (limited to 'src/REL/d/a/obj/d_a_obj_barrel.cpp')
-rw-r--r--src/REL/d/a/obj/d_a_obj_barrel.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/REL/d/a/obj/d_a_obj_barrel.cpp b/src/REL/d/a/obj/d_a_obj_barrel.cpp
index 1955a3dd..546fab3e 100644
--- a/src/REL/d/a/obj/d_a_obj_barrel.cpp
+++ b/src/REL/d/a/obj/d_a_obj_barrel.cpp
@@ -91,7 +91,7 @@ static dCcD_SrcCyl sSrcCyl = {
{
/* mObjAt */ {AT_TYPE_PHYSICS, 0x10013, {0, 0, 0}, 4, 0, 0, 0, 0, 0},
/* mObjTg */
- {~(AT_TYPE_BUGNET | AT_TYPE_BEETLE | AT_TYPE_0x80000 | AT_TYPE_0x8000), 0x2000111, {0, 0xF, 0x407}, 0, 0},
+ {~(AT_TYPE_BUGNET | AT_TYPE_BEETLE | AT_TYPE_GLITTERING_SPORES | AT_TYPE_0x8000), 0x2000111, {0, 0xF, 0x407}, 0, 0},
/* mObjCo*/ {0xE9},
},
{
@@ -102,7 +102,7 @@ static dCcD_SrcSph sSrcSph = {
{
/* mObjAt */ {AT_TYPE_PHYSICS, 0x10003, {0, 0, 0}, 4, 0, 0, 0, 0, 0},
/* mObjTg */
- {~(AT_TYPE_BUGNET | AT_TYPE_BEETLE | AT_TYPE_0x80000 | AT_TYPE_0x8000 | AT_TYPE_WIND),
+ {~(AT_TYPE_BUGNET | AT_TYPE_BEETLE | AT_TYPE_GLITTERING_SPORES | AT_TYPE_0x8000 | AT_TYPE_WIND),
0x2000111,
{0, 0xF, 0x407},
0,
@@ -185,7 +185,7 @@ int dAcOBarrel_c::actorCreate() {
}
mSph.Set(sSrcSph);
mSph.SetStts(mStts);
- mObjAcch.OffClrSpeedY();
+ mObjAcch.SetClrSpeedY();
mAcceleration = -4.f;
mMaxSpeed = -40.f;