github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-07-16 10:02:59 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix GI overruling link size over anything else (#2424)

Browse source
This commit is contained in:
aMannus 2023-01-31 13:21:16 +01:00 • committed by GitHub
parent 612700c2ab
commit e14fcf92d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
soh/src/overlays/actors/ovl_player_actor/z_player.c
View file

@ -10995,7 +10995,13 @@ void Player_Update(Actor* thisx, PlayState* play) {
MREG(54) = this->actor.world.pos.z;
MREG(55) = this->actor.world.rot.y;
switch (GameInteractor_LinkSize()) {
switch (GameInteractor_GetLinkSize()) {
case GI_LINK_SIZE_RESET:
this->actor.scale.x = 0.01f;
this->actor.scale.y = 0.01f;
this->actor.scale.z = 0.01f;
GameInteractor_SetLinkSize(GI_LINK_SIZE_NORMAL);
break;
case GI_LINK_SIZE_GIANT:
this->actor.scale.x = 0.02f;
this->actor.scale.y = 0.02f;
@ -11013,9 +11019,6 @@ void Player_Update(Actor* thisx, PlayState* play) {
break;
case GI_LINK_SIZE_NORMAL:
default:
this->actor.scale.x = 0.01f;
this->actor.scale.y = 0.01f;
this->actor.scale.z = 0.01f;
break;
}