kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Tuple operations

Browse Source
This commit is contained in:
Nabnut
2024-09-22 11:24:26 +02:00
parent fbe20325c2
commit bb58ae66e9
30 changed files with 205 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core2/ch/crab.c
View File

@@ -2,7 +2,7 @@
#include "functions.h"
#include "variables.h"
extern bool func_80259254(f32[3], f32, f32, f32);
extern bool ml_vec3f_point_within_horizontal_distance(f32[3], f32, f32, f32);
/* .data */
ActorAnimationInfo chCrabAnimations[] ={
@@ -185,7 +185,7 @@ void __chCrab_die(ActorMarker *marker, ActorMarker *other){
this->unk138_27 = 1;
marker_despawn(marker);
if( map_get() == MAP_B_CC_CLANKERS_CAVERN
&& func_80259254(this->position, 13778.0f, 0.0f, 3000.0f)
&& ml_vec3f_point_within_horizontal_distance(this->position, 13778.0f, 0.0f, 3000.0f)
) {
this->depth_mode = MODEL_RENDER_DEPTH_COMPARE;
if( !jiggyscore_isCollected(JIGGY_16_CC_SNIPPETS)

4
src/core2/ch/snowman.c
View File

@@ -2,7 +2,7 @@
#include "functions.h"
#include "variables.h"
extern int func_802592C4(f32[3], f32[3], f32);
extern int ml_vec3f_within_horizontal_distance(f32[3], f32[3], f32);
extern void func_802EFA20(ParticleEmitter *, f32, f32);
extern void subaddie_set_state_with_direction(Actor *, s32, f32, s32);
extern void func_80328FB0(Actor *, f32);
@@ -198,7 +198,7 @@ int __chSnowman_CCW_playerInProtectedZone(void){
f32 player_position[3];
if(map_get() == MAP_46_CCW_WINTER){
player_getPosition(player_position);
if(func_802592C4(player_position, ccw_no_attack_zone, 900.0f))
if(ml_vec3f_within_horizontal_distance(player_position, ccw_no_attack_zone, 900.0f))
return 1;
}
return 0;