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

Brought things into line with new streaming world order.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1607 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2002-07-23 05:54:53 +00:00
parent c3191b9170
commit eb0f92fcef
16 changed files with 149 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/whirled/zone/data/SceneSummary.java
+18 -20
View File
@@ -1,10 +1,8 @@
//
// $Id: SceneSummary.java,v 1.3 2001/12/17 03:38:50 mdb Exp $
// $Id: SceneSummary.java,v 1.4 2002/07/23 05:54:53 mdb Exp $
package com.threerings.whirled.zone.data;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import com.samskivert.util.StringUtil;
@@ -12,8 +10,9 @@ import com.samskivert.util.StringUtil;
import com.threerings.util.DirectionCodes;
import com.threerings.util.DirectionUtil;
import com.threerings.presents.io.Streamable;
import com.threerings.presents.io.StreamableUtil;
import com.threerings.io.ObjectInputStream;
import com.threerings.io.ObjectOutputStream;
import com.threerings.io.Streamable;
/**
* The scene summary class is used to provide info about the connected
@@ -55,25 +54,23 @@ public class SceneSummary implements Streamable
_population = population;
}
// documentation inherited
public void writeTo (DataOutputStream out)
/**
* Writes our custom streamable fields.
*/
public void writeObject (ObjectOutputStream out)
throws IOException
{
out.writeInt(sceneId);
out.writeUTF(name);
StreamableUtil.writeInts(out, neighbors);
StreamableUtil.writeInts(out, neighborDirs);
out.writeInt(_population);
out.defaultWriteObject();
out.writeInt(getPopulation());
}
// documentation inherited
public void readFrom (DataInputStream in)
throws IOException
/**
* Reads our custom streamable fields.
*/
public void readObject (ObjectInputStream in)
throws IOException, ClassNotFoundException
{
sceneId = in.readInt();
name = in.readUTF();
neighbors = StreamableUtil.readInts(in);
neighborDirs = StreamableUtil.readInts(in);
in.defaultReadObject();
_population = in.readInt();
}
@@ -84,7 +81,8 @@ public class SceneSummary implements Streamable
{
return "[sceneId=" + sceneId + ", name=" + name +
", neighbors=" + StringUtil.toString(neighbors) +
", neighborDirs=" + DirectionUtil.toString(neighborDirs) + "]";
", neighborDirs=" + DirectionUtil.toString(neighborDirs) +
", pop=" + _population + "]";
}
/** The number of people currently occupying this scene. */