AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Eliminated the hacky "play card" selection mode, since it's no longer necessary.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3537 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Andrzej Kapolka
2005-05-03 18:18:40 +00:00
parent d6e4fe20c3
commit 43a903c31c
1 changed files with 6 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/parlor/card/client/CardPanel.java
+6 -34
View File
@@ -61,14 +61,11 @@ public abstract class CardPanel extends VirtualMediaPanel
/** The selection mode in which cards are not selectable. */ /** The selection mode in which cards are not selectable. */
public static final int NONE = 0; public static final int NONE = 0;
/** The selection mode in which the user can play a single card. */
public static final int PLAY_SINGLE = 1;
/** The selection mode in which the user can select a single card. */ /** The selection mode in which the user can select a single card. */
public static final int SELECT_SINGLE = 2; public static final int SINGLE = 2;
/** The selection mode in which the user can select multiple cards. */ /** The selection mode in which the user can select multiple cards. */
public static final int SELECT_MULTIPLE = 3; public static final int MULTIPLE = 3;
/** /**
* A predicate class for {@link CardSprite}s. Provides control over which * A predicate class for {@link CardSprite}s. Provides control over which
@@ -87,11 +84,6 @@ public abstract class CardPanel extends VirtualMediaPanel
*/ */
public static interface CardSelectionObserver public static interface CardSelectionObserver
{ {
/**
* Called when a card has been played.
*/
public void cardSpritePlayed (CardSprite sprite);
/** /**
* Called when a card has been selected. * Called when a card has been selected.
*/ */
@@ -173,8 +165,8 @@ public abstract class CardPanel extends VirtualMediaPanel
} }
/** /**
* Sets the selection mode for the hand (NONE, PLAY_SINGLE, SELECT_SINGLE, * Sets the selection mode for the hand (NONE, PLAY_SINGLE, SINGLE,
* or SELECT_MULTIPLE). Changing the selection mode does not change the * or MULTIPLE). Changing the selection mode does not change the
* current selection. * current selection.
*/ */
public void setHandSelectionMode (int mode) public void setHandSelectionMode (int mode)
@@ -218,21 +210,6 @@ public abstract class CardPanel extends VirtualMediaPanel
new CardSprite[_selectedHandSprites.size()]); new CardSprite[_selectedHandSprites.size()]);
} }
/**
* Programmatically plays a sprite in the hand.
*/
public void playHandSprite (final CardSprite sprite)
{
// notify the observers
ObserverList.ObserverOp op = new ObserverList.ObserverOp() {
public boolean apply (Object obs) {
((CardSelectionObserver)obs).cardSpritePlayed(sprite);
return true;
}
};
_handSelectionObservers.apply(op);
}
/** /**
* Programmatically selects a sprite in the hand. * Programmatically selects a sprite in the hand.
*/ */
@@ -245,7 +222,7 @@ public abstract class CardPanel extends VirtualMediaPanel
// if in single card mode and there's another card selected, // if in single card mode and there's another card selected,
// deselect it // deselect it
if (_handSelectionMode == SELECT_SINGLE) { if (_handSelectionMode == SINGLE) {
CardSprite oldSprite = getSelectedHandSprite(); CardSprite oldSprite = getSelectedHandSprite();
if (oldSprite != null) { if (oldSprite != null) {
deselectHandSprite(oldSprite); deselectHandSprite(oldSprite);
@@ -966,12 +943,7 @@ public abstract class CardPanel extends VirtualMediaPanel
deselectHandSprite(sprite); deselectHandSprite(sprite);
} else if (_handSprites.contains(sprite) && isSelectable(sprite)) { } else if (_handSprites.contains(sprite) && isSelectable(sprite)) {
if (_handSelectionMode == PLAY_SINGLE) { selectHandSprite(sprite);
playHandSprite(sprite);
} else {
selectHandSprite(sprite);
}
} }
} }