From 1da4d4b1e5a4f9d8c4251278f157b12a98ad8045 Mon Sep 17 00:00:00 2001 From: Patrick MacAlpine Date: Sun, 31 May 2015 14:02:04 -0500 Subject: [PATCH 1/2] Fixing select agent in drawing protocol where the second byte of the command was not being evaluated --- src/rv/comm/drawing/commands/Control.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/rv/comm/drawing/commands/Control.java b/src/rv/comm/drawing/commands/Control.java index 17f567dc..316a36f9 100644 --- a/src/rv/comm/drawing/commands/Control.java +++ b/src/rv/comm/drawing/commands/Control.java @@ -1,6 +1,7 @@ package rv.comm.drawing.commands; import java.nio.ByteBuffer; +import js.io.ByteUtil; import rv.Viewer; import rv.world.objects.Agent; @@ -13,7 +14,17 @@ public class Control extends Command { public Control(ByteBuffer buf, Viewer viewer) { super(); this.viewer = viewer; - agent = Command.readAgent(buf, viewer.getWorldModel()); + + int type = ByteUtil.uValue(buf.get()); + + switch (type) { + case AGENT_SELECT: + agent = Command.readAgent(buf, viewer.getWorldModel()); + break; + default: + System.err.println("Unknown control : " + type); + agent = null; + } } @Override From 9a26bf1a4dd1e576bba26b06c22f91ce786d31e5 Mon Sep 17 00:00:00 2001 From: Patrick MacAlpine Date: Mon, 1 Jun 2015 14:27:02 -0500 Subject: [PATCH 2/2] Fixing file formatting --- src/rv/comm/drawing/commands/Control.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rv/comm/drawing/commands/Control.java b/src/rv/comm/drawing/commands/Control.java index 316a36f9..450f8432 100644 --- a/src/rv/comm/drawing/commands/Control.java +++ b/src/rv/comm/drawing/commands/Control.java @@ -15,12 +15,12 @@ public Control(ByteBuffer buf, Viewer viewer) { super(); this.viewer = viewer; - int type = ByteUtil.uValue(buf.get()); + int type = ByteUtil.uValue(buf.get()); switch (type) { - case AGENT_SELECT: - agent = Command.readAgent(buf, viewer.getWorldModel()); - break; + case AGENT_SELECT: + agent = Command.readAgent(buf, viewer.getWorldModel()); + break; default: System.err.println("Unknown control : " + type); agent = null;