Merge branch 'mr-origin-69'
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
#include <ultra64.h>
|
||||
#include "functions.h"
|
||||
#include "variables.h"
|
||||
#include <core1/viewport.h>
|
||||
#include "actor.h"
|
||||
|
||||
#include "prop.h"
|
||||
@@ -309,7 +310,7 @@ Actor *func_80325CAC(ActorMarker *marker, Gfx **gfx, Gfx **mtx, Vtx **vtx) {
|
||||
this->position[1] -= D_8036E58C[1];
|
||||
this->position[2] -= D_8036E58C[2];
|
||||
}
|
||||
viewport_get_rotation_vec3f(rotation);
|
||||
viewport_getRotation_vec3f(rotation);
|
||||
rotation[2] += this->roll;
|
||||
func_80338338(0xFF, 0xFF, 0xFF);
|
||||
if (this->unk124_11 != 0) {
|
||||
|
Reference in New Issue
Block a user