Function and Enum Naming
Enum Changes: BSGROUP_4_LOOK = 0x4 MISC_FLAG_17_FPV = 0x17 Moved nc_first_person_state to global enums.h Function names: func_8028EE84() -> player_getWaterState() func_8028B2E8() -> player_isStable() func_80294F78() -> should_look_first_person_camera() func_80294F78() -> can_view_first_person() func_8028B424() -> player_isFallTumbling() func_8029C780() -> bs_getTypeOfJump() func_8028DB14() -> hitbox_getHitboxForActor()
This commit is contained in:
@@ -529,7 +529,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
|
||||
player_getPosition(spA0);
|
||||
jiggy_id = chjiggy_getJiggyId(actor);
|
||||
if( jiggy_id != JIGGY_2F_FP_XMAS_TREE
|
||||
|| (func_8028B2E8() && !(3600.0f < ml_distanceSquared_vec3f(actor->position, spA0)))
|
||||
|| (player_isStable() && !(3600.0f < ml_distanceSquared_vec3f(actor->position, spA0)))
|
||||
){
|
||||
jiggyscore_setCollected(jiggy_id, TRUE);
|
||||
item_adjustByDiffWithoutHud(ITEM_26_JIGGY_TOTAL, 1);
|
||||
@@ -686,7 +686,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
|
||||
break;
|
||||
|
||||
case MARKER_6B_GLOOPBUBBLE: //L8028CD20
|
||||
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
|
||||
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
|
||||
item_adjustByDiffWithHud(ITEM_17_AIR, fxairscore_count_to_time(2));
|
||||
}
|
||||
break;
|
||||
|
Reference in New Issue
Block a user