github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 06:13:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

conflicts

Browse source
This commit is contained in:
louist103 2022-05-12 12:15:49 -04:00
commit e9eb3d3626
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
View file

@ -404,7 +404,7 @@ void BgPoEvent_BlockPush(BgPoEvent* this, GlobalContext* globalCtx) {
this->dyna.actor.home.pos.z = this->dyna.actor.world.pos.z; this->dyna.actor.home.pos.z = this->dyna.actor.world.pos.z;
sBgPoEventblockPushDist = 0.0f; sBgPoEventblockPushDist = 0.0f;
this->dyna.actor.speedXZ = 0.0f; this->dyna.actor.speedXZ = 0.0f;
this->direction = 5; this->direction = CVar_GetS32("gFasterBlockPush", 0) != 0 ? 3 : 5;
sBgPoEventBlocksAtRest++; sBgPoEventBlocksAtRest++;
this->actionFunc = BgPoEvent_BlockIdle; this->actionFunc = BgPoEvent_BlockIdle;
if (this->type == 1) { if (this->type == 1) {