mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-08-09 10:32:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

rename camera_start_cinematic_shot (#770)

Browse Source
This commit is contained in:
MegaMech
2026-07-26 22:54:33 -06:00
committed by GitHub
parent 2ccda00a89
commit 230fe2ec1e
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cpu_vehicles_camera_path.c
+7 -7
View File
@@ -3416,7 +3416,7 @@ void func_80019760(Camera* camera, UNUSED Player* player, UNUSED s32 arg2, s32 c
camera->rot[2] = 0;
}
void func_80019890(s32 playerId, s32 cameraId) {
void camera_start_cinematic_shot(s32 playerId, s32 cameraId) {
s32 pathIndex;
Camera* camera = camera1;
camera += cameraId;
@@ -3569,11 +3569,11 @@ void func_80019DF4(void) {
void func_80019E58(void) {
D_80164680[0] = 1;
func_80019890(0, 0);
camera_start_cinematic_shot(0, 0);
D_80164670[0] = D_80164678[0];
D_80164678[0] = 1;
D_80164680[1] = 9;
func_80019890(0, 1);
camera_start_cinematic_shot(0, 1);
D_80164670[1] = D_80164678[1];
D_80164678[1] = 0;
}
@@ -3697,7 +3697,7 @@ void func_8001A348(s32 cameraId, f32 arg1, s32 arg2) {
playerId = cameras[cameraId].playerId;
D_80164688[cameraId] = arg1;
D_80164680[cameraId] = func_8001A310((s32) gNearestPathPointByCameraId[cameraId], arg2);
func_80019890(playerId, cameraId);
camera_start_cinematic_shot(playerId, cameraId);
}
void func_8001A3D8(s32 arg0, f32 arg1, s32 arg2) {
@@ -3707,7 +3707,7 @@ void func_8001A3D8(s32 arg0, f32 arg1, s32 arg2) {
D_80164688[arg0] = arg1;
if (arg2 != D_80164680[arg0]) {
D_80164680[arg0] = arg2;
func_80019890(playerId, arg0);
camera_start_cinematic_shot(playerId, arg0);
}
}
@@ -3722,7 +3722,7 @@ void func_8001A450(s32 playerId, s32 arg1, s32 arg2) {
temp_v0 = func_8001A310(pathPoint, (temp_v1 + 1) % 10);
if ((temp_v0 != temp_v1) || (arg2 != playerId)) {
D_80164680[arg1] = temp_v0;
func_80019890(arg2, arg1);
camera_start_cinematic_shot(arg2, arg1);
}
}
}
@@ -3769,7 +3769,7 @@ void func_8001A588(UNUSED u16* localD_80152300, Camera* camera, Player* player,
} else {
func_8001A124((s32) playerId, cameraIndex);
}
func_80019890((s32) playerId, cameraIndex);
camera_start_cinematic_shot((s32) playerId, cameraIndex);
}
if ((D_80164680[cameraIndex] == 14) || (D_80164680[cameraIndex] == 0)) {
src/cpu_vehicles_camera_path.h
+1 -1
View File
@@ -254,7 +254,7 @@ void func_8001933C(Camera*, UNUSED Player*, s32, s32);
void func_8001968C(void);
void func_8001969C(s32, f32, s32, s16);
void func_80019760(Camera*, UNUSED Player*, s32, s32);
void func_80019890(s32, s32);
void camera_start_cinematic_shot(s32, s32);
void func_80019B50(s32, u16);
void func_80019C50(s32);
void func_80019D2C(Camera*, Player*, s32);