fix merge

This commit is contained in:
engineer124
2023-10-28 08:11:01 +11:00
parent cbbd7ce4fe
commit 0350836d94
3 changed files with 3 additions and 2 deletions
+1
View File
@@ -1,3 +1,4 @@
#include "prevent_bss_reordering.h"
#include "global.h"
#include "z64horse.h"
#include "z64shrink_window.h"
+1 -1
View File
@@ -1,5 +1,5 @@
#include "ultra64.h"
#include "macros.h"
#include "z64math.h"
void guLookAtF(f32 mf[4][4], f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, f32 yUp, f32 zUp) {
f32 length;
+1 -1
View File
@@ -1,5 +1,5 @@
#include "ultra64.h"
#include "macros.h"
#include "z64math.h"
void guLookAtHiliteF(f32 mf[4][4], LookAt* l, Hilite* h, f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt,
f32 xUp, f32 yUp, f32 zUp, f32 xl1, f32 yl1, f32 zl1, /* light 1 direction */