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

Merge branch 'mr-origin-55'

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-05 19:56:43 -05:00
parent ec98c1620c 1bf68887e6
commit a39dfa2021
62 changed files with 218 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -269,7 +269,7 @@ void chSnowman_update(Actor *this){
else{//L802E2380
if( __chSnowman_isPlayerInAttackRange(this, 500, 2750)
&& __chSnowman_isYawNearYawTarget(this, 3)
&& func_8028EE84() != BSWATERGROUP_2_UNDERWATER
&& player_getWaterState() != BSWATERGROUP_2_UNDERWATER
&& !__chSnowman_CCW_playerInProtectedZone()
){
subaddie_set_state_with_direction(this, CHSNOWMAN_STATE_2_ATTACK, 0.01f, 1);
@@ -285,7 +285,7 @@ void chSnowman_update(Actor *this){
else if(
0.98 < animctrl_getAnimTimer(this->animctrl)
|| !__chSnowman_isPlayerInAttackRange(this, 500, 2750)
|| func_8028EE84() == BSWATERGROUP_2_UNDERWATER
|| player_getWaterState() == BSWATERGROUP_2_UNDERWATER
|| __chSnowman_CCW_playerInProtectedZone()
){
__chSnowman_enterIdle(this);