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

Yet more formatting changes. Should be just about compliant with the standard.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3138 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Andrzej Kapolka
2004-10-15 03:09:46 +00:00
parent 0b0fcf9d15
commit 8ad2aefdf2
9 changed files with 97 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/media/sprite/OrientableImageSprite.java
+2 -3
View File
@@ -1,5 +1,5 @@
// //
// $Id: OrientableImageSprite.java,v 1.3 2004/10/15 00:59:53 andrzej Exp $ // $Id: OrientableImageSprite.java,v 1.4 2004/10/15 03:09:46 andrzej Exp $
// //
// Narya library - tools for developing networked games // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -75,8 +75,7 @@ public class OrientableImageSprite extends ImageSprite
{ {
double theta; double theta;
switch(_orient) switch(_orient) {
{
case NORTH: case NORTH:
default: default:
theta = 0.0; theta = 0.0;
src/java/com/threerings/parlor/card/client/CardGameController.java
+2 -3
View File
@@ -1,5 +1,5 @@
// //
// $Id: CardGameController.java,v 1.2 2004/10/15 00:14:23 andrzej Exp $ // $Id: CardGameController.java,v 1.3 2004/10/15 03:09:46 andrzej Exp $
// //
// Narya library - tools for developing networked games // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -54,8 +54,7 @@ public abstract class CardGameController extends GameController
// Documentation inherited // Documentation inherited
public void messageReceived (MessageEvent event) public void messageReceived (MessageEvent event)
{ {
if(event.getName().equals(TAKE_HAND)) if(event.getName().equals(TAKE_HAND)) {
{
handDealt((Hand)event.getArgs()[0]); handDealt((Hand)event.getArgs()[0]);
} }
} }
src/java/com/threerings/parlor/card/client/CardPanel.java
+59 -75
View File
@@ -1,5 +1,5 @@
// //
// $Id: CardPanel.java,v 1.2 2004/10/15 00:14:23 andrzej Exp $ // $Id: CardPanel.java,v 1.3 2004/10/15 03:09:46 andrzej Exp $
// //
// Narya library - tools for developing networked games // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -52,9 +52,6 @@ public abstract class CardPanel extends VirtualMediaPanel
/** Calls CardSpriteObserver.cardSpriteClicked. */ /** Calls CardSpriteObserver.cardSpriteClicked. */
protected static class CardSpriteClickedOp implements ObserverList.ObserverOp protected static class CardSpriteClickedOp implements ObserverList.ObserverOp
{ {
protected CardSprite _sprite;
protected MouseEvent _me;
public CardSpriteClickedOp (CardSprite sprite, MouseEvent me) public CardSpriteClickedOp (CardSprite sprite, MouseEvent me)
{ {
_sprite = sprite; _sprite = sprite;
@@ -66,14 +63,14 @@ public abstract class CardPanel extends VirtualMediaPanel
((CardSpriteObserver)observer).cardSpriteClicked(_sprite, _me); ((CardSpriteObserver)observer).cardSpriteClicked(_sprite, _me);
return true; return true;
} }
protected CardSprite _sprite;
protected MouseEvent _me;
} }
/** Calls CardSpriteObserver.cardSpriteDragged. */ /** Calls CardSpriteObserver.cardSpriteDragged. */
protected static class CardSpriteDraggedOp implements ObserverList.ObserverOp protected static class CardSpriteDraggedOp implements ObserverList.ObserverOp
{ {
protected CardSprite _sprite;
protected MouseEvent _me;
public CardSpriteDraggedOp (CardSprite sprite, MouseEvent me) public CardSpriteDraggedOp (CardSprite sprite, MouseEvent me)
{ {
_sprite = sprite; _sprite = sprite;
@@ -85,6 +82,9 @@ public abstract class CardPanel extends VirtualMediaPanel
((CardSpriteObserver)observer).cardSpriteDragged(_sprite, _me); ((CardSpriteObserver)observer).cardSpriteDragged(_sprite, _me);
return true; return true;
} }
protected CardSprite _sprite;
protected MouseEvent _me;
} }
@@ -97,93 +97,77 @@ public abstract class CardPanel extends VirtualMediaPanel
{ {
super(frameManager); super(frameManager);
addMouseListener( MouseAdapter ma = new MouseAdapter() {
new MouseAdapter() public void mousePressed (MouseEvent me) {
{ ArrayList al = new ArrayList();
public void mousePressed (MouseEvent me)
{
ArrayList al = new ArrayList();
_spritemgr.getHitSprites(al, me.getX(), me.getY()); _spritemgr.getHitSprites(al, me.getX(), me.getY());
if(al.size() > 0) if(al.size() > 0) {
{ Iterator it = al.iterator();
Iterator it = al.iterator(); int highestLayer = Integer.MIN_VALUE;
int highestLayer = Integer.MIN_VALUE; CardSprite highestSprite = null;
CardSprite highestSprite = null;
while(it.hasNext()) while(it.hasNext()) {
{ Sprite sprite = (Sprite)it.next();
Sprite sprite = (Sprite)it.next();
if(sprite instanceof CardSprite) if(sprite instanceof CardSprite) {
{ CardSprite cs = (CardSprite)sprite;
CardSprite cs = (CardSprite)sprite;
if(cs.getRenderOrder() > highestLayer) if(cs.getRenderOrder() > highestLayer) {
{ highestLayer = cs.getRenderOrder();
highestLayer = cs.getRenderOrder(); highestSprite = cs;
highestSprite = cs;
}
} }
} }
}
_activeCardSprite = highestSprite; _activeCardSprite = highestSprite;
if(_activeCardSprite != null) if(_activeCardSprite != null) {
{ _handleX = _activeCardSprite.getX() - me.getX();
_handleX = _activeCardSprite.getX() - me.getX(); _handleY = _activeCardSprite.getY() - me.getY();
_handleY = _activeCardSprite.getY() - me.getY();
_hasBeenDragged = false; _hasBeenDragged = false;
}
}
else
{
_activeCardSprite = null;
} }
} }
else {
public void mouseReleased (MouseEvent me) _activeCardSprite = null;
{
if(_activeCardSprite != null && _hasBeenDragged)
{
_activeCardSprite.queueNotification(
new CardSpriteDraggedOp(_activeCardSprite, me)
);
}
} }
}
public void mouseClicked (MouseEvent me) public void mouseReleased (MouseEvent me) {
{ if(_activeCardSprite != null && _hasBeenDragged) {
if(_activeCardSprite != null) _activeCardSprite.queueNotification(
{ new CardSpriteDraggedOp(_activeCardSprite, me)
_activeCardSprite.queueNotification( );
new CardSpriteClickedOp(_activeCardSprite, me)
);
}
} }
} }
); public void mouseClicked (MouseEvent me) {
if(_activeCardSprite != null) {
_activeCardSprite.queueNotification(
new CardSpriteClickedOp(_activeCardSprite, me)
);
}
}
};
addMouseListener(ma);
addMouseMotionListener( MouseMotionAdapter mma = new MouseMotionAdapter() {
new MouseMotionAdapter() public void mouseDragged (MouseEvent me)
{ {
public void mouseDragged (MouseEvent me) if(_activeCardSprite != null &&
{ _activeCardSprite.isDraggable()) {
if(_activeCardSprite != null && _activeCardSprite.setLocation(
_activeCardSprite.isDraggable()) me.getX() + _handleX,
{ me.getY() + _handleY
_activeCardSprite.setLocation( );
me.getX() + _handleX,
me.getY() + _handleY
);
_hasBeenDragged = true; _hasBeenDragged = true;
}
} }
} }
); };
addMouseMotionListener(mma);
} }
/** /**
src/java/com/threerings/parlor/card/data/Card.java
+10 -19
View File
@@ -1,5 +1,5 @@
// //
// $Id: Card.java,v 1.3 2004/10/15 00:14:23 andrzej Exp $ // $Id: Card.java,v 1.4 2004/10/15 03:09:46 andrzej Exp $
// //
// Narya library - tools for developing networked games // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -125,8 +125,7 @@ public class Card implements CardCodes,
// Documentation inherited. // Documentation inherited.
public Comparable getKey () public Comparable getKey ()
{ {
if(_key == null) if(_key == null) {
{
_key = new Byte(_value); _key = new Byte(_value);
} }
@@ -151,12 +150,10 @@ public class Card implements CardCodes,
*/ */
public boolean equals (Object other) public boolean equals (Object other)
{ {
if(other instanceof Card) if(other instanceof Card) {
{
return _value == ((Card)other)._value; return _value == ((Card)other)._value;
} }
else else {
{
return false; return false;
} }
} }
@@ -170,22 +167,17 @@ public class Card implements CardCodes,
{ {
int number = getNumber(); int number = getNumber();
if(number == JOKER) if(number == JOKER) {
{
return "Jk"; return "Jk";
} }
else else {
{
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
if(number >= 2 && number <= 9) if(number >= 2 && number <= 9) {
{
sb.append(Integer.toString(number)); sb.append(Integer.toString(number));
} }
else else {
{ switch(number) {
switch(number)
{
case 10: sb.append('T'); break; case 10: sb.append('T'); break;
case JACK: sb.append('J'); break; case JACK: sb.append('J'); break;
case QUEEN: sb.append('Q'); break; case QUEEN: sb.append('Q'); break;
@@ -195,8 +187,7 @@ public class Card implements CardCodes,
} }
} }
switch(getSuit()) switch(getSuit()) {
{
case HEARTS: sb.append('h'); break; case HEARTS: sb.append('h'); break;
case DIAMONDS: sb.append('d'); break; case DIAMONDS: sb.append('d'); break;
case CLUBS: sb.append('c'); break; case CLUBS: sb.append('c'); break;
src/java/com/threerings/parlor/card/data/Deck.java
+7 -13
View File
@@ -1,5 +1,5 @@
// //
// $Id: Deck.java,v 1.2 2004/10/15 00:14:23 andrzej Exp $ // $Id: Deck.java,v 1.3 2004/10/15 03:09:46 andrzej Exp $
// //
// Narya library - tools for developing networked games // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -72,16 +72,13 @@ public class Deck implements CardCodes,
{ {
cards.clear(); cards.clear();
for(int i=HEARTS;i<=SPADES;i++) for(int i=HEARTS;i<=SPADES;i++) {
{ for(int j=2;j<=ACE;j++) {
for(int j=2;j<=ACE;j++)
{
cards.add(new Card(j, i)); cards.add(new Card(j, i));
} }
} }
if(includeJokers) if(includeJokers) {
{
cards.add(new Card(JOKER, -1)); cards.add(new Card(JOKER, -1));
cards.add(new Card(JOKER, -1)); cards.add(new Card(JOKER, -1));
} }
@@ -104,16 +101,13 @@ public class Deck implements CardCodes,
*/ */
public Hand dealHand (int size) public Hand dealHand (int size)
{ {
if(cards.size() < size) if(cards.size() < size) {
{
return null; return null;
} }
else else {
{
Hand hand = new Hand(); Hand hand = new Hand();
for(int i=0;i<size;i++) for(int i=0;i<size;i++) {
{
hand.cards.add(cards.get(cards.size()-1)); hand.cards.add(cards.get(cards.size()-1));
cards.remove(cards.size()-1); cards.remove(cards.size()-1);
} }
src/java/com/threerings/parlor/card/data/Hand.java
+3 -5
View File
@@ -1,5 +1,5 @@
// //
// $Id: Hand.java,v 1.2 2004/10/15 00:14:23 andrzej Exp $ // $Id: Hand.java,v 1.3 2004/10/15 03:09:46 andrzej Exp $
// //
// Narya library - tools for developing networked games // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -57,10 +57,8 @@ public class Hand implements CardCodes,
Iterator it = cards.iterator(); Iterator it = cards.iterator();
while(it.hasNext()) while(it.hasNext()) {
{ if(((Card)it.next()).getSuit() == suit) {
if(((Card)it.next()).getSuit() == suit)
{
members++; members++;
} }
} }
src/java/com/threerings/parlor/card/server/CardGameManager.java
+6 -11
View File
@@ -1,5 +1,5 @@
// //
// $Id: CardGameManager.java,v 1.3 2004/10/15 00:14:23 andrzej Exp $ // $Id: CardGameManager.java,v 1.4 2004/10/15 03:09:46 andrzej Exp $
// //
// Narya library - tools for developing networked games // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -50,12 +50,10 @@ public class CardGameManager extends GameManager
*/ */
public Hand dealHand (Deck deck, int size, int playerIndex) public Hand dealHand (Deck deck, int size, int playerIndex)
{ {
if(deck.cards.size() < size) if(deck.cards.size() < size) {
{
return null; return null;
} }
else else {
{
Hand hand = deck.dealHand(size); Hand hand = deck.dealHand(size);
_omgr.postEvent( _omgr.postEvent(
@@ -82,16 +80,13 @@ public class CardGameManager extends GameManager
*/ */
public Hand[] dealHands (Deck deck, int size) public Hand[] dealHands (Deck deck, int size)
{ {
if(deck.cards.size() < size * _playerCount) if(deck.cards.size() < size * _playerCount) {
{
return null; return null;
} }
else else {
{
Hand[] hands = new Hand[_playerCount]; Hand[] hands = new Hand[_playerCount];
for(int i=0;i<_playerCount;i++) for(int i=0;i<_playerCount;i++) {
{
hands[i] = dealHand(deck, size, i); hands[i] = dealHand(deck, size, i);
} }
src/java/com/threerings/parlor/card/trick/TrickCardGameControllerDelegate.java
+3 -5
View File
@@ -1,5 +1,5 @@
// //
// $Id: TrickCardGameControllerDelegate.java,v 1.2 2004/10/15 00:14:23 andrzej Exp $ // $Id: TrickCardGameControllerDelegate.java,v 1.3 2004/10/15 03:09:46 andrzej Exp $
// //
// Narya library - tools for developing networked games // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -50,12 +50,10 @@ public class TrickCardGameControllerDelegate extends TurnGameControllerDelegate
TrickCardGameObject tcgObj = (TrickCardGameObject)_gameObj; TrickCardGameObject tcgObj = (TrickCardGameObject)_gameObj;
if(ace.getName().equals(tcgObj.getPlayingHandFieldName())) if(ace.getName().equals(tcgObj.getPlayingHandFieldName())) {
{
_tcgctrl.playingHandDidChange(tcgObj.getPlayingHand()); _tcgctrl.playingHandDidChange(tcgObj.getPlayingHand());
} }
else if(ace.getName().equals(tcgObj.getPlayingTrickFieldName())) else if(ace.getName().equals(tcgObj.getPlayingTrickFieldName())) {
{
_tcgctrl.playingTrickDidChange(tcgObj.getPlayingTrick()); _tcgctrl.playingTrickDidChange(tcgObj.getPlayingTrick());
} }
} }
src/java/com/threerings/parlor/card/trick/TrickCardGameManagerDelegate.java
+5 -9
View File
@@ -1,5 +1,5 @@
// //
// $Id: TrickCardGameManagerDelegate.java,v 1.2 2004/10/15 00:14:23 andrzej Exp $ // $Id: TrickCardGameManagerDelegate.java,v 1.3 2004/10/15 03:09:46 andrzej Exp $
// //
// Narya library - tools for developing networked games // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -48,12 +48,10 @@ public class TrickCardGameManagerDelegate extends TurnGameManagerDelegate
// Documentation inherited. // Documentation inherited.
public void setFirstTurnHolder () public void setFirstTurnHolder ()
{ {
if(_trickCardGame.getPlayingHand() && _trickCardGame.getPlayingTrick()) if(_trickCardGame.getPlayingHand() && _trickCardGame.getPlayingTrick()) {
{
super.setFirstTurnHolder(); super.setFirstTurnHolder();
} }
else else {
{
_turnIdx = -1; _turnIdx = -1;
} }
} }
@@ -61,12 +59,10 @@ public class TrickCardGameManagerDelegate extends TurnGameManagerDelegate
// Documentation inherited. // Documentation inherited.
public void setNextTurnHolder () public void setNextTurnHolder ()
{ {
if(_trickCardGame.getPlayingHand() && _trickCardGame.getPlayingTrick()) if(_trickCardGame.getPlayingHand() && _trickCardGame.getPlayingTrick()) {
{
super.setNextTurnHolder(); super.setNextTurnHolder();
} }
else else {
{
_turnIdx = -1; _turnIdx = -1;
} }
} }