From 9af294932fcad071d35a6c53c49d1233c6dd7c76 Mon Sep 17 00:00:00 2001 From: Oskar Wiksten Date: Wed, 25 Sep 2013 22:30:10 +0200 Subject: [PATCH] Remove unused code --- AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java | 1 + .../controller/ConversationStatemachine.java | 11 ----------- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationStatemachine.java diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java index 9598dc618..ffe0168db 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java @@ -65,6 +65,7 @@ public final class Dialogs { public static void showConversation(final MainActivity currentActivity, final ControllerContext context, final String phraseID, final Monster npc) { showConversation(currentActivity, context, phraseID, npc, true); } + private static void showConversation(final MainActivity currentActivity, final ControllerContext context, final String phraseID, final Monster npc, boolean giveRewardsForFirstPhrase) { context.gameRoundController.pause(); Intent intent = new Intent(currentActivity, ConversationActivity.class); diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationStatemachine.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationStatemachine.java deleted file mode 100644 index ef31dbaf2..000000000 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationStatemachine.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.gpl.rpg.AndorsTrail.controller; - -/** - * Created with IntelliJ IDEA. - * User: oskar - * Date: 8/7/13 - * Time: 3:26 PM - * To change this template use File | Settings | File Templates. - */ -public class ConversationStatemachine { -}