Skip to content

Commit e90a773

Browse files
author
Henning Berge
committed
getVarbitMorphIndex
1 parent 9cad746 commit e90a773

File tree

5 files changed

+12
-6
lines changed

5 files changed

+12
-6
lines changed

src/main/java/com/jagex/runescape/ClientScriptRunner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ public static void runClientScripts(Object[] listeners, int arg1, int arg2, Game
398398
}
399399
if(scriptOpcode == 25) {
400400
int operand = intOperands[scriptIndex];
401-
scriptIntValues[intValueIndex++] = VarbitDefinition.getVarbitObjectMorphIndex(operand);
401+
scriptIntValues[intValueIndex++] = VarbitDefinition.getVarbitMorphIndex(operand);
402402
continue;
403403
}
404404
if(scriptOpcode == 27) {

src/main/java/com/jagex/runescape/cache/cs/ClientScript.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public static int parseClientScripts(int scriptIndex, boolean arg1, GameInterfac
175175
}
176176
if (opcode == 14) {
177177
int i_28_ = opcodes[scriptDataIndex++];
178-
i_16_ = VarbitDefinition.getVarbitObjectMorphIndex(i_28_);
178+
i_16_ = VarbitDefinition.getVarbitMorphIndex(i_28_);
179179
}
180180
if (opcode == 18) {
181181
i_16_ = (Player.localPlayer.worldX >> 7) + SpotAnimDefinition.baseX;

src/main/java/com/jagex/runescape/cache/def/ActorDefinition.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public boolean method571(int arg0) {
199199
}
200200
int i = arg0;
201201
if(varBitId != -1) {
202-
i = VarbitDefinition.getVarbitObjectMorphIndex(varBitId);
202+
i = VarbitDefinition.getVarbitMorphIndex(varBitId);
203203
} else if(varpIndex != -1) {
204204
i = GroundItemTile.varbitMasks[varpIndex];
205205
}
@@ -341,7 +341,7 @@ public Model getHeadModel() {
341341
public ActorDefinition getChildDefinition(int arg0) {
342342
int childId = arg0;
343343
if(varBitId != -1) {
344-
childId = VarbitDefinition.getVarbitObjectMorphIndex(varBitId);
344+
childId = VarbitDefinition.getVarbitMorphIndex(varBitId);
345345
} else if(varpIndex != -1) {
346346
childId = GroundItemTile.varbitMasks[varpIndex];
347347
}

src/main/java/com/jagex/runescape/cache/def/GameObjectDefinition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ public GameObjectDefinition getChildDefinition() {
552552
i = GroundItemTile.varbitMasks[configId];
553553
}
554554
} else {
555-
i = VarbitDefinition.getVarbitObjectMorphIndex(varbitId);
555+
i = VarbitDefinition.getVarbitMorphIndex(varbitId);
556556

557557
}
558558
if(i < 0 || configChangeDest.length <= i || configChangeDest[i] == -1) {

src/main/java/com/jagex/runescape/cache/def/VarbitDefinition.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,17 @@ public static VarbitDefinition getDefinition(int varbitId) {
3333
return varbitDefinition;
3434
}
3535

36-
public static int getVarbitObjectMorphIndex(int varbitId) {
36+
/**
37+
* Returns the index to morph actor/object into, based on set config
38+
* @param varbitId
39+
* @return index to morph into
40+
*/
41+
public static int getVarbitMorphIndex(int varbitId) {
3742
VarbitDefinition varbitDefinition = getDefinition(varbitId);
3843
int mostSignificantBit = varbitDefinition.mostSignificantBit;
3944
int configId = varbitDefinition.index;
4045
int leastSignificantBit = varbitDefinition.leastSignificantBit;
46+
// TODO: Unknown
4147
int i_8_ = ProducingGraphicsBuffer_Sub1.anIntArray2199[mostSignificantBit - leastSignificantBit];
4248
return GroundItemTile.varbitMasks[configId] >> leastSignificantBit & i_8_;
4349
}

0 commit comments

Comments
 (0)