From 1df5d183dcc69d0af1562b501be34480f05c76f4 Mon Sep 17 00:00:00 2001 From: Oskar Wiksten Date: Sun, 12 May 2013 13:14:08 +0200 Subject: [PATCH] Bugfix: Apply checks for whether the player can select replies on single "next" replies as well. --- .../rpg/AndorsTrail/controller/ConversationController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java index 654924205..047703952 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java @@ -280,8 +280,10 @@ public final class ConversationController { public boolean hasOnlyOneNextReply() { if (currentPhrase.replies == null) return false; if (currentPhrase.replies.length != 1) return false; - if (currentPhrase.replies[0].text.equals(ConversationCollection.REPLY_NEXT)) return true; - return false; + final Reply singleReply = currentPhrase.replies[0]; + if (!singleReply.text.equals(ConversationCollection.REPLY_NEXT)) return false; + if (!canSelectReply(player, singleReply)) return false; + return true; } } }