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/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
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -54,8 +54,7 @@ public abstract class CardGameController extends GameController
// Documentation inherited
public void messageReceived (MessageEvent event)
{
if(event.getName().equals(TAKE_HAND))
{
if(event.getName().equals(TAKE_HAND)) {
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
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -52,9 +52,6 @@ public abstract class CardPanel extends VirtualMediaPanel
/** Calls CardSpriteObserver.cardSpriteClicked. */
protected static class CardSpriteClickedOp implements ObserverList.ObserverOp
{
protected CardSprite _sprite;
protected MouseEvent _me;
public CardSpriteClickedOp (CardSprite sprite, MouseEvent me)
{
_sprite = sprite;
@@ -66,14 +63,14 @@ public abstract class CardPanel extends VirtualMediaPanel
((CardSpriteObserver)observer).cardSpriteClicked(_sprite, _me);
return true;
}
protected CardSprite _sprite;
protected MouseEvent _me;
}
/** Calls CardSpriteObserver.cardSpriteDragged. */
protected static class CardSpriteDraggedOp implements ObserverList.ObserverOp
{
protected CardSprite _sprite;
protected MouseEvent _me;
public CardSpriteDraggedOp (CardSprite sprite, MouseEvent me)
{
_sprite = sprite;
@@ -85,6 +82,9 @@ public abstract class CardPanel extends VirtualMediaPanel
((CardSpriteObserver)observer).cardSpriteDragged(_sprite, _me);
return true;
}
protected CardSprite _sprite;
protected MouseEvent _me;
}
@@ -97,93 +97,77 @@ public abstract class CardPanel extends VirtualMediaPanel
{
super(frameManager);
addMouseListener(
new MouseAdapter()
{
public void mousePressed (MouseEvent me)
{
ArrayList al = new ArrayList();
MouseAdapter ma = new MouseAdapter() {
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)
{
Iterator it = al.iterator();
int highestLayer = Integer.MIN_VALUE;
CardSprite highestSprite = null;
if(al.size() > 0) {
Iterator it = al.iterator();
int highestLayer = Integer.MIN_VALUE;
CardSprite highestSprite = null;
while(it.hasNext())
{
Sprite sprite = (Sprite)it.next();
while(it.hasNext()) {
Sprite sprite = (Sprite)it.next();
if(sprite instanceof CardSprite)
{
CardSprite cs = (CardSprite)sprite;
if(sprite instanceof CardSprite) {
CardSprite cs = (CardSprite)sprite;
if(cs.getRenderOrder() > highestLayer)
{
highestLayer = cs.getRenderOrder();
highestSprite = cs;
}
if(cs.getRenderOrder() > highestLayer) {
highestLayer = cs.getRenderOrder();
highestSprite = cs;
}
}
}
_activeCardSprite = highestSprite;
if(_activeCardSprite != null)
{
_handleX = _activeCardSprite.getX() - me.getX();
_handleY = _activeCardSprite.getY() - me.getY();
_activeCardSprite = highestSprite;
if(_activeCardSprite != null) {
_handleX = _activeCardSprite.getX() - me.getX();
_handleY = _activeCardSprite.getY() - me.getY();
_hasBeenDragged = false;
}
}
else
{
_activeCardSprite = null;
_hasBeenDragged = false;
}
}
public void mouseReleased (MouseEvent me)
{
if(_activeCardSprite != null && _hasBeenDragged)
{
_activeCardSprite.queueNotification(
new CardSpriteDraggedOp(_activeCardSprite, me)
);
}
else {
_activeCardSprite = null;
}
public void mouseClicked (MouseEvent me)
{
if(_activeCardSprite != null)
{
_activeCardSprite.queueNotification(
new CardSpriteClickedOp(_activeCardSprite, me)
);
}
}
public void mouseReleased (MouseEvent me) {
if(_activeCardSprite != null && _hasBeenDragged) {
_activeCardSprite.queueNotification(
new CardSpriteDraggedOp(_activeCardSprite, me)
);
}
}
);
public void mouseClicked (MouseEvent me) {
if(_activeCardSprite != null) {
_activeCardSprite.queueNotification(
new CardSpriteClickedOp(_activeCardSprite, me)
);
}
}
};
addMouseListener(ma);
addMouseMotionListener(
new MouseMotionAdapter()
MouseMotionAdapter mma = new MouseMotionAdapter() {
public void mouseDragged (MouseEvent me)
{
public void mouseDragged (MouseEvent me)
{
if(_activeCardSprite != null &&
_activeCardSprite.isDraggable())
{
_activeCardSprite.setLocation(
me.getX() + _handleX,
me.getY() + _handleY
);
if(_activeCardSprite != null &&
_activeCardSprite.isDraggable()) {
_activeCardSprite.setLocation(
me.getX() + _handleX,
me.getY() + _handleY
);
_hasBeenDragged = true;
}
_hasBeenDragged = true;
}
}
);
};
addMouseMotionListener(mma);
}
/**