Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

putting out fires

This commit is contained in:
uncletrunks 2020-05-14 21:50:10 -05:00
parent 31d6a2a3b2
commit 7c7287b33a
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/behavior_data.c
View File

@ -3183,7 +3183,6 @@ const BehaviorScript bhvFloorTrapInCastle[] = {
const BehaviorScript bhvTree[] = { const BehaviorScript bhvTree[] = {
BEGIN(OBJ_LIST_POLELIKE), BEGIN(OBJ_LIST_POLELIKE),
BILLBOARD(),
CYLBOARD(), CYLBOARD(),
OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE), OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE),
SET_INT(oInteractType, INTERACT_POLE), SET_INT(oInteractType, INTERACT_POLE),

5
src/engine/math_util.c
View File

@ -383,6 +383,11 @@ void mtxf_cylboard(Mat4 dest, Mat4 mtx, Vec3f position, s16 angle) { //straight
dest[0][2] = 0; dest[0][2] = 0;
dest[0][3] = 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][0] = 0;
dest[2][1] = 0; dest[2][1] = 0;
dest[2][2] = 1; dest[2][2] = 1;