You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(40) |
Jun
(24) |
Jul
(1) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: <sma...@us...> - 2002-08-25 19:36:16
|
Update of /cvsroot/netwar/netwar/mapperxx
In directory usw-pr-cvs1:/tmp/cvs-serv7244/netwar/mapperxx
Modified Files:
ObjectChooser.java
Log Message:
fixed a bug that arose from the renaming-old-days
Index: ObjectChooser.java
===================================================================
RCS file: /cvsroot/netwar/netwar/mapperxx/ObjectChooser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ObjectChooser.java 2 May 2002 11:26:55 -0000 1.1
--- ObjectChooser.java 25 Aug 2002 19:36:13 -0000 1.2
***************
*** 73,82 ****
private void OK(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_OK
! unitName = "netwar.game.object." + jComboBox1.getSelectedItem().toString();
setVisible(false);
dispose();
}//GEN-LAST:event_OK
private void populateList() {
! String list[] = netwar.utils.Dir.directoryList("game/object");
if(list != null)
for(int t = 0; t < list.length; t++)
--- 73,82 ----
private void OK(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_OK
! unitName = "netwar.game.objects." + jComboBox1.getSelectedItem().toString();
setVisible(false);
dispose();
}//GEN-LAST:event_OK
private void populateList() {
! String list[] = netwar.utils.Dir.directoryList("game/objects");
if(list != null)
for(int t = 0; t < list.length; t++)
|
|
From: <is...@us...> - 2002-07-01 02:55:34
|
Update of /cvsroot/netwar/netwar/game/units In directory usw-pr-cvs1:/tmp/cvs-serv5902/game/units Removed Files: StealthFighter.java Log Message: This file is obsolete. It was removed from the game many versions ago, and now it will not compile right (it is out of date). --- StealthFighter.java DELETED --- |
|
From: <is...@us...> - 2002-06-28 19:50:36
|
Update of /cvsroot/netwar/netwar/game/structures In directory usw-pr-cvs1:/tmp/cvs-serv5806/game/structures Log Message: Directory /cvsroot/netwar/netwar/game/structures added to the repository |
|
From: <is...@us...> - 2002-06-28 19:49:13
|
Update of /cvsroot/netwar/netwar/game
In directory usw-pr-cvs1:/tmp/cvs-serv5172/game
Modified Files:
Player.java
Log Message:
Added a check to prevent an index out-of-bounds exception.
Index: Player.java
===================================================================
RCS file: /cvsroot/netwar/netwar/game/Player.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Player.java 31 May 2002 20:48:00 -0000 1.13
--- Player.java 28 Jun 2002 19:49:10 -0000 1.14
***************
*** 80,83 ****
--- 80,84 ----
*/
public static Player getLocal() {
+ if(localPNum == 0) return null;
return players[localPNum-1];
}
|
|
From: <is...@us...> - 2002-06-28 19:45:23
|
Update of /cvsroot/netwar/netwar/game
In directory usw-pr-cvs1:/tmp/cvs-serv3459/game
Modified Files:
SelfSortingMutualDistanceSquared.java
Log Message:
Added parenthesis for clarity.
(Was trying to fix a bug, but the bug was elsewhere. Ah, well. At least I found it
afterwards.)
Index: SelfSortingMutualDistanceSquared.java
===================================================================
RCS file: /cvsroot/netwar/netwar/game/SelfSortingMutualDistanceSquared.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SelfSortingMutualDistanceSquared.java 10 Jun 2002 03:24:48 -0000 1.9
--- SelfSortingMutualDistanceSquared.java 28 Jun 2002 19:45:19 -0000 1.10
***************
*** 62,66 ****
visi = youngVis;
! while(visi > 0 && distanceSquared < young.getVisionRangeSquared(visi - 1))
visi--;
if(visi != youngVis) {
--- 62,66 ----
visi = youngVis;
! while((visi > 0) && (distanceSquared < young.getVisionRangeSquared(visi - 1)))
visi--;
if(visi != youngVis) {
***************
*** 70,74 ****
visi = oldVis;
! while(visi > 0 && distanceSquared < old.getVisionRangeSquared(visi - 1))
visi--;
if(visi != oldVis) {
--- 70,74 ----
visi = oldVis;
! while((visi > 0) && (distanceSquared < old.getVisionRangeSquared(visi - 1)))
visi--;
if(visi != oldVis) {
***************
*** 154,160 ****
visi = youngVis;
! while(visi > 0 && distanceSquared < young.getVisionRangeSquared(visi - 1))
visi--;
! while(visi < 4 && distanceSquared > young.getVisionRangeSquared(visi))
visi++;
if(visi != youngVis) {
--- 154,160 ----
visi = youngVis;
! while((visi > 0) && (distanceSquared < young.getVisionRangeSquared(visi - 1)))
visi--;
! while((visi < 4) && (distanceSquared > young.getVisionRangeSquared(visi)))
visi++;
if(visi != youngVis) {
***************
*** 164,170 ****
visi = oldVis;
! while(visi > 0 && distanceSquared < old.getVisionRangeSquared(visi - 1))
visi--;
! while(visi < 4 && distanceSquared > old.getVisionRangeSquared(visi))
visi++;
if(visi != oldVis) {
--- 164,170 ----
visi = oldVis;
! while((visi > 0) && (distanceSquared < old.getVisionRangeSquared(visi - 1)))
visi--;
! while((visi < 4) && (distanceSquared > old.getVisionRangeSquared(visi)))
visi++;
if(visi != oldVis) {
|
|
From: <is...@us...> - 2002-06-28 19:42:19
|
Update of /cvsroot/netwar/netwar/game
In directory usw-pr-cvs1:/tmp/cvs-serv3133/game
Modified Files:
Base.java
Log Message:
Gave the Base a modest vision range, allowing it to see itself.
Index: Base.java
===================================================================
RCS file: /cvsroot/netwar/netwar/game/Base.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** Base.java 31 May 2002 20:48:57 -0000 1.34
--- Base.java 28 Jun 2002 19:42:16 -0000 1.35
***************
*** 587,590 ****
--- 587,593 ----
darkest.setCurrent(5 - level);
}
+
+ protected boolean isBlind() { return false; }
+ public float scanRangeSquared() { return 3600; }
}
|
|
From: <is...@us...> - 2002-06-28 19:37:02
|
Update of /cvsroot/netwar/netwar/game
In directory usw-pr-cvs1:/tmp/cvs-serv1162/game
Modified Files:
GameObject.java
Log Message:
Added some comments and accessor methods for x and y (hex coordinates).
Also, made isBlind() protected (it was default access).
This proved necessary in order to allow a GameObject which was not in the
netwar.game package to override the isBlind() method (Units were fine, because the super-class
(netwar.game.Unit) overrode the isBlind() method, and Unit was in the netwar.game
package). Without this change, all GameObjects that are not Units and are not the Base would
be blind.
Index: GameObject.java
===================================================================
RCS file: /cvsroot/netwar/netwar/game/GameObject.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** GameObject.java 25 Jun 2002 17:14:24 -0000 1.25
--- GameObject.java 28 Jun 2002 19:36:59 -0000 1.26
***************
*** 566,570 ****
}
//If two GameObjects both return true, don't make an SSMDS between them.
! boolean isBlind() {
return true;
}
--- 566,570 ----
}
//If two GameObjects both return true, don't make an SSMDS between them.
! protected boolean isBlind() {
return true;
}
***************
*** 613,617 ****
--- 613,623 ----
return (scanRangeSquared() * 9 / 4);
}
+ /** Used to allow synchronization of special commands (such as deploy) */
public void specialCommand(int info) {}
+ /** Accessor for x coordinate in hex grid */
+ public int getX() {return x;}
+ /** Accessor for y coordinate in hex grid */
+ public int getY() {return y;}
+
}
|
|
From: <is...@us...> - 2002-06-28 19:31:40
|
Update of /cvsroot/netwar/netwar/game
In directory usw-pr-cvs1:/tmp/cvs-serv30894/game
Modified Files:
Unit.java
Log Message:
Added two calls to ConfirmSubPlan in order to clear the direction of travel when a new
goal is set. (This should fix the bug where a unit is given a new destination and walks
one hex away from the destination before turning around). Also, made the isBlind() method
protected, to fix a bug in the ScannerTower (see GameObject for details)
Index: Unit.java
===================================================================
RCS file: /cvsroot/netwar/netwar/game/Unit.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Unit.java 25 Jun 2002 17:17:55 -0000 1.25
--- Unit.java 28 Jun 2002 19:31:32 -0000 1.26
***************
*** 78,81 ****
--- 78,82 ----
goalX = gx;
goalY = gy;
+ confirmSubPlan(goalX,goalY);
}
/** Sets the Unit to Pursuit Mode
***************
*** 89,92 ****
--- 90,94 ----
goalX = u.x;
goalY = u.y;
+ confirmSubPlan(goalX,goalY);
}
//Default update for a mobile unit.
***************
*** 616,619 ****
}
! boolean isBlind() { return false;}
}
--- 618,621 ----
}
! protected boolean isBlind() { return false;}
}
|
|
From: <is...@us...> - 2002-06-28 19:08:11
|
Update of /cvsroot/netwar/netwar/game/objects
In directory usw-pr-cvs1:/tmp/cvs-serv26409/game/objects
Modified Files:
PineTree.java
Log Message:
Added alternate death pattern:
if a tree is hit by multiple weak hits (none high enough to cause it to pop in the air),
it will burst into flames, damaging anything within the area of effect. This will cause
a chain reaction, as other nearby trees will be induced to burn up as well.
Index: PineTree.java
===================================================================
RCS file: /cvsroot/netwar/netwar/game/objects/PineTree.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PineTree.java 31 May 2002 20:40:38 -0000 1.2
--- PineTree.java 28 Jun 2002 19:08:09 -0000 1.3
***************
*** 22,25 ****
--- 22,26 ----
package netwar.game.objects;
import netwar.game.*;
+ import netwar.game.projectiles.FlameWeapon;
import netwar.utils.*;
import netwar.utils.vectorgraphics.*;
***************
*** 61,72 ****
private VirtualCoherentGraphicThing myAppearance;
private int vis = 4;
!
/** Creates a new instance of PineTree */
public PineTree() {
}
! /** Initialize the Point3Ds used for this Base.
! * These are the location of the ground-center of the Base in game-space, and
! * the relative locations of the triangle/line vertices relative to that point.
*/
protected void createVectors() {
--- 62,74 ----
private VirtualCoherentGraphicThing myAppearance;
private int vis = 4;
! private int endurance = 15;
/** Creates a new instance of PineTree */
public PineTree() {
}
! /** Initialize the Point3Ds used for this tree.
! * The first tree generates the graphical object which is used by all pine trees
! * via the VirtualCoherentGraphicThing.
! * Then, each tree sets up a VCGT to use that graphical object.
*/
protected void createVectors() {
***************
*** 132,136 ****
Hex.getHex(x,y).unreserve();
Hex.getHex(x,y).leave(this);
! myAppearance.explode(vr[0]);
}
frame--;
--- 134,148 ----
Hex.getHex(x,y).unreserve();
Hex.getHex(x,y).leave(this);
! if(endurance > 0)
! myAppearance.explode(vr[0]);
! else
! myAppearance.kill();
! }
! if(endurance == 0) {
! Point3D pt = new Point3D(
! netwar.NetwarApp.netwar.random.nextFloat() - 0.5f,
! netwar.NetwarApp.netwar.random.nextFloat() - 0.5f,
! 0);
! Projectile.newProjectile(new FlameWeapon(), vr[0], pt, 1, 3600, 9, this, target);
}
frame--;
***************
*** 165,169 ****
*/
protected int framesToDie() {
! return 10;
}
--- 177,181 ----
*/
protected int framesToDie() {
! return 25;
}
***************
*** 238,247 ****
return (action != 5);
}
! /** The tree uses the 'threshold damage system'.
* If sufficient damage (15 or more) is dealt in one blow,
* the tree is destroyed.
*/
public void recieveDamage(int dam) {
! if(dam >= 15) {
action = 5;
frame = framesToDie();
--- 250,261 ----
return (action != 5);
}
! /** The tree uses the 'flammable threshold damage system'.
* If sufficient damage (15 or more) is dealt in one blow,
* the tree is destroyed.
+ * If enough weak hits are dealt, the tree bursts into flames, damaging nearby units.
*/
public void recieveDamage(int dam) {
! endurance--;
! if((dam >= 15) || (endurance == 0)) {
action = 5;
frame = framesToDie();
|
|
From: <is...@us...> - 2002-06-28 19:05:43
|
Update of /cvsroot/netwar/netwar/game/units
In directory usw-pr-cvs1:/tmp/cvs-serv25832/game/units
Modified Files:
Stunner.java
Log Message:
Graphics fix: the paralyzer weapon now fires from the center of the orb, not the center
of the base of the unit.
Index: Stunner.java
===================================================================
RCS file: /cvsroot/netwar/netwar/game/units/Stunner.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Stunner.java 25 Jun 2002 17:19:26 -0000 1.3
--- Stunner.java 28 Jun 2002 19:05:38 -0000 1.4
***************
*** 81,85 ****
zol = new ZOrderedList(netwar.gui.HexViewer.getHexViewer().getTransform());
cps = new CoherentPointSet(36);
! orb = new CoherentPointSet(6);
//SIGMA
--- 81,85 ----
zol = new ZOrderedList(netwar.gui.HexViewer.getHexViewer().getTransform());
cps = new CoherentPointSet(36);
! orb = new CoherentPointSet(7);
//SIGMA
***************
*** 137,141 ****
orb.add(new SelfConvertingPoint(0, 0, 1)); //5: top
cps.add(orb.getPoint(5)); //34
! cps.add(new SelfConvertingPoint(0, 0, 1)); //35
//SIGMA panel
--- 137,142 ----
orb.add(new SelfConvertingPoint(0, 0, 1)); //5: top
cps.add(orb.getPoint(5)); //34
! orb.add(new SelfConvertingPoint(0, 0, 1)); //6: center
! cps.add(orb.getPoint(6)); //35
//SIGMA panel
***************
*** 235,240 ****
}
protected void animateMake() {
! orb.translate(Point3D.unitUp.getProduct(0.1f));
! orb.translate(Point3D.unitUp.getProduct(0.1f));
orb.getPoint(0).doSum(Point3D.unitDown.getProduct(0.1f));
orb.getPoint(1).doSum(Point3D.unitEast.getProduct(0.1f));
--- 236,240 ----
}
protected void animateMake() {
! orb.translate(Point3D.unitUp.getProduct(0.2f));
orb.getPoint(0).doSum(Point3D.unitDown.getProduct(0.1f));
orb.getPoint(1).doSum(Point3D.unitEast.getProduct(0.1f));
|
|
From: <is...@us...> - 2002-06-28 19:03:52
|
Update of /cvsroot/netwar/netwar/gui
In directory usw-pr-cvs1:/tmp/cvs-serv25083/gui
Modified Files:
MouseParser.java
Log Message:
Added checks to prevent a click from 'noticing' a unit you cannot see.
In other words, if you click on a unit you can't see, it will be interpreted
as clicking on the ground under the unit.
Index: MouseParser.java
===================================================================
RCS file: /cvsroot/netwar/netwar/gui/MouseParser.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** MouseParser.java 2 May 2002 11:31:33 -0000 1.22
--- MouseParser.java 28 Jun 2002 19:03:45 -0000 1.23
***************
*** 399,405 ****
private GameObject closer(Point3D pt, GameObject u1, GameObject u2) {
! if(u1 == null)
return u2;
! if(u2 == null)
return u1;
pt.doProduct(-1);
--- 399,405 ----
private GameObject closer(Point3D pt, GameObject u1, GameObject u2) {
! if(u1 == null || (u1.visibilityLevel(Player.getLocal().getNumber()) == 4))
return u2;
! if(u2 == null || (u2.visibilityLevel(Player.getLocal().getNumber()) == 4))
return u1;
pt.doProduct(-1);
|
|
From: <is...@us...> - 2002-06-28 18:38:27
|
Update of /cvsroot/netwar/netwar/gui
In directory usw-pr-cvs1:/tmp/cvs-serv17348/gui
Modified Files:
HexViewer.java
Log Message:
Added checks to prevent drawing of invisible objects
Index: HexViewer.java
===================================================================
RCS file: /cvsroot/netwar/netwar/gui/HexViewer.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** HexViewer.java 31 May 2002 20:29:38 -0000 1.21
--- HexViewer.java 28 Jun 2002 18:38:25 -0000 1.22
***************
*** 52,56 ****
private int triagX[] = new int[3];
private int triagY[] = new int[3];
!
private HexViewer() {
--- 52,56 ----
private int triagX[] = new int[3];
private int triagY[] = new int[3];
! private boolean dontDraw = false;
private HexViewer() {
***************
*** 115,121 ****
--- 115,123 ----
}
public void setColor(Color c) {
+ dontDraw = (c == ColorSpectrum.invisible);
grfore.setColor(c);
}
public void drawLine(Point3D v1, Point3D v2) {
+ if(dontDraw) return;
Point2D p1 = transform.getPoint2D(v1);
Point2D p2 = transform.getPoint2D(v2);
***************
*** 125,129 ****
public void drawTriangle(Point3D v1, Point3D v2, Point3D v3)
{
!
Point2D temp;
temp = transform.getPoint2D(v1);
--- 127,131 ----
public void drawTriangle(Point3D v1, Point3D v2, Point3D v3)
{
! if(dontDraw) return;
Point2D temp;
temp = transform.getPoint2D(v1);
|
|
From: <is...@us...> - 2002-06-28 18:35:45
|
Update of /cvsroot/netwar/netwar/utils/vectorgraphics
In directory usw-pr-cvs1:/tmp/cvs-serv11312/utils/vectorgraphics
Modified Files:
ColorSpectrum.java
Log Message:
Added the cyan color spectrum, and the invisible color.
All Color objects created as part of ColorSpectrum objects that have an alpha of zero
are mapped to the same Color object. This is also used in HexViewer to prevent drawing of
invisible objects.
Index: ColorSpectrum.java
===================================================================
RCS file: /cvsroot/netwar/netwar/utils/vectorgraphics/ColorSpectrum.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ColorSpectrum.java 25 Jun 2002 17:06:12 -0000 1.4
--- ColorSpectrum.java 28 Jun 2002 18:35:41 -0000 1.5
***************
*** 32,35 ****
--- 32,36 ----
public class ColorSpectrum {
Color colors[];
+ public static final Color invisible = new Color(0,0,0,0);
/** Creates a new instance of ColorSpectrum
* @param redOne the red level of color 1
***************
*** 46,56 ****
Assert.notFalse(N > 1, "A ColorSpectrum must have at least two colors");
int n;
colors = new Color[N];
for(n = 0; n < N; n++) {
! colors[n] = new Color(
! clamp(((N - 1 - n) * redOne + n * redN ) / (N - 1)),
! clamp(((N - 1 - n) * greenOne + n * greenN ) / (N - 1)),
! clamp(((N - 1 - n) * blueOne + n * blueN ) / (N - 1)),
! clamp(((N - 1 - n) * alphaOne + n * alphaN ) / (N - 1)));
}
}
--- 47,62 ----
Assert.notFalse(N > 1, "A ColorSpectrum must have at least two colors");
int n;
+ int a;
colors = new Color[N];
for(n = 0; n < N; n++) {
! a = clamp(((N - 1 - n) * alphaOne + n * alphaN ) / (N - 1));
! if(a > 0)
! colors[n] = new Color(
! clamp(((N - 1 - n) * redOne + n * redN ) / (N - 1)),
! clamp(((N - 1 - n) * greenOne + n * greenN ) / (N - 1)),
! clamp(((N - 1 - n) * blueOne + n * blueN ) / (N - 1)),
! a);
! else
! colors[n] = invisible; //All colors with alpha = 0 look alike: you can't see any of them.
}
}
***************
*** 85,87 ****
--- 91,95 ----
/** Spectrum for yellow (transparent dark yellow <--> opaque yellow, 5 shades) */
public static ColorSpectrum yellow = new ColorSpectrum( 128, 255, 128, 255, 0, 0, 0, 255, 5);
+ /** Spectrum for cyan (transparent dark cyan <--> opaque cyan, 5 shades) */
+ public static ColorSpectrum cyan = new ColorSpectrum( 0, 0, 128, 255, 128, 255, 0, 255, 5);
}
|
|
From: <is...@us...> - 2002-06-25 17:26:45
|
Update of /cvsroot/netwar/netwar/game/units
In directory usw-pr-cvs1:/tmp/cvs-serv16357/game/units
Modified Files:
DeltaHealer.java
Log Message:
Replaced a chunk of code with a call to zol.fixList()
Index: DeltaHealer.java
===================================================================
RCS file: /cvsroot/netwar/netwar/game/units/DeltaHealer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DeltaHealer.java 31 May 2002 20:36:36 -0000 1.2
--- DeltaHealer.java 25 Jun 2002 17:26:42 -0000 1.3
***************
*** 161,178 ****
vr[3].doRotate(Point3D.origin, Point3D.unitUp, i);
vr[4].doRotate(Point3D.origin, Point3D.unitUp, i);
! ZListNode zln;
! int n=0;
! for(zln = zol.zNode; zln != null; zln = zln.getNext()) {
! n++;
! }
! ZListNode zlna[] = new ZListNode[n];
! n=0;
! for(zln = zol.zNode; zln != null; zln = zln.getNext()) {
! zlna[n++] = zln;
! }
! for(n=0;n<zlna.length;n++) {
! zlna[n].getThing().update();
! }
! zol.update();
}
--- 161,165 ----
vr[3].doRotate(Point3D.origin, Point3D.unitUp, i);
vr[4].doRotate(Point3D.origin, Point3D.unitUp, i);
! zol.fixList();
}
|
|
From: <is...@us...> - 2002-06-25 17:24:07
|
Update of /cvsroot/netwar/netwar/game/units
In directory usw-pr-cvs1:/tmp/cvs-serv14970/game/units
Modified Files:
LMGHunter.java
Log Message:
Replaced 3 identical chunks of code with calls to zol.fixList()
Index: LMGHunter.java
===================================================================
RCS file: /cvsroot/netwar/netwar/game/units/LMGHunter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LMGHunter.java 31 May 2002 20:33:56 -0000 1.2
--- LMGHunter.java 25 Jun 2002 17:24:04 -0000 1.3
***************
*** 215,232 ****
upperHalf.translate(new Point3D(0,0,10).doSum(lowerHalf.getPoint(14)).doDifference(upperHalf.getPoint(1)));
vr[0].set(lowerHalf.getPoint(14).x, lowerHalf.getPoint(14).y, 0);
! ZListNode zln;
! int n=0;
! for(zln = zol.zNode; zln != null; zln = zln.getNext()) {
! n++;
! }
! ZListNode zlna[] = new ZListNode[n];
! n=0;
! for(zln = zol.zNode; zln != null; zln = zln.getNext()) {
! zlna[n++] = zln;
! }
! for(n=0;n<zlna.length;n++) {
! zlna[n].getThing().update();
! }
! zol.update();
}
--- 215,219 ----
upperHalf.translate(new Point3D(0,0,10).doSum(lowerHalf.getPoint(14)).doDifference(upperHalf.getPoint(1)));
vr[0].set(lowerHalf.getPoint(14).x, lowerHalf.getPoint(14).y, 0);
! zol.fixList();
}
***************
*** 236,253 ****
vr[1].doRotate(Point3D.origin, Point3D.unitUp, 10);
vr[2].doRotate(Point3D.origin, Point3D.unitUp, 10);
! ZListNode zln;
! int n=0;
! for(zln = zol.zNode; zln != null; zln = zln.getNext()) {
! n++;
! }
! ZListNode zlna[] = new ZListNode[n];
! n=0;
! for(zln = zol.zNode; zln != null; zln = zln.getNext()) {
! zlna[n++] = zln;
! }
! for(n=0;n<zlna.length;n++) {
! zlna[n].getThing().update();
! }
! zol.update();
}
--- 223,227 ----
vr[1].doRotate(Point3D.origin, Point3D.unitUp, 10);
vr[2].doRotate(Point3D.origin, Point3D.unitUp, 10);
! zol.fixList();
}
***************
*** 257,274 ****
vr[1].doRotate(Point3D.origin, Point3D.unitUp, 350);
vr[2].doRotate(Point3D.origin, Point3D.unitUp, 350);
! ZListNode zln;
! int n=0;
! for(zln = zol.zNode; zln != null; zln = zln.getNext()) {
! n++;
! }
! ZListNode zlna[] = new ZListNode[n];
! n=0;
! for(zln = zol.zNode; zln != null; zln = zln.getNext()) {
! zlna[n++] = zln;
! }
! for(n=0;n<zlna.length;n++) {
! zlna[n].getThing().update();
! }
! zol.update();
}
--- 231,235 ----
vr[1].doRotate(Point3D.origin, Point3D.unitUp, 350);
vr[2].doRotate(Point3D.origin, Point3D.unitUp, 350);
! zol.fixList();
}
|
|
From: <is...@us...> - 2002-06-25 17:22:09
|
Update of /cvsroot/netwar/netwar/game/units
In directory usw-pr-cvs1:/tmp/cvs-serv13872/game/units
Modified Files:
MobileArtillery.java
Log Message:
Added 3 calls to zol.fixList() and 1 call to zol.update() which should fix some Z-Ordering
issues.
Index: MobileArtillery.java
===================================================================
RCS file: /cvsroot/netwar/netwar/game/units/MobileArtillery.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MobileArtillery.java 31 May 2002 20:35:48 -0000 1.2
--- MobileArtillery.java 25 Jun 2002 17:22:06 -0000 1.3
***************
*** 190,193 ****
--- 190,194 ----
cps.translate(vr[0]);
cps.rotate(vr[0], Point3D.unitUp, i);
+ zol.fixList();
}
/** Mobile Artillery is drawn as a Z-Ordered List.
***************
*** 215,226 ****
--- 216,230 ----
vr[0].doSum(pt);
cps.translate(pt);
+ zol.update();
}
/** Mobile Artillery rotates left by sliding. There is no articulate animation */
protected void animateRotateLeft(){
cps.rotate(vr[0], Point3D.unitUp, 12);
+ zol.fixList();
}
/** Mobile Artillery rotates right by sliding. There is no articulate animation */
protected void animateRotateRight(){
cps.rotate(vr[0], Point3D.unitUp, 348);
+ zol.fixList();
}
protected void animateMake() {
|
|
From: <is...@us...> - 2002-06-25 17:20:34
|
Update of /cvsroot/netwar/netwar/game/units
In directory usw-pr-cvs1:/tmp/cvs-serv13195/game/units
Modified Files:
FlameBeetle.java
Log Message:
Added 3 calls to zol.fixList(), which should solve some Z-Ordering problems.
Also, updated some of the javadocs.
Index: FlameBeetle.java
===================================================================
RCS file: /cvsroot/netwar/netwar/game/units/FlameBeetle.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FlameBeetle.java 31 May 2002 20:33:20 -0000 1.2
--- FlameBeetle.java 25 Jun 2002 17:20:31 -0000 1.3
***************
*** 203,214 ****
--- 203,217 ----
vr[0].doSum(pt);
cps.translate(pt);
+ zol.update();
}
/** Flame Beetle rotates left by sliding. There is no articulate animation */
protected void animateRotateLeft(){
cps.rotate(vr[0], Point3D.unitUp, 12);
+ zol.fixList();
}
/** Flame Beetle rotates right by sliding. There is no articulate animation */
protected void animateRotateRight(){
cps.rotate(vr[0], Point3D.unitUp, 348);
+ zol.fixList();
}
/** Flame Beetle forms by shifting the triangles from a nearly verticle form to the standard shape. */
***************
*** 236,241 ****
return 4.0f;
}
! /** Flame Beetle is 7.0 units wide.
! * @return 7
*/
public float getWidth() {
--- 239,244 ----
return 4.0f;
}
! /** Flame Beetle is 9.0 units wide.
! * @return 9
*/
public float getWidth() {
|
|
From: <is...@us...> - 2002-06-25 17:19:29
|
Update of /cvsroot/netwar/netwar/game/units
In directory usw-pr-cvs1:/tmp/cvs-serv12734/game/units
Modified Files:
Stunner.java
Log Message:
Added 3 calls to zol.fixList(), two of which replace identical code that was already present.
Index: Stunner.java
===================================================================
RCS file: /cvsroot/netwar/netwar/game/units/Stunner.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Stunner.java 31 May 2002 20:34:37 -0000 1.2
--- Stunner.java 25 Jun 2002 17:19:26 -0000 1.3
***************
*** 224,261 ****
vr[0].doSum(pt);
cps.translate(pt);
}
protected void animateRotateLeft(){
cps.rotate(vr[0], Point3D.unitUp, 10);
! ZListNode zln;
! int n=0;
! for(zln = zol.zNode; zln != null; zln = zln.getNext()) {
! n++;
! }
! ZListNode zlna[] = new ZListNode[n];
! n=0;
! for(zln = zol.zNode; zln != null; zln = zln.getNext()) {
! zlna[n++] = zln;
! }
! for(n=0;n<zlna.length;n++) {
! zlna[n].getThing().update();
! }
! zol.update();
}
protected void animateRotateRight(){
cps.rotate(vr[0], Point3D.unitUp, 350);
! ZListNode zln;
! int n=0;
! for(zln = zol.zNode; zln != null; zln = zln.getNext()) {
! n++;
! }
! ZListNode zlna[] = new ZListNode[n];
! n=0;
! for(zln = zol.zNode; zln != null; zln = zln.getNext()) {
! zlna[n++] = zln;
! }
! for(n=0;n<zlna.length;n++) {
! zlna[n].getThing().update();
! }
! zol.update();
}
protected void animateMake() {
--- 224,236 ----
vr[0].doSum(pt);
cps.translate(pt);
+ zol.fixList();
}
protected void animateRotateLeft(){
cps.rotate(vr[0], Point3D.unitUp, 10);
! zol.fixList();
}
protected void animateRotateRight(){
cps.rotate(vr[0], Point3D.unitUp, 350);
! zol.fixList();
}
protected void animateMake() {
***************
*** 268,271 ****
--- 243,247 ----
orb.getPoint(4).doSum(Point3D.unitSouth.getProduct(0.1f));
orb.getPoint(5).doSum(Point3D.unitUp.getProduct(0.1f));
+ zol.fixList();
}
protected void animateDie() {
|
|
From: <is...@us...> - 2002-06-25 17:17:58
|
Update of /cvsroot/netwar/netwar/game
In directory usw-pr-cvs1:/tmp/cvs-serv11068/game
Modified Files:
Unit.java
Log Message:
Seperated the hex reservation code from the rest of the think() code so that they can be
overridden separately.
In the process, I also reverted the hex reservation code so that it no longer uses the
tracemode variable to attempt edge traces: the code was acting to unreliably. This means we
are back to the old problem of units getting stuck in U shaped obstacles. Hopefully, we will
be able to determine a better fix for the problem.
Index: Unit.java
===================================================================
RCS file: /cvsroot/netwar/netwar/game/Unit.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Unit.java 11 Jun 2002 01:01:18 -0000 1.24
--- Unit.java 25 Jun 2002 17:17:55 -0000 1.25
***************
*** 53,60 ****
/** True if the Unit has a Hex reserved to move into. */
protected boolean reserved = false;
- //If traceMode = 0, use classic pathfinding intelligence.
- //If traceMode = 1, use Keep-Obstacles-On-Your-Right mode.
- //If traceMode = -1, use Keep-Obstacles-On-Your-Left mode.
- private int traceMode = 0;
private boolean validSubPlan = false;
private int subPlanDirection;
--- 53,56 ----
***************
*** 72,76 ****
//Set to 0 (remain stationary)
mode = 0;
- traceMode = 0;
}
/** Sets the unit to Move Mode
--- 68,71 ----
***************
*** 81,85 ****
//Set to 1 (go to destination)
mode = 1;
- traceMode = 0;
goalX = gx;
goalY = gy;
--- 76,79 ----
***************
*** 91,95 ****
//Set to 2 (pursue target)
mode = 2;
- traceMode = 0;
target = u;
targetSSMDS = firstSSMDS.getTarget(this, target);
--- 85,88 ----
***************
*** 386,391 ****
}
- int fChg = 0;
- Hex next = null;
if(mode == 0) {
target = scan();
--- 379,382 ----
***************
*** 430,549 ****
}
}
! switch(traceMode)
! {
! case 0:
! while(true){
! switch(resF){
! case 0: resX = x + 1; resY = y + 1; break;
! case 1: resX = x; resY = y + 1; break;
! case 2: resX = x - 1; resY = y; break;
! case 3: resX = x - 1; resY = y - 1; break;
! case 4: resX = x; resY = y - 1; break;
! case 5: resX = x + 1; resY = y; break;
! }
! next = Hex.getHex(resX, resY);
! if(next != null && next.reserve())
! break;
! if(resX == goalX && resY == goalY)
! {
! mode = 0;
! return;
! }
! //Change resF. This causes resF to try
! //one hex-side to the left, then one to the right,
! //then two to the left, etc.
! fChg *= -1;
! fChg += (fChg == 0)?(subPlanBias):((fChg < 0)?(-1):(1));
! resF += fChg;
! if(resF < 0) resF += 6;
! else if(resF > 5) resF -= 6;
!
! if(fChg == 6 || fChg == -6) {//nowhere to go. Already checked all six sides.
! action = 0;
! resX = x; resY = y;
! return;
! }
! }
! fChg = resF - f;
! if(fChg == 2 || fChg == 3 || fChg == -4)
! traceMode = 1;
! else if(fChg == -2 || fChg == -3 || fChg == 4)
! traceMode = -1;
! reserved = true;
! Hex.getHex(x, y).unreserve();
! break;
! case 1:
! resF = f - 1;
! if(resF < 0) resF = 5;
! while(true){
! switch(resF){
! case 0: resX = x + 1; resY = y + 1; break;
! case 1: resX = x; resY = y + 1; break;
! case 2: resX = x - 1; resY = y; break;
! case 3: resX = x - 1; resY = y - 1; break;
! case 4: resX = x; resY = y - 1; break;
! case 5: resX = x + 1; resY = y; break;
! }
! next = Hex.getHex(resX, resY);
! if(next != null && next.reserve())
! break;
! if(resX == goalX && resY == goalY)
! {
! mode = 0;
! return;
! }
! //Change resF. Try starting from 60 degrees right leftward.
! resF += 1;
! if(resF > 5) resF -= 6;
!
! if(resF == f - 1 || resF == f + 5) {//nowhere to go. Already checked all six sides.
! action = 0;
! resX = x; resY = y;
! return;
! }
! }
! confirmSubPlan(goalX,goalY);
! if(resF == bestDirection(goalX,goalY));
! traceMode = 0;
! reserved = true;
! Hex.getHex(x, y).unreserve();
! break;
! case -1:
! resF = f + 1;
! if(resF > 5) resF = 0;
! while(true){
! switch(resF){
! case 0: resX = x + 1; resY = y + 1; break;
! case 1: resX = x; resY = y + 1; break;
! case 2: resX = x - 1; resY = y; break;
! case 3: resX = x - 1; resY = y - 1; break;
! case 4: resX = x; resY = y - 1; break;
! case 5: resX = x + 1; resY = y; break;
! }
! next = Hex.getHex(resX, resY);
! if(next != null && next.reserve())
! break;
! if(resX == goalX && resY == goalY)
! {
! mode = 0;
! return;
! }
! //Change resF. Try starting from 60 degrees left rightward.
! resF -= 1;
! if(resF < 0) resF += 6;
! if(resF == f + 1 || resF == f - 5) {//nowhere to go. Already checked all six sides.
! action = 0;
! resX = x; resY = y;
! return;
! }
! }
! confirmSubPlan(goalX,goalY);
! if(resF == bestDirection(goalX,goalY));
! traceMode = 0;
! reserved = true;
! Hex.getHex(x, y).unreserve();
! break;
}
}
--- 421,468 ----
}
}
! reserveNextHex();
! }
! /** Determines the 'best' hex for the next movement and reserves it.
! * Separated from the think() function to better support alternative versions of both
! * the main think() process and the movement AI.
! */
! protected void reserveNextHex() {
! int fChg = 0;
! Hex next = null;
! while(true){
! switch(resF){
! case 0: resX = x + 1; resY = y + 1; break;
! case 1: resX = x; resY = y + 1; break;
! case 2: resX = x - 1; resY = y; break;
! case 3: resX = x - 1; resY = y - 1; break;
! case 4: resX = x; resY = y - 1; break;
! case 5: resX = x + 1; resY = y; break;
! }
! next = Hex.getHex(resX, resY);
! if(next != null && next.reserve())
! break;
! if(resX == goalX && resY == goalY)
! {
! mode = 0;
! return;
! }
! //Change resF. This causes resF to try
! //one hex-side to the left, then one to the right,
! //then two to the left, etc.
! fChg *= -1;
! fChg += (fChg == 0)?(subPlanBias):((fChg < 0)?(-1):(1));
! resF += fChg;
! if(resF < 0) resF += 6;
! else if(resF > 5) resF -= 6;
! if(fChg == 6 || fChg == -6) {//nowhere to go. Already checked all six sides.
! action = 0;
! resX = x; resY = y;
! return;
! }
}
+ fChg = resF - f;
+ reserved = true;
+ Hex.getHex(x, y).unreserve();
}
|
|
From: <is...@us...> - 2002-06-25 17:14:27
|
Update of /cvsroot/netwar/netwar/game
In directory usw-pr-cvs1:/tmp/cvs-serv9716/game
Modified Files:
GameObject.java
Log Message:
Added an empty method (void specialCommand(int info) {}), which is called by Commands of type
4.
Those Commands should only be generated by units which have a useful implementation of
specialCommand(int). It is designed to allow an action button to trigger a method call on all
computers.
Index: GameObject.java
===================================================================
RCS file: /cvsroot/netwar/netwar/game/GameObject.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** GameObject.java 31 May 2002 20:49:56 -0000 1.24
--- GameObject.java 25 Jun 2002 17:14:24 -0000 1.25
***************
*** 71,74 ****
--- 71,75 ----
//Animation sequence and frame
/** Code number indicating the animation sequence in progress.
+ * <BR> Not all animations are available for all game objects.
* <BR> 0 = only passive animations.
* <BR> 1 = rotating left.
***************
*** 77,80 ****
--- 78,82 ----
* <BR> 4 = being created.
* <BR> 5 = dying.
+ * <BR> 6 = deploying.
*/
protected int action = 0;
***************
*** 611,614 ****
--- 613,617 ----
return (scanRangeSquared() * 9 / 4);
}
+ public void specialCommand(int info) {}
}
|
|
From: <is...@us...> - 2002-06-25 17:11:11
|
Update of /cvsroot/netwar/netwar/game In directory usw-pr-cvs1:/tmp/cvs-serv8340/game Modified Files: Command.java Log Message: Added command type 4: custom command. Basically, this allows the custom action buttons to do things which effect the game, instead of only doing things that show up on the local side. So, the unit makes an action button, the player clicks the action button, the unit generates a Command (type 4), the Command is synchronized across the network, the command calls specialCommand(int) on the unit on each computer, and the unit then performs an action accordingly. Param1 is used to transfer an int, so the unit can distinguish between different action buttons. Index: Command.java =================================================================== RCS file: /cvsroot/netwar/netwar/game/Command.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Command.java 16 Mar 2002 02:47:31 -0000 1.8 --- Command.java 25 Jun 2002 17:11:08 -0000 1.9 *************** *** 37,40 **** --- 37,45 ---- * If that Unit is an enemy, the units will try to destroy it.<BR> * Param 1 = unit index for target. Param 2 not used.<p> + * 4 = Custom command: parameter. First unit has its specialCommand(int) method called.<BR> + * The action performed is dependant upon the unit selected. This is used for unusual + * commands, such as the deploy function of a construction turret. + * The commands themselves come from the custom action lists. + * Param 1 = integer parameter for specialCommand(int) * Additional action codes will be added as needed. Keep in mind that these will * never include interface controls (such as zooming or scrolling) nor will it *************** *** 149,152 **** --- 154,162 ---- } } + break; + case 4: + go1 = GameObject.getObjectWithID(selection[0]); + if(go1 != null) + go1.specialCommand(param1); break; } |
|
From: <is...@us...> - 2002-06-25 17:06:20
|
Update of /cvsroot/netwar/netwar/utils/vectorgraphics In directory usw-pr-cvs1:/tmp/cvs-serv7872/utils/vectorgraphics Modified Files: ColorSpectrum.java Log Message: Added the color spectrum for the color yellow. Index: ColorSpectrum.java =================================================================== RCS file: /cvsroot/netwar/netwar/utils/vectorgraphics/ColorSpectrum.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ColorSpectrum.java 31 May 2002 20:24:12 -0000 1.3 --- ColorSpectrum.java 25 Jun 2002 17:06:12 -0000 1.4 *************** *** 83,85 **** --- 83,87 ---- /** Spectrum for red (transparent dark red <--> opaque red, 5 shades) */ public static ColorSpectrum red = new ColorSpectrum( 128, 255, 0, 0, 0, 0, 0, 255, 5); + /** Spectrum for yellow (transparent dark yellow <--> opaque yellow, 5 shades) */ + public static ColorSpectrum yellow = new ColorSpectrum( 128, 255, 128, 255, 0, 0, 0, 255, 5); } |
|
From: <is...@us...> - 2002-06-25 17:04:41
|
Update of /cvsroot/netwar/netwar/utils/vectorgraphics
In directory usw-pr-cvs1:/tmp/cvs-serv7244/utils/vectorgraphics
Modified Files:
ZOrderedList.java
Log Message:
Added fixList() method to fix the ordering of the list after a major change (such as rotating
a unit, then fixList() the ZOrderedList for that unit's graphics).
Index: ZOrderedList.java
===================================================================
RCS file: /cvsroot/netwar/netwar/utils/vectorgraphics/ZOrderedList.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ZOrderedList.java 9 Mar 2002 09:42:20 -0000 1.2
--- ZOrderedList.java 25 Jun 2002 17:04:36 -0000 1.3
***************
*** 116,118 ****
--- 116,135 ----
return zol;
}
+
+ public void fixList() {
+ ZListNode zln;
+ int n=0;
+ for(zln = zNode; zln != null; zln = zln.getNext()) {
+ n++;
+ }
+ ZListNode zlna[] = new ZListNode[n];
+ n=0;
+ for(zln = zNode; zln != null; zln = zln.getNext()) {
+ zlna[n++] = zln;
+ }
+ for(n=0;n<zlna.length;n++) {
+ zlna[n].getThing().update();
+ }
+ update();
+ }
}
|
|
From: <is...@us...> - 2002-06-11 01:01:22
|
Update of /cvsroot/netwar/netwar/game
In directory usw-pr-cvs1:/tmp/cvs-serv31662/game
Modified Files:
Unit.java
Log Message:
Adjusted unit logic to better account for visibility.
A unit will stop pursuing a target if it becomes completely invisible.
A unit will continue approaching a target that is within the normal pursuit radius if
the target is not visible enough to lock/fire weapons.
Index: Unit.java
===================================================================
RCS file: /cvsroot/netwar/netwar/game/Unit.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Unit.java 31 May 2002 20:45:27 -0000 1.23
--- Unit.java 11 Jun 2002 01:01:18 -0000 1.24
***************
*** 377,382 ****
//Decide where to go next. Reserve an adjacent hex if plausible.
! //First, if a target is chosen, untarget it if it is dead
! if(target != null && target.isDead()) {
target = null;
targetSSMDS = null;
--- 377,383 ----
//Decide where to go next. Reserve an adjacent hex if plausible.
! //First, if a target is chosen, untarget it if it is dead or invisible
! if(target != null &&
! (target.isDead() || target.visibilityLevel(myPlayer.getNumber()) == 4 )) {
target = null;
targetSSMDS = null;
***************
*** 407,416 ****
confirmSubPlan(goalX,goalY);
resF = bestDirection(goalX,goalY);
! if((fol >= goalX - x) &&
(fol >= x - goalX) &&
(fol >= goalY - y) &&
(fol >= y - goalY) &&
(fol >= goalX - x - goalY + y) &&
! (fol >= x - goalX - y + goalY)) {
if(resF == f) {
action = 0;
--- 408,418 ----
confirmSubPlan(goalX,goalY);
resF = bestDirection(goalX,goalY);
! if( (target.visibilityLevel(myPlayer.getNumber()) < 2) &&
! ((fol >= goalX - x) &&
(fol >= x - goalX) &&
(fol >= goalY - y) &&
(fol >= y - goalY) &&
(fol >= goalX - x - goalY + y) &&
! (fol >= x - goalX - y + goalY))) {
if(resF == f) {
action = 0;
|
|
From: <is...@us...> - 2002-06-10 03:24:51
|
Update of /cvsroot/netwar/netwar/game
In directory usw-pr-cvs1:/tmp/cvs-serv24084/game
Modified Files:
SelfSortingMutualDistanceSquared.java
Log Message:
Added some null pointer checks. Without them, the game can crash from killing trees (yikes!)
Index: SelfSortingMutualDistanceSquared.java
===================================================================
RCS file: /cvsroot/netwar/netwar/game/SelfSortingMutualDistanceSquared.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** SelfSortingMutualDistanceSquared.java 31 May 2002 20:46:45 -0000 1.8
--- SelfSortingMutualDistanceSquared.java 10 Jun 2002 03:24:48 -0000 1.9
***************
*** 65,69 ****
visi--;
if(visi != youngVis) {
! old.updateVisibility(young.getPlayer().getNumber(), youngVis, visi);
youngVis = visi;
}
--- 65,69 ----
visi--;
if(visi != youngVis) {
! old.updateVisibility((young.getPlayer() == null)?(0):(young.getPlayer().getNumber()), youngVis, visi);
youngVis = visi;
}
***************
*** 73,77 ****
visi--;
if(visi != oldVis) {
! young.updateVisibility(old.getPlayer().getNumber(), oldVis, visi);
oldVis = visi;
}
--- 73,77 ----
visi--;
if(visi != oldVis) {
! young.updateVisibility((old.getPlayer() == null)?(0):(old.getPlayer().getNumber()), oldVis, visi);
oldVis = visi;
}
***************
*** 107,112 ****
*/
public void remove(GameObject go) {
! old.updateVisibility(young.getPlayer().getNumber(), youngVis, 4);
! young.updateVisibility(old.getPlayer().getNumber(), oldVis, 4);
if(go == young) {
if(prevOld == null)
--- 107,112 ----
*/
public void remove(GameObject go) {
! old.updateVisibility((young.getPlayer() == null)?(0):(young.getPlayer().getNumber()), youngVis, 4);
! young.updateVisibility((old.getPlayer() == null)?(0):(old.getPlayer().getNumber()), oldVis, 4);
if(go == young) {
if(prevOld == null)
***************
*** 159,163 ****
visi++;
if(visi != youngVis) {
! old.updateVisibility(young.getPlayer().getNumber(), youngVis, visi);
youngVis = visi;
}
--- 159,163 ----
visi++;
if(visi != youngVis) {
! old.updateVisibility((young.getPlayer() == null)?(0):(young.getPlayer().getNumber()), youngVis, visi);
youngVis = visi;
}
***************
*** 169,173 ****
visi++;
if(visi != oldVis) {
! young.updateVisibility(old.getPlayer().getNumber(), oldVis, visi);
oldVis = visi;
}
--- 169,173 ----
visi++;
if(visi != oldVis) {
! young.updateVisibility((old.getPlayer() == null)?(0):(old.getPlayer().getNumber()), oldVis, visi);
oldVis = visi;
}
|