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

Refactor conversations to state machine - minor bugfixes for "next" button disabling.

Browse Source
This commit is contained in:
Oskar Wiksten
2013-02-22 14:09:31 +01:00
parent 2da410118e
commit 9fd5508070
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java
View File

@@ -87,13 +87,15 @@ public final class Dialogs {
}
public static void addMonsterIdentifiers(Intent intent, Monster monster) {
addMonsterIdentifiers(intent.getExtras(), monster);
if (monster == null) return;
intent.putExtra("x", monster.position.x);
intent.putExtra("y", monster.position.y);
}
public static void addMonsterIdentifiers(Bundle bundle, Monster monster) {
if (monster == null) return;
bundle.putInt("x", monster.position.x);
bundle.putInt("y", monster.position.y);
}
if (monster == null) return;
bundle.putInt("x", monster.position.x);
bundle.putInt("y", monster.position.y);
}
public static Monster getMonsterFromIntent(Intent intent, final WorldContext world) {
return getMonsterFromBundle(intent.getExtras(), world);

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

@@ -91,8 +91,9 @@ public final class ConversationActivity extends Activity implements OnKeyListene
nextButtonClicked();
}
});
nextButton.setEnabled(false);
statementList.setOnKeyListener(this);
statementList.setOnKeyListener(this);
statementList.setSelected(false);
statementList.setFocusable(false);
@@ -193,11 +194,12 @@ public final class ConversationActivity extends Activity implements OnKeyListene
}
private void nextButtonClicked() {
RadioButton rb = getSelectedReplyButton();
replyGroup.removeAllViews();
if (conversationState.hasOnlyOneNextReply()) {
nextButton.setEnabled(false);
if (conversationState.hasOnlyOneNextReply()) {
conversationState.playerSelectedNextStep();
} else {
RadioButton rb = getSelectedReplyButton();
if (rb == null) return;
Reply r = (Reply) rb.getTag();
addConversationStatement(player, rb.getText().toString());
@@ -391,7 +393,5 @@ public final class ConversationActivity extends Activity implements OnKeyListene
rb.setFocusable(false);
rb.setFocusableInTouchMode(false);
replyGroup.addView(rb, layoutParams);
nextButton.setEnabled(false);
}
}