Merge branch 'mr-origin-69'
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
#include <ultra64.h>
|
||||
#include "functions.h"
|
||||
#include "variables.h"
|
||||
#include <core1/viewport.h>
|
||||
|
||||
extern int func_8024DD34(f32, f32, f32);
|
||||
#define _SQ3(x, y, z) (((x) * (x)) + ((y) * (y)) + ((z) * (z)))
|
||||
#define _SQ3v1(v) (v[0] * v[0] + v[1] * v[1] + v[2] * v[2])
|
||||
|
||||
@@ -20,8 +20,8 @@ void func_802F87B0(struct6s *this){
|
||||
return;
|
||||
|
||||
player_getPosition(plyrPos);
|
||||
func_8024C5A8(camNorm);
|
||||
viewport_get_rotation_vec3f(camRot);
|
||||
viewport_getLookVector(camNorm);
|
||||
viewport_getRotation_vec3f(camRot);
|
||||
ptr = vector_pushBackNew(&this->unk1C);
|
||||
f20 = randf2(50.0f, 1200.0f);
|
||||
sp4C[0] = 0.0f;
|
||||
@@ -39,7 +39,7 @@ void func_802F87B0(struct6s *this){
|
||||
sp4C[1] += plyrPos[1];
|
||||
sp4C[2] += plyrPos[2];
|
||||
if(f20 < 600.0){
|
||||
for(i = 0; i <10 && func_8024DD34(sp4C[0], sp4C[1] - 10.0f, sp4C[2]); i++){
|
||||
for(i = 0; i <10 && viewport_isPointPlane_3f(sp4C[0], sp4C[1] - 10.0f, sp4C[2]); i++){
|
||||
sp4C[1] += 100.0f;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user