mirror of
https://github.com/n64decomp/mk64
synced 2026-07-03 19:50:10 -04:00
+14
-14
@@ -9,11 +9,11 @@
|
||||
#include "code_800029B0.h"
|
||||
#include "math_util.h"
|
||||
#include "racing/memory.h"
|
||||
#include "waypoints.h"
|
||||
#include "path.h"
|
||||
#include "render_player.h"
|
||||
#include "collision.h"
|
||||
#include "code_80057C60.h"
|
||||
#include "code_80005FD0.h"
|
||||
#include "cpu_vehicles_camera_path.h"
|
||||
#include "main.h"
|
||||
#include "spawn_players.h"
|
||||
|
||||
@@ -221,9 +221,9 @@ void func_8001CA78(UNUSED Player* player, Camera* camera, Vec3f arg2, f32* arg3,
|
||||
f32 temp_f18;
|
||||
f32 temp_f16;
|
||||
UNUSED s32 pad;
|
||||
TrackWaypoint* temp_s2;
|
||||
TrackPathPoint* temp_s2;
|
||||
|
||||
temp_s2 = &D_80164550[0][gWaypointCountByPathIndex[0] - 10];
|
||||
temp_s2 = &gTrackPaths[0][gPathCountByPathIndex[0] - 10];
|
||||
sp68[0] = camera->unk_30[0];
|
||||
sp68[1] = camera->unk_30[1];
|
||||
sp68[2] = camera->unk_30[2];
|
||||
@@ -362,7 +362,7 @@ void func_8001CCEC(Player* player, Camera* camera, Vec3f arg2, f32* arg3, f32* a
|
||||
arg2[0] = camera->lookAt[0];
|
||||
arg2[1] = camera->lookAt[1];
|
||||
arg2[2] = camera->lookAt[2];
|
||||
if ((player->effects & 0x01000000) == 0x01000000) {
|
||||
if ((player->effects & UNKNOWN_EFFECT_0x1000000) == UNKNOWN_EFFECT_0x1000000) {
|
||||
sp84[2] /= 3.0f;
|
||||
}
|
||||
calculate_orientation_matrix(sp9C, 0, 1, 0, arg7);
|
||||
@@ -375,7 +375,7 @@ void func_8001CCEC(Player* player, Camera* camera, Vec3f arg2, f32* arg3, f32* a
|
||||
arg2[0] += (x - camera->lookAt[0]) * D_80164A78[index];
|
||||
arg2[2] += ((z - camera->lookAt[2]) * D_80164A78[index]);
|
||||
|
||||
if ((((player->unk_094 / 18) * 216) <= 5.0f) && ((player->effects & 2) == 2)) {
|
||||
if ((((player->speed / 18) * 216) <= 5.0f) && ((player->effects & 2) == 2)) {
|
||||
arg2[1] += ((y - camera->lookAt[1]) * 0.02);
|
||||
} else {
|
||||
arg2[1] += ((y - camera->lookAt[1]) * 0.5);
|
||||
@@ -383,7 +383,7 @@ void func_8001CCEC(Player* player, Camera* camera, Vec3f arg2, f32* arg3, f32* a
|
||||
mtxf_translate_vec3f_mat3(sp90, sp9C);
|
||||
x = player->pos[0] + sp90[0];
|
||||
z = player->pos[2] + sp90[2];
|
||||
if ((player->effects & 0x01000000) != 0x01000000) {
|
||||
if ((player->effects & UNKNOWN_EFFECT_0x1000000) != UNKNOWN_EFFECT_0x1000000) {
|
||||
var_f0 = player->pos[1] + sp90[1];
|
||||
// permute
|
||||
y = var_f0;
|
||||
@@ -394,7 +394,7 @@ void func_8001CCEC(Player* player, Camera* camera, Vec3f arg2, f32* arg3, f32* a
|
||||
*arg3 = camera->pos[0] + ((x - camera->pos[0]) * D_80164A78[index]);
|
||||
*arg5 = camera->pos[2] + ((z - camera->pos[2]) * D_80164A78[index]);
|
||||
|
||||
if ((((player->unk_094 / 18) * 216) <= 5.0f) && ((player->effects & 2) == 2)) {
|
||||
if ((((player->speed / 18) * 216) <= 5.0f) && ((player->effects & 2) == 2)) {
|
||||
*arg4 = camera->pos[1] + (((y - camera->pos[1]) * 0.01));
|
||||
} else {
|
||||
*arg4 = camera->pos[1] + (((y - camera->pos[1]) * 0.15));
|
||||
@@ -582,7 +582,7 @@ void func_8001D944(Player* player, Camera* camera, Vec3f arg2, f32* arg3, f32* a
|
||||
arg2[0] = camera->lookAt[0];
|
||||
arg2[1] = camera->lookAt[1];
|
||||
arg2[2] = camera->lookAt[2];
|
||||
if ((player->effects & 0x01000000) == 0x01000000) {
|
||||
if ((player->effects & UNKNOWN_EFFECT_0x1000000) == UNKNOWN_EFFECT_0x1000000) {
|
||||
sp84[2] /= 3.0f;
|
||||
}
|
||||
calculate_orientation_matrix(sp9C, 0, 1, 0, arg7);
|
||||
@@ -595,7 +595,7 @@ void func_8001D944(Player* player, Camera* camera, Vec3f arg2, f32* arg3, f32* a
|
||||
arg2[0] += (x - camera->lookAt[0]) * D_80164A78[index];
|
||||
arg2[2] += ((z - camera->lookAt[2]) * D_80164A78[index]);
|
||||
|
||||
if ((((player->unk_094 / 18) * 216) <= 5.0f) && ((player->effects & 2) == 2)) {
|
||||
if ((((player->speed / 18) * 216) <= 5.0f) && ((player->effects & 2) == 2)) {
|
||||
arg2[1] += ((y - camera->lookAt[1]) * 0.02);
|
||||
} else {
|
||||
arg2[1] += ((y - camera->lookAt[1]) * 0.5);
|
||||
@@ -603,7 +603,7 @@ void func_8001D944(Player* player, Camera* camera, Vec3f arg2, f32* arg3, f32* a
|
||||
mtxf_translate_vec3f_mat3(sp90, sp9C);
|
||||
x = player->pos[0] + sp90[0];
|
||||
z = player->pos[2] + sp90[2];
|
||||
if ((player->effects & 0x01000000) != 0x01000000) {
|
||||
if ((player->effects & UNKNOWN_EFFECT_0x1000000) != UNKNOWN_EFFECT_0x1000000) {
|
||||
var_f0 = player->pos[1] + sp90[1];
|
||||
// permute
|
||||
y = var_f0;
|
||||
@@ -614,7 +614,7 @@ void func_8001D944(Player* player, Camera* camera, Vec3f arg2, f32* arg3, f32* a
|
||||
*arg3 = camera->pos[0] + ((x - camera->pos[0]) * D_80164A78[index]);
|
||||
*arg5 = camera->pos[2] + ((z - camera->pos[2]) * D_80164A78[index]);
|
||||
|
||||
if ((((player->unk_094 / 18) * 216) <= 5.0f) && ((player->effects & 2) == 2)) {
|
||||
if ((((player->speed / 18) * 216) <= 5.0f) && ((player->effects & 2) == 2)) {
|
||||
*arg4 = camera->pos[1] + (((y - camera->pos[1]) * 0.01));
|
||||
} else {
|
||||
*arg4 = camera->pos[1] + (((y - camera->pos[1]) * 0.15));
|
||||
@@ -704,7 +704,7 @@ void func_8001E45C(Camera* camera, Player* player, s8 arg2) {
|
||||
UNUSED s16 pad6;
|
||||
s16 temp;
|
||||
|
||||
if ((player->effects & 0x10) == 0x10) {
|
||||
if ((player->effects & UNKNOWN_EFFECT_0x10) == UNKNOWN_EFFECT_0x10) {
|
||||
var_a3 = 100;
|
||||
if (player->unk_078 == 0) {
|
||||
camera->unk_B0 = 0;
|
||||
@@ -826,7 +826,7 @@ void func_8001EA0C(Camera* camera, Player* player, s8 arg2) {
|
||||
UNUSED s16 pad6;
|
||||
s16 temp;
|
||||
|
||||
if ((player->effects & 0x10) == 0x10) {
|
||||
if ((player->effects & UNKNOWN_EFFECT_0x10) == UNKNOWN_EFFECT_0x10) {
|
||||
var_a3 = 100;
|
||||
if (player->unk_078 == 0) {
|
||||
camera->unk_B0 = 0;
|
||||
|
||||
Reference in New Issue
Block a user