OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-02-23 15:38:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Merge branch 'production'

Browse Source
This commit is contained in:
Oskar Wiksten
2012-09-13 19:09:28 +02:00
parent 7c839ef3d7 05b2f7ee04
commit cd5ec26f94
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
View File

@@ -62,6 +62,7 @@ public final class ConversationActivity extends Activity implements OnKeyListene
private OnCheckedChangeListener radioButtonListener;
private boolean displayActors = true;
private boolean applyPhraseRewards = true;
private boolean hasResumed = false;
private final ConversationCollection conversationCollection = new ConversationCollection();
@@ -136,7 +137,10 @@ public final class ConversationActivity extends Activity implements OnKeyListene
protected void onResume() {
super.onResume();
setPhrase(phraseID);
if (!hasResumed) {
setPhrase(phraseID);
hasResumed = true;
}
applyPhraseRewards = true;
nextButton.requestFocus();
}
@@ -204,7 +208,7 @@ public final class ConversationActivity extends Activity implements OnKeyListene
}
}
public void setPhrase(String phraseID) {
private void setPhrase(String phraseID) {
this.phraseID = phraseID;
if (phraseID.equalsIgnoreCase(ConversationCollection.PHRASE_CLOSE)) {
ConversationActivity.this.finish();