mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-07-26 06:27:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decompile currentPlayerApplyCrouchSpeedTheta

Browse Source
This commit is contained in:
Ryan Dwyer
2020-03-01 23:27:54 +10:00
parent 6ccf613368
commit 4cd8770112
4 changed files with 15 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/bondwalk.c
+8 -33
View File
@@ -3449,39 +3449,14 @@ glabel var7f1ad7f8
/* f0c6944: 00000000 */ sll $zero,$zero,0x0
);
GLOBAL_ASM(
glabel func0f0c6948
/* f0c6948: 27bdffe8 */ addiu $sp,$sp,-24
/* f0c694c: afbf0014 */ sw $ra,0x14($sp)
/* f0c6950: 0fc331a0 */ jal currentPlayerGetCrouchPos
/* f0c6954: 00000000 */ sll $zero,$zero,0x0
/* f0c6958: 14400008 */ bnez $v0,.L0f0c697c
/* f0c695c: 3c02800a */ lui $v0,0x800a
/* f0c6960: 8c42a244 */ lw $v0,-0x5dbc($v0)
/* f0c6964: 3c013f00 */ lui $at,0x3f00
/* f0c6968: 44813000 */ mtc1 $at,$f6
/* f0c696c: c4440148 */ lwc1 $f4,0x148($v0)
/* f0c6970: 46062202 */ mul.s $f8,$f4,$f6
/* f0c6974: 1000000c */ beqz $zero,.L0f0c69a8
/* f0c6978: e4480148 */ swc1 $f8,0x148($v0)
.L0f0c697c:
/* f0c697c: 0fc331a0 */ jal currentPlayerGetCrouchPos
/* f0c6980: 00000000 */ sll $zero,$zero,0x0
/* f0c6984: 24010001 */ addiu $at,$zero,0x1
/* f0c6988: 14410007 */ bne $v0,$at,.L0f0c69a8
/* f0c698c: 3c02800a */ lui $v0,0x800a
/* f0c6990: 8c42a244 */ lw $v0,-0x5dbc($v0)
/* f0c6994: 3c013f40 */ lui $at,0x3f40
/* f0c6998: 44818000 */ mtc1 $at,$f16
/* f0c699c: c44a0148 */ lwc1 $f10,0x148($v0)
/* f0c69a0: 46105482 */ mul.s $f18,$f10,$f16
/* f0c69a4: e4520148 */ swc1 $f18,0x148($v0)
.L0f0c69a8:
/* f0c69a8: 8fbf0014 */ lw $ra,0x14($sp)
/* f0c69ac: 27bd0018 */ addiu $sp,$sp,0x18
/* f0c69b0: 03e00008 */ jr $ra
/* f0c69b4: 00000000 */ sll $zero,$zero,0x0
);
void currentPlayerApplyCrouchSpeedTheta(void)
{
if (currentPlayerGetCrouchPos() == CROUCH_SQUAT) {
g_Vars.currentplayer->speedtheta *= 0.5f;
} else if (currentPlayerGetCrouchPos() == CROUCH_HALF) {
g_Vars.currentplayer->speedtheta *= 0.75f;
}
}
GLOBAL_ASM(
glabel func0f0c69b8
src/game/game_0c79f0.c
+2 -2
View File
@@ -294,7 +294,7 @@ void func0f0c8004(void)
} else if (g_Vars.currentplayer->bondmovemode == MOVEMODE_GRAB) {
func0f0ce8ac();
} else if (g_Vars.currentplayer->bondmovemode == MOVEMODE_WALK) {
func0f0c6948();
currentPlayerApplyCrouchSpeedTheta();
}
}
@@ -4176,7 +4176,7 @@ void currentPlayerUpdateFootsteps(bool arg0, bool arg1, bool arg2, bool arg3)
}
if ((g_Vars.currentplayer->bondmovemode == MOVEMODE_WALK || g_Vars.currentplayer->bondmovemode == MOVEMODE_GRAB)
&& (g_Vars.currentplayer->unk0170 || g_Vars.currentplayer->unk0168)
&& (g_Vars.currentplayer->speedforwards || g_Vars.currentplayer->speedsideways)
&& (!g_Vars.normmplayerisrunning || PLAYERCOUNT() == 1)) {
chr = g_Vars.currentplayer->prop->chr;
src/include/game/bondwalk.h
+1 -1
View File
@@ -26,7 +26,7 @@ u32 func0f0c63bc(void);
void currentPlayerUpdatePrevPos(void);
void func0f0c65a8(void);
u32 func0f0c65c8(void);
u32 func0f0c6948(void);
void currentPlayerApplyCrouchSpeedTheta(void);
u32 func0f0c69b8(void);
void func0f0c785c(void);
src/include/types.h
+4 -4
View File
@@ -1102,14 +1102,14 @@ struct player {
/*0x013c*/ struct prop *autoxaimprop;
/*0x0140*/ s32 autoxaimtime60;
/*0x0144*/ f32 vv_theta;
/*0x0148*/ f32 speedtheta;
/*0x0144*/ f32 vv_theta; // turn angle
/*0x0148*/ f32 speedtheta; // turn speed
/*0x014c*/ f32 vv_costheta;
/*0x0150*/ f32 vv_sintheta;
/*0x0154*/ f32 vv_verta;
/*0x0154*/ f32 vv_verta; // look up/down angle. 0 = horizontal, 90 = up
/*0x0158*/ f32 vv_verta360;
/*0x015c*/ f32 speedverta;
/*0x015c*/ f32 speedverta; // look up/down speed
/*0x0160*/ f32 vv_cosverta;
/*0x0164*/ f32 vv_sinverta;