From d65e9f30203bcc3fe847e5750b132f71cf43aaa8 Mon Sep 17 00:00:00 2001
From: Light2 <light_pswg@yahoo.com>
Date: Mon, 29 Jul 2013 23:09:20 +0200
Subject: [PATCH] Fixed radial option ids that were larger than 127 (signed
 byte limit)

---
 .../swg/objectControllerObjects/ObjectMenuResponse.java   | 3 +--
 src/resources/common/RadialOptions.java                   | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/protocol/swg/objectControllerObjects/ObjectMenuResponse.java b/src/protocol/swg/objectControllerObjects/ObjectMenuResponse.java
index 90eb1938..b4450dc9 100644
--- a/src/protocol/swg/objectControllerObjects/ObjectMenuResponse.java
+++ b/src/protocol/swg/objectControllerObjects/ObjectMenuResponse.java
@@ -77,8 +77,7 @@ public class ObjectMenuResponse extends ObjControllerObject {
 			for(RadialOptions radialOption : radialOptions) {
 				result.put(counter++);
 				result.put(radialOption.getParentId());
-				result.put(radialOption.getOptionId());
-				result.put((byte) 0);
+				result.putShort(radialOption.getOptionId());
 				result.put(radialOption.getOptionType());
 
 				if(radialOption.getDescription().length() > 0)
diff --git a/src/resources/common/RadialOptions.java b/src/resources/common/RadialOptions.java
index 03b4e20e..409766ab 100644
--- a/src/resources/common/RadialOptions.java
+++ b/src/resources/common/RadialOptions.java
@@ -277,11 +277,11 @@ public class RadialOptions {
     public static int StopManufacture	= 252;
     
 	private byte parentId;
-	private byte optionId;
+	private short optionId;
 	private byte optionType;
 	private String description;
     
-    public RadialOptions(byte parentId, byte optionId, byte optionType, String description) {
+    public RadialOptions(byte parentId, short optionId, byte optionType, String description) {
     	this.setParentId(parentId);
     	this.setOptionId(optionId);
     	this.setOptionType(optionType);
@@ -300,11 +300,11 @@ public class RadialOptions {
 		this.parentId = parentId;
 	}
 
-	public byte getOptionId() {
+	public short getOptionId() {
 		return optionId;
 	}
 
-	public void setOptionId(byte optionId) {
+	public void setOptionId(short optionId) {
 		this.optionId = optionId;
 	}