From ab23b8907bfe0dce0b04ea992f6bca624e02e15f Mon Sep 17 00:00:00 2001 From: uncletrunks Date: Thu, 14 May 2020 21:50:10 -0500 Subject: [PATCH] putting out fires --- data/behavior_data.c | 1 - src/engine/math_util.c | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/data/behavior_data.c b/data/behavior_data.c index 8fc3d518..3b4af5a0 100644 --- a/data/behavior_data.c +++ b/data/behavior_data.c @@ -3183,7 +3183,6 @@ const BehaviorScript bhvFloorTrapInCastle[] = { const BehaviorScript bhvTree[] = { BEGIN(OBJ_LIST_POLELIKE), - BILLBOARD(), CYLBOARD(), OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE), SET_INT(oInteractType, INTERACT_POLE), diff --git a/src/engine/math_util.c b/src/engine/math_util.c index 8ce410d6..3f027ed5 100644 --- a/src/engine/math_util.c +++ b/src/engine/math_util.c @@ -383,6 +383,11 @@ void mtxf_cylboard(Mat4 dest, Mat4 mtx, Vec3f position, s16 angle) { //straight dest[0][2] = 0; dest[0][3] = 0; + dest[1][0] = mtx[1][0]; + dest[1][1] = mtx[1][1]; + dest[1][2] = mtx[1][2]; + dest[1][3] = 0; + dest[2][0] = 0; dest[2][1] = 0; dest[2][2] = 1;