Merge pull request #3007 from ReeeMan/master

api: rename getRsOrientation -> getModelOrientation inline with upstream
This commit is contained in:
ThatGamerBlue
2021-06-30 06:52:03 +01:00
committed by GitHub
2 changed files with 4 additions and 4 deletions

View File

@@ -97,7 +97,7 @@ public abstract class RSGameObjectMixin implements RSGameObject
@Override
public Shape getClickbox()
{
return Perspective.getClickbox(client, getModel(), getRsOrientation(), getLocalLocation());
return Perspective.getClickbox(client, getModel(), getModelOrientation(), getLocalLocation());
}
@Inject
@@ -113,14 +113,14 @@ public abstract class RSGameObjectMixin implements RSGameObject
int tileHeight = Perspective.getTileHeight(client, new LocalPoint(getX(), getY()), client.getPlane());
return model.getConvexHull(getX(), getY(), getRsOrientation(), tileHeight);
return model.getConvexHull(getX(), getY(), getModelOrientation(), tileHeight);
}
@Override
@Inject
public Angle getOrientation()
{
int orientation = getRsOrientation();
int orientation = getModelOrientation();
int rotation = (getFlags() >> 6) & 3;
return new Angle(rotation * 512 + orientation);
}

View File

@@ -32,7 +32,7 @@ public interface RSGameObject extends GameObject
int getHeight();
@Import("orientation")
int getRsOrientation();
int getModelOrientation();
@Import("tag")
@Override