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

Updated to use the new Client-reference-free style.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1042 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
Michael Bayne
2010-12-31 22:29:19 +00:00
parent 08572479f7
commit c8a4fbfd8b
41 changed files with 184 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+1 -1
View File
@@ -43,7 +43,7 @@
<target name="-preptools" depends="-prepare">
<artifact:dependencies pathId="tools.classpath">
<dependency groupId="com.threerings" artifactId="narya-tools" version="1.2"/>
<dependency groupId="com.threerings" artifactId="narya-tools" version="1.4-SNAPSHOT"/>
</artifact:dependencies>
<taskdef resource="com/threerings/presents/tools.properties" classpathref="tools.classpath"/>
</target>
src/main/java/com/threerings/micasa/lobby/LobbyMarshaller.java
+10 -11
View File
@@ -23,7 +23,6 @@ package com.threerings.micasa.lobby;
import javax.annotation.Generated;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
import java.util.List;
@@ -114,12 +113,12 @@ public class LobbyMarshaller extends InvocationMarshaller
public static final int GET_CATEGORIES = 1;
// from interface LobbyService
public void getCategories (Client arg1, LobbyService.CategoriesListener arg2)
public void getCategories (LobbyService.CategoriesListener arg1)
{
LobbyMarshaller.CategoriesMarshaller listener2 = new LobbyMarshaller.CategoriesMarshaller();
listener2.listener = arg2;
sendRequest(arg1, GET_CATEGORIES, new Object[] {
listener2
LobbyMarshaller.CategoriesMarshaller listener1 = new LobbyMarshaller.CategoriesMarshaller();
listener1.listener = arg1;
sendRequest(GET_CATEGORIES, new Object[] {
listener1
});
}
@@ -127,12 +126,12 @@ public class LobbyMarshaller extends InvocationMarshaller
public static final int GET_LOBBIES = 2;
// from interface LobbyService
public void getLobbies (Client arg1, String arg2, LobbyService.LobbiesListener arg3)
public void getLobbies (String arg1, LobbyService.LobbiesListener arg2)
{
LobbyMarshaller.LobbiesMarshaller listener3 = new LobbyMarshaller.LobbiesMarshaller();
listener3.listener = arg3;
sendRequest(arg1, GET_LOBBIES, new Object[] {
arg2, listener3
LobbyMarshaller.LobbiesMarshaller listener2 = new LobbyMarshaller.LobbiesMarshaller();
listener2.listener = arg2;
sendRequest(GET_LOBBIES, new Object[] {
arg1, listener2
});
}
}
src/main/java/com/threerings/micasa/lobby/LobbySelector.java
+2 -2
View File
@@ -99,7 +99,7 @@ public class LobbySelector extends JPanel
// get a handle on our lobby service instance
_lservice = _ctx.getClient().requireService(LobbyService.class);
// and use them to look up the lobby categories
_lservice.getCategories(_ctx.getClient(), this);
_lservice.getCategories(this);
}
/**
@@ -174,7 +174,7 @@ public class LobbySelector extends JPanel
// make a note that we're loading up this category
_pendingCategory = category;
// issue a request to load up the lobbies in this category
_lservice.getLobbies(_ctx.getClient(), category, this);
_lservice.getLobbies(category, this);
} else {
log.info("Ignoring category select request because " +
src/main/java/com/threerings/micasa/lobby/LobbyService.java
+2 -3
View File
@@ -23,7 +23,6 @@ package com.threerings.micasa.lobby;
import java.util.List;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
/**
@@ -61,7 +60,7 @@ public interface LobbyService extends InvocationService
* @param client a connected, operational client instance.
* @param listener the listener that will receive and process the response.
*/
public void getCategories (Client client, CategoriesListener listener);
public void getCategories (CategoriesListener listener);
/**
* Requests information on all active lobbies that match the specified category.
@@ -70,5 +69,5 @@ public interface LobbyService extends InvocationService
* @param category the category of game for which a list of lobbies is desired.
* @param listener the listener that will receive and process the response.
*/
public void getLobbies (Client client, String category, LobbiesListener listener);
public void getLobbies (String category, LobbiesListener listener);
}
src/main/java/com/threerings/micasa/simulator/client/SimulatorController.java
+1 -1
View File
@@ -106,7 +106,7 @@ public class SimulatorController extends Controller
// get the simulator service and use it to request that our game be created
SimulatorService sservice = client.requireService(SimulatorService.class);
sservice.createGame(client, config, _info.simClass, _info.playerCount);
sservice.createGame(config, _info.simClass, _info.playerCount);
// our work here is done, as the location manager will move us into the game room
// straightaway
src/main/java/com/threerings/micasa/simulator/client/SimulatorService.java
+1 -4
View File
@@ -21,7 +21,6 @@
package com.threerings.micasa.simulator.client;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.parlor.game.data.GameConfig;
@@ -34,11 +33,9 @@ public interface SimulatorService extends InvocationService
/**
* Requests that a new game be created.
*
* @param client a connected, operational client instance.
* @param config the game config for the game to be created.
* @param simClass the class name of the simulant to create.
* @param playerCount the number of players in the game.
*/
public void createGame (Client client, GameConfig config,
String simClass, int playerCount);
public void createGame (GameConfig config, String simClass, int playerCount);
}
src/main/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java
+3 -4
View File
@@ -25,7 +25,6 @@ import javax.annotation.Generated;
import com.threerings.micasa.simulator.client.SimulatorService;
import com.threerings.parlor.game.data.GameConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.InvocationMarshaller;
/**
@@ -44,10 +43,10 @@ public class SimulatorMarshaller extends InvocationMarshaller
public static final int CREATE_GAME = 1;
// from interface SimulatorService
public void createGame (Client arg1, GameConfig arg2, String arg3, int arg4)
public void createGame (GameConfig arg1, String arg2, int arg3)
{
sendRequest(arg1, CREATE_GAME, new Object[] {
arg2, arg3, Integer.valueOf(arg4)
sendRequest(CREATE_GAME, new Object[] {
arg1, arg2, Integer.valueOf(arg3)
});
}
}
src/main/java/com/threerings/parlor/card/trick/client/TrickCardGameService.java
+3 -8
View File
@@ -21,7 +21,6 @@
package com.threerings.parlor.card.trick.client;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.parlor.card.data.Card;
@@ -34,26 +33,22 @@ public interface TrickCardGameService extends InvocationService
/**
* Sends a group of cards to the player at the specified index.
*
* @param client the client object
* @param toidx the index of the player to send the cards to
* @param cards the cards to send
*/
public void sendCardsToPlayer (Client client, int toidx, Card[] cards);
public void sendCardsToPlayer (int toidx, Card[] cards);
/**
* Plays a card in the trick.
*
* @param client the client object
* @param card the card to play
* @param handSize the size of the player's hand, which is used to verify
* that the request is for the current trick
*/
public void playCard (Client client, Card card, int handSize);
public void playCard (Card card, int handSize);
/**
* A request for a rematch.
*
* @param client the client object
*/
public void requestRematch (Client client);
public void requestRematch ();
}
src/main/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java
+8 -9
View File
@@ -25,7 +25,6 @@ import javax.annotation.Generated;
import com.threerings.parlor.card.data.Card;
import com.threerings.parlor.card.trick.client.TrickCardGameService;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.InvocationMarshaller;
/**
@@ -44,10 +43,10 @@ public class TrickCardGameMarshaller extends InvocationMarshaller
public static final int PLAY_CARD = 1;
// from interface TrickCardGameService
public void playCard (Client arg1, Card arg2, int arg3)
public void playCard (Card arg1, int arg2)
{
sendRequest(arg1, PLAY_CARD, new Object[] {
arg2, Integer.valueOf(arg3)
sendRequest(PLAY_CARD, new Object[] {
arg1, Integer.valueOf(arg2)
});
}
@@ -55,9 +54,9 @@ public class TrickCardGameMarshaller extends InvocationMarshaller
public static final int REQUEST_REMATCH = 2;
// from interface TrickCardGameService
public void requestRematch (Client arg1)
public void requestRematch ()
{
sendRequest(arg1, REQUEST_REMATCH, new Object[] {
sendRequest(REQUEST_REMATCH, new Object[] {
});
}
@@ -65,10 +64,10 @@ public class TrickCardGameMarshaller extends InvocationMarshaller
public static final int SEND_CARDS_TO_PLAYER = 3;
// from interface TrickCardGameService
public void sendCardsToPlayer (Client arg1, int arg2, Card[] arg3)
public void sendCardsToPlayer (int arg1, Card[] arg2)
{
sendRequest(arg1, SEND_CARDS_TO_PLAYER, new Object[] {
Integer.valueOf(arg2), arg3
sendRequest(SEND_CARDS_TO_PLAYER, new Object[] {
Integer.valueOf(arg1), arg2
});
}
}
src/main/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java
-1
View File
@@ -364,7 +364,6 @@ public class TrickCardGameManagerDelegate extends TurnGameManagerDelegate
}
}
/**
* Returns the number of players currently requesting or accepting a rematch.
*/
src/main/java/com/threerings/parlor/client/Invitation.java
+5 -8
View File
@@ -65,8 +65,7 @@ public class Invitation
public void accept ()
{
// generate the invocation service request
_pservice.respond(_ctx.getClient(), inviteId,
INVITATION_ACCEPTED, null, this);
_pservice.respond(inviteId, INVITATION_ACCEPTED, null, this);
}
/**
@@ -79,8 +78,7 @@ public class Invitation
public void refuse (String message)
{
// generate the invocation service request
_pservice.respond(_ctx.getClient(), inviteId,
INVITATION_REFUSED, message, this);
_pservice.respond(inviteId, INVITATION_REFUSED, message, this);
}
/**
@@ -96,7 +94,7 @@ public class Invitation
} else {
// otherwise, generate the invocation service request
_pservice.cancel(_ctx.getClient(), inviteId, this);
_pservice.cancel(inviteId, this);
// and remove it from the pending table
_ctx.getParlorDirector().clearInvitation(this);
}
@@ -117,8 +115,7 @@ public class Invitation
_observer = observer;
// generate the invocation service request
_pservice.respond(_ctx.getClient(), inviteId,
INVITATION_COUNTERED, config, this);
_pservice.respond(inviteId, INVITATION_COUNTERED, config, this);
}
// documentation inherited from interface
@@ -130,7 +127,7 @@ public class Invitation
// if the invitation was cancelled before we heard back about
// it, we need to send off a cancellation request now
if (_cancelled) {
_pservice.cancel(_ctx.getClient(), inviteId, this);
_pservice.cancel(inviteId, this);
} else {
// otherwise, put it in the pending invites table
_ctx.getParlorDirector().registerInvitation(this);
src/main/java/com/threerings/parlor/client/ParlorDirector.java
+2 -2
View File
@@ -109,7 +109,7 @@ public class ParlorDirector extends BasicDirector
// create the invitation record
Invitation invite = new Invitation(_ctx, _pservice, invitee, config, observer);
// submit the invitation request to the server
_pservice.invite(_ctx.getClient(), invitee, config, invite);
_pservice.invite(invitee, config, invite);
// and return the invitation to the caller
return invite;
}
@@ -122,7 +122,7 @@ public class ParlorDirector extends BasicDirector
*/
public void startSolitaire (GameConfig config, InvocationService.ConfirmListener listener)
{
_pservice.startSolitaire(_ctx.getClient(), config, listener);
_pservice.startSolitaire(config, listener);
}
@Override
src/main/java/com/threerings/parlor/client/ParlorService.java
+4 -8
View File
@@ -23,7 +23,6 @@ package com.threerings.parlor.client;
import com.threerings.util.Name;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.parlor.game.data.GameConfig;
@@ -53,13 +52,12 @@ public interface ParlorService extends InvocationService
* user, requesting that they join the inviting user in a game, the details of which are
* specified in the supplied game config object.
*
* @param client a connected, operational client instance.
* @param invitee the username of the user to be invited.
* @param config a game config object detailing the type and configuration of the game to be
* created.
* @param listener will receive and process the response.
*/
public void invite (Client client, Name invitee, GameConfig config,
public void invite (Name invitee, GameConfig config,
InviteListener listener);
/**
@@ -67,7 +65,6 @@ public interface ParlorService extends InvocationService
* Invitation#accept}, {@link Invitation#refuse}, or {@link Invitation#counter}. Requests that
* an invitation response be delivered with the specified parameters.
*
* @param client a connected, operational client instance.
* @param inviteId the unique id previously assigned by the server to this invitation.
* @param code the response code to use in responding to the invitation.
* @param arg the argument associated with the response (a string message from the player
@@ -76,21 +73,20 @@ public interface ParlorService extends InvocationService
* accepted invitation).
* @param listener will receive and process the response.
*/
public void respond (Client client, int inviteId, int code, Object arg,
public void respond (int inviteId, int code, Object arg,
InvocationListener listener);
/**
* You probably don't want to call this directly, but want to call {@link
* Invitation#cancel}. Requests that an outstanding invitation be cancelled.
*
* @param client a connected, operational client instance.
* @param inviteId the unique id previously assigned by the server to this invitation.
* @param listener will receive and process the response.
*/
public void cancel (Client client, int inviteId, InvocationListener listener);
public void cancel (int inviteId, InvocationListener listener);
/**
* Requests to start a single player game with the specified game configuration.
*/
public void startSolitaire (Client client, GameConfig config, ConfirmListener listener);
public void startSolitaire (GameConfig config, ConfirmListener listener);
}
src/main/java/com/threerings/parlor/client/TableDirector.java
+5 -5
View File
@@ -163,7 +163,7 @@ public class TableDirector extends BasicDirector
}
// go ahead and issue the create request
_tlobj.getTableService().createTable(_ctx.getClient(), tableConfig, config, this);
_tlobj.getTableService().createTable(tableConfig, config, this);
}
/**
@@ -187,7 +187,7 @@ public class TableDirector extends BasicDirector
}
// issue the join request
_tlobj.getTableService().joinTable(_ctx.getClient(), tableId, position, this);
_tlobj.getTableService().joinTable(tableId, position, this);
}
/**
@@ -204,7 +204,7 @@ public class TableDirector extends BasicDirector
}
// issue the leave request
_tlobj.getTableService().leaveTable(_ctx.getClient(), tableId, this);
_tlobj.getTableService().leaveTable(tableId, this);
}
/**
@@ -219,7 +219,7 @@ public class TableDirector extends BasicDirector
return;
}
_tlobj.getTableService().startTableNow(_ctx.getClient(), tableId, this);
_tlobj.getTableService().startTableNow(tableId, this);
}
/**
@@ -233,7 +233,7 @@ public class TableDirector extends BasicDirector
return;
}
_tlobj.getTableService().bootPlayer(_ctx.getClient(), tableId, target, this);
_tlobj.getTableService().bootPlayer(tableId, target, this);
}
@Override
src/main/java/com/threerings/parlor/client/TableService.java
+5 -9
View File
@@ -23,7 +23,6 @@ package com.threerings.parlor.client;
import com.threerings.util.Name;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.parlor.data.TableConfig;
@@ -37,42 +36,39 @@ public interface TableService extends InvocationService
/**
* Requests that a new table be created.
*
* @param client a connected, operational client instance.
* @param tableConfig the table configuration parameters.
* @param config the game config for the game to be matchmade by the table.
* @param listener will receive and process the response.
*/
public void createTable (Client client, TableConfig tableConfig, GameConfig config,
public void createTable (TableConfig tableConfig, GameConfig config,
ResultListener listener);
/**
* Requests that the current user be added to the specified table at the specified position.
*
* @param client a connected, operational client instance.
* @param tableId the unique id of the table to which this user wishes to be added.
* @param position the position at the table to which this user desires to be added.
* @param listener will receive and process the response.
*/
public void joinTable (Client client, int tableId, int position, InvocationListener listener);
public void joinTable (int tableId, int position, InvocationListener listener);
/**
* Requests that the current user be removed from the specified table.
*
* @param client a connected, operational client instance.
* @param tableId the unique id of the table from which this user wishes to be removed.
* @param listener will receive and process the response.
*/
public void leaveTable (Client client, int tableId, InvocationListener listener);
public void leaveTable (int tableId, InvocationListener listener);
/**
* Requests that the specified table be started now, even if all seats are not occupied. This
* will always fail if called by any other player than that seated in position 0 (usually the
* creator).
*/
public void startTableNow (Client client, int tableId, InvocationListener listener);
public void startTableNow (int tableId, InvocationListener listener);
/**
* Requests that another user be booted from the specified table.
*/
public void bootPlayer (Client client, int tableId, Name target, InvocationListener listener);
public void bootPlayer (int tableId, Name target, InvocationListener listener);
}
src/main/java/com/threerings/parlor/data/ParlorMarshaller.java
+20 -21
View File
@@ -25,7 +25,6 @@ import javax.annotation.Generated;
import com.threerings.parlor.client.ParlorService;
import com.threerings.parlor.game.data.GameConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
@@ -82,12 +81,12 @@ public class ParlorMarshaller extends InvocationMarshaller
public static final int CANCEL = 1;
// from interface ParlorService
public void cancel (Client arg1, int arg2, InvocationService.InvocationListener arg3)
public void cancel (int arg1, InvocationService.InvocationListener arg2)
{
ListenerMarshaller listener3 = new ListenerMarshaller();
listener3.listener = arg3;
sendRequest(arg1, CANCEL, new Object[] {
Integer.valueOf(arg2), listener3
ListenerMarshaller listener2 = new ListenerMarshaller();
listener2.listener = arg2;
sendRequest(CANCEL, new Object[] {
Integer.valueOf(arg1), listener2
});
}
@@ -95,12 +94,12 @@ public class ParlorMarshaller extends InvocationMarshaller
public static final int INVITE = 2;
// from interface ParlorService
public void invite (Client arg1, Name arg2, GameConfig arg3, ParlorService.InviteListener arg4)
public void invite (Name arg1, GameConfig arg2, ParlorService.InviteListener arg3)
{
ParlorMarshaller.InviteMarshaller listener4 = new ParlorMarshaller.InviteMarshaller();
listener4.listener = arg4;
sendRequest(arg1, INVITE, new Object[] {
arg2, arg3, listener4
ParlorMarshaller.InviteMarshaller listener3 = new ParlorMarshaller.InviteMarshaller();
listener3.listener = arg3;
sendRequest(INVITE, new Object[] {
arg1, arg2, listener3
});
}
@@ -108,12 +107,12 @@ public class ParlorMarshaller extends InvocationMarshaller
public static final int RESPOND = 3;
// from interface ParlorService
public void respond (Client arg1, int arg2, int arg3, Object arg4, InvocationService.InvocationListener arg5)
public void respond (int arg1, int arg2, Object arg3, InvocationService.InvocationListener arg4)
{
ListenerMarshaller listener5 = new ListenerMarshaller();
listener5.listener = arg5;
sendRequest(arg1, RESPOND, new Object[] {
Integer.valueOf(arg2), Integer.valueOf(arg3), arg4, listener5
ListenerMarshaller listener4 = new ListenerMarshaller();
listener4.listener = arg4;
sendRequest(RESPOND, new Object[] {
Integer.valueOf(arg1), Integer.valueOf(arg2), arg3, listener4
});
}
@@ -121,12 +120,12 @@ public class ParlorMarshaller extends InvocationMarshaller
public static final int START_SOLITAIRE = 4;
// from interface ParlorService
public void startSolitaire (Client arg1, GameConfig arg2, InvocationService.ConfirmListener arg3)
public void startSolitaire (GameConfig arg1, InvocationService.ConfirmListener arg2)
{
InvocationMarshaller.ConfirmMarshaller listener3 = new InvocationMarshaller.ConfirmMarshaller();
listener3.listener = arg3;
sendRequest(arg1, START_SOLITAIRE, new Object[] {
arg2, listener3
InvocationMarshaller.ConfirmMarshaller listener2 = new InvocationMarshaller.ConfirmMarshaller();
listener2.listener = arg2;
sendRequest(START_SOLITAIRE, new Object[] {
arg1, listener2
});
}
}
src/main/java/com/threerings/parlor/data/TableMarshaller.java
+25 -26
View File
@@ -25,7 +25,6 @@ import javax.annotation.Generated;
import com.threerings.parlor.client.TableService;
import com.threerings.parlor.game.data.GameConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.util.Name;
@@ -46,12 +45,12 @@ public class TableMarshaller extends InvocationMarshaller
public static final int BOOT_PLAYER = 1;
// from interface TableService
public void bootPlayer (Client arg1, int arg2, Name arg3, InvocationService.InvocationListener arg4)
public void bootPlayer (int arg1, Name arg2, InvocationService.InvocationListener arg3)
{
ListenerMarshaller listener4 = new ListenerMarshaller();
listener4.listener = arg4;
sendRequest(arg1, BOOT_PLAYER, new Object[] {
Integer.valueOf(arg2), arg3, listener4
ListenerMarshaller listener3 = new ListenerMarshaller();
listener3.listener = arg3;
sendRequest(BOOT_PLAYER, new Object[] {
Integer.valueOf(arg1), arg2, listener3
});
}
@@ -59,12 +58,12 @@ public class TableMarshaller extends InvocationMarshaller
public static final int CREATE_TABLE = 2;
// from interface TableService
public void createTable (Client arg1, TableConfig arg2, GameConfig arg3, InvocationService.ResultListener arg4)
public void createTable (TableConfig arg1, GameConfig arg2, InvocationService.ResultListener arg3)
{
InvocationMarshaller.ResultMarshaller listener4 = new InvocationMarshaller.ResultMarshaller();
listener4.listener = arg4;
sendRequest(arg1, CREATE_TABLE, new Object[] {
arg2, arg3, listener4
InvocationMarshaller.ResultMarshaller listener3 = new InvocationMarshaller.ResultMarshaller();
listener3.listener = arg3;
sendRequest(CREATE_TABLE, new Object[] {
arg1, arg2, listener3
});
}
@@ -72,12 +71,12 @@ public class TableMarshaller extends InvocationMarshaller
public static final int JOIN_TABLE = 3;
// from interface TableService
public void joinTable (Client arg1, int arg2, int arg3, InvocationService.InvocationListener arg4)
public void joinTable (int arg1, int arg2, InvocationService.InvocationListener arg3)
{
ListenerMarshaller listener4 = new ListenerMarshaller();
listener4.listener = arg4;
sendRequest(arg1, JOIN_TABLE, new Object[] {
Integer.valueOf(arg2), Integer.valueOf(arg3), listener4
ListenerMarshaller listener3 = new ListenerMarshaller();
listener3.listener = arg3;
sendRequest(JOIN_TABLE, new Object[] {
Integer.valueOf(arg1), Integer.valueOf(arg2), listener3
});
}
@@ -85,12 +84,12 @@ public class TableMarshaller extends InvocationMarshaller
public static final int LEAVE_TABLE = 4;
// from interface TableService
public void leaveTable (Client arg1, int arg2, InvocationService.InvocationListener arg3)
public void leaveTable (int arg1, InvocationService.InvocationListener arg2)
{
ListenerMarshaller listener3 = new ListenerMarshaller();
listener3.listener = arg3;
sendRequest(arg1, LEAVE_TABLE, new Object[] {
Integer.valueOf(arg2), listener3
ListenerMarshaller listener2 = new ListenerMarshaller();
listener2.listener = arg2;
sendRequest(LEAVE_TABLE, new Object[] {
Integer.valueOf(arg1), listener2
});
}
@@ -98,12 +97,12 @@ public class TableMarshaller extends InvocationMarshaller
public static final int START_TABLE_NOW = 5;
// from interface TableService
public void startTableNow (Client arg1, int arg2, InvocationService.InvocationListener arg3)
public void startTableNow (int arg1, InvocationService.InvocationListener arg2)
{
ListenerMarshaller listener3 = new ListenerMarshaller();
listener3.listener = arg3;
sendRequest(arg1, START_TABLE_NOW, new Object[] {
Integer.valueOf(arg2), listener3
ListenerMarshaller listener2 = new ListenerMarshaller();
listener2.listener = arg2;
sendRequest(START_TABLE_NOW, new Object[] {
Integer.valueOf(arg1), listener2
});
}
}
src/main/java/com/threerings/parlor/game/server/GameManager.java
-1
View File
@@ -695,7 +695,6 @@ public class GameManager extends PlaceManager
return (player instanceof BodyObject) ? (BodyObject) player : null;
}
/**
* Returns true if this game requires a no-show timer. The default implementation returns true
* for non-party games and false for party games. Derived classes may wish to change or augment
src/main/java/com/threerings/parlor/game/server/GameManagerDelegate.java
-1
View File
@@ -21,7 +21,6 @@
package com.threerings.parlor.game.server;
import com.threerings.util.Name;
import com.threerings.parlor.game.data.GameAI;
src/main/java/com/threerings/parlor/tourney/client/TourneyService.java
+3 -4
View File
@@ -21,7 +21,6 @@
package com.threerings.parlor.tourney.client;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
/**
@@ -33,15 +32,15 @@ public interface TourneyService extends InvocationService
/**
* Handles a request to join the tourney.
*/
public void join (Client caller, ConfirmListener listener);
public void join (ConfirmListener listener);
/**
* Handles a request to leave the tourney.
*/
public void leave (Client caller, ConfirmListener listener);
public void leave (ConfirmListener listener);
/**
* Handles a request to cancel the tourney.
*/
public void cancel (Client caller, ConfirmListener listener);
public void cancel (ConfirmListener listener);
}
src/main/java/com/threerings/parlor/tourney/client/TourniesService.java
+1 -2
View File
@@ -21,7 +21,6 @@
package com.threerings.parlor.tourney.client;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.parlor.tourney.data.TourneyConfig;
@@ -34,5 +33,5 @@ public interface TourniesService extends InvocationService
/**
* Creates a new tourney.
*/
public void createTourney (Client client, TourneyConfig config, ResultListener listener);
public void createTourney (TourneyConfig config, ResultListener listener);
}
src/main/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java
+15 -16
View File
@@ -24,7 +24,6 @@ package com.threerings.parlor.tourney.data;
import javax.annotation.Generated;
import com.threerings.parlor.tourney.client.TourneyService;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.InvocationMarshaller;
@@ -44,12 +43,12 @@ public class TourneyMarshaller extends InvocationMarshaller
public static final int CANCEL = 1;
// from interface TourneyService
public void cancel (Client arg1, InvocationService.ConfirmListener arg2)
public void cancel (InvocationService.ConfirmListener arg1)
{
InvocationMarshaller.ConfirmMarshaller listener2 = new InvocationMarshaller.ConfirmMarshaller();
listener2.listener = arg2;
sendRequest(arg1, CANCEL, new Object[] {
listener2
InvocationMarshaller.ConfirmMarshaller listener1 = new InvocationMarshaller.ConfirmMarshaller();
listener1.listener = arg1;
sendRequest(CANCEL, new Object[] {
listener1
});
}
@@ -57,12 +56,12 @@ public class TourneyMarshaller extends InvocationMarshaller
public static final int JOIN = 2;
// from interface TourneyService
public void join (Client arg1, InvocationService.ConfirmListener arg2)
public void join (InvocationService.ConfirmListener arg1)
{
InvocationMarshaller.ConfirmMarshaller listener2 = new InvocationMarshaller.ConfirmMarshaller();
listener2.listener = arg2;
sendRequest(arg1, JOIN, new Object[] {
listener2
InvocationMarshaller.ConfirmMarshaller listener1 = new InvocationMarshaller.ConfirmMarshaller();
listener1.listener = arg1;
sendRequest(JOIN, new Object[] {
listener1
});
}
@@ -70,12 +69,12 @@ public class TourneyMarshaller extends InvocationMarshaller
public static final int LEAVE = 3;
// from interface TourneyService
public void leave (Client arg1, InvocationService.ConfirmListener arg2)
public void leave (InvocationService.ConfirmListener arg1)
{
InvocationMarshaller.ConfirmMarshaller listener2 = new InvocationMarshaller.ConfirmMarshaller();
listener2.listener = arg2;
sendRequest(arg1, LEAVE, new Object[] {
listener2
InvocationMarshaller.ConfirmMarshaller listener1 = new InvocationMarshaller.ConfirmMarshaller();
listener1.listener = arg1;
sendRequest(LEAVE, new Object[] {
listener1
});
}
}
src/main/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java
+5 -6
View File
@@ -24,7 +24,6 @@ package com.threerings.parlor.tourney.data;
import javax.annotation.Generated;
import com.threerings.parlor.tourney.client.TourniesService;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.InvocationMarshaller;
@@ -44,12 +43,12 @@ public class TourniesMarshaller extends InvocationMarshaller
public static final int CREATE_TOURNEY = 1;
// from interface TourniesService
public void createTourney (Client arg1, TourneyConfig arg2, InvocationService.ResultListener arg3)
public void createTourney (TourneyConfig arg1, InvocationService.ResultListener arg2)
{
InvocationMarshaller.ResultMarshaller listener3 = new InvocationMarshaller.ResultMarshaller();
listener3.listener = arg3;
sendRequest(arg1, CREATE_TOURNEY, new Object[] {
arg2, listener3
InvocationMarshaller.ResultMarshaller listener2 = new InvocationMarshaller.ResultMarshaller();
listener2.listener = arg2;
sendRequest(CREATE_TOURNEY, new Object[] {
arg1, listener2
});
}
}
src/main/java/com/threerings/puzzle/client/PuzzleController.java
+2 -3
View File
@@ -754,12 +754,11 @@ public abstract class PuzzleController extends GameController
_states.clear();
// send the update progress request
_puzobj.puzzleGameService.updateProgressSync(
_ctx.getClient(), _puzobj.sessionId, events, states);
_puzobj.puzzleGameService.updateProgressSync(_puzobj.sessionId, events, states);
} else {
// send the update progress request
_puzobj.puzzleGameService.updateProgress(_ctx.getClient(), _puzobj.sessionId, events);
_puzobj.puzzleGameService.updateProgress(_puzobj.sessionId, events);
}
}
src/main/java/com/threerings/puzzle/client/PuzzleGameService.java
+2 -3
View File
@@ -21,7 +21,6 @@
package com.threerings.puzzle.client;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.puzzle.data.Board;
@@ -37,12 +36,12 @@ public interface PuzzleGameService extends InvocationService, PuzzleCodes
* Asks the puzzle manager to apply the supplied progress events for the specified puzzle round
* to the player's state.
*/
public void updateProgress (Client client, int sessionId, int[] events);
public void updateProgress (int sessionId, int[] events);
/**
* Debug variant of {@link #updateProgress} that is only used when
* {@link PuzzlePanel#isSyncingBoards} is true and which includes the board states associated
* with each event.
*/
public void updateProgressSync (Client client, int sessionId, int[] events, Board[] states);
public void updateProgressSync (int sessionId, int[] events, Board[] states);
}
src/main/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java
+6 -7
View File
@@ -23,7 +23,6 @@ package com.threerings.puzzle.data;
import javax.annotation.Generated;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.puzzle.client.PuzzleGameService;
@@ -43,10 +42,10 @@ public class PuzzleGameMarshaller extends InvocationMarshaller
public static final int UPDATE_PROGRESS = 1;
// from interface PuzzleGameService
public void updateProgress (Client arg1, int arg2, int[] arg3)
public void updateProgress (int arg1, int[] arg2)
{
sendRequest(arg1, UPDATE_PROGRESS, new Object[] {
Integer.valueOf(arg2), arg3
sendRequest(UPDATE_PROGRESS, new Object[] {
Integer.valueOf(arg1), arg2
});
}
@@ -54,10 +53,10 @@ public class PuzzleGameMarshaller extends InvocationMarshaller
public static final int UPDATE_PROGRESS_SYNC = 2;
// from interface PuzzleGameService
public void updateProgressSync (Client arg1, int arg2, int[] arg3, Board[] arg4)
public void updateProgressSync (int arg1, int[] arg2, Board[] arg3)
{
sendRequest(arg1, UPDATE_PROGRESS_SYNC, new Object[] {
Integer.valueOf(arg2), arg3, arg4
sendRequest(UPDATE_PROGRESS_SYNC, new Object[] {
Integer.valueOf(arg1), arg2, arg3
});
}
}
src/main/java/com/threerings/stage/client/StageSceneService.java
+2 -5
View File
@@ -21,7 +21,6 @@
package com.threerings.stage.client;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.miso.data.ObjectInfo;
@@ -34,12 +33,10 @@ public interface StageSceneService extends InvocationService
/**
* Requests to add the supplied object to the current scene.
*/
public void addObject (Client client, ObjectInfo info,
ConfirmListener listener);
public void addObject (ObjectInfo info, ConfirmListener listener);
/**
* Requests to remove the supplied objects from the current scene.
*/
public void removeObjects (Client client, ObjectInfo[] info,
ConfirmListener listener);
public void removeObjects (ObjectInfo[] info, ConfirmListener listener);
}
src/main/java/com/threerings/stage/data/StageSceneMarshaller.java
+10 -11
View File
@@ -24,7 +24,6 @@ package com.threerings.stage.data;
import javax.annotation.Generated;
import com.threerings.miso.data.ObjectInfo;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.stage.client.StageSceneService;
@@ -45,12 +44,12 @@ public class StageSceneMarshaller extends InvocationMarshaller
public static final int ADD_OBJECT = 1;
// from interface StageSceneService
public void addObject (Client arg1, ObjectInfo arg2, InvocationService.ConfirmListener arg3)
public void addObject (ObjectInfo arg1, InvocationService.ConfirmListener arg2)
{
InvocationMarshaller.ConfirmMarshaller listener3 = new InvocationMarshaller.ConfirmMarshaller();
listener3.listener = arg3;
sendRequest(arg1, ADD_OBJECT, new Object[] {
arg2, listener3
InvocationMarshaller.ConfirmMarshaller listener2 = new InvocationMarshaller.ConfirmMarshaller();
listener2.listener = arg2;
sendRequest(ADD_OBJECT, new Object[] {
arg1, listener2
});
}
@@ -58,12 +57,12 @@ public class StageSceneMarshaller extends InvocationMarshaller
public static final int REMOVE_OBJECTS = 2;
// from interface StageSceneService
public void removeObjects (Client arg1, ObjectInfo[] arg2, InvocationService.ConfirmListener arg3)
public void removeObjects (ObjectInfo[] arg1, InvocationService.ConfirmListener arg2)
{
InvocationMarshaller.ConfirmMarshaller listener3 = new InvocationMarshaller.ConfirmMarshaller();
listener3.listener = arg3;
sendRequest(arg1, REMOVE_OBJECTS, new Object[] {
arg2, listener3
InvocationMarshaller.ConfirmMarshaller listener2 = new InvocationMarshaller.ConfirmMarshaller();
listener2.listener = arg2;
sendRequest(REMOVE_OBJECTS, new Object[] {
arg1, listener2
});
}
}
src/main/java/com/threerings/stage/tools/editor/DirectionButton.java
-1
View File
@@ -82,7 +82,6 @@ public class DirectionButton extends AbstractButton
repaint();
}
});
}
src/main/java/com/threerings/whirled/client/SceneDirector.java
+1 -1
View File
@@ -450,7 +450,7 @@ public class SceneDirector extends BasicDirector
// issue a moveTo request
log.info("Issuing moveTo(" + _pendingSceneId + ", " + sceneVers + ").");
_sservice.moveTo(_ctx.getClient(), _pendingSceneId, sceneVers, this);
_sservice.moveTo(_pendingSceneId, sceneVers, this);
}
/**
src/main/java/com/threerings/whirled/client/SceneService.java
+1 -2
View File
@@ -21,7 +21,6 @@
package com.threerings.whirled.client;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.crowd.data.PlaceConfig;
@@ -83,5 +82,5 @@ public interface SceneService extends InvocationService
* @param sceneId the scene id to which we want to move.
* @param version the version number of the scene object that we have in our local repository.
*/
public void moveTo (Client client, int sceneId, int version, SceneMoveListener listener);
public void moveTo (int sceneId, int version, SceneMoveListener listener);
}
src/main/java/com/threerings/whirled/data/SceneMarshaller.java
+5 -6
View File
@@ -24,7 +24,6 @@ package com.threerings.whirled.data;
import javax.annotation.Generated;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
import com.threerings.whirled.client.SceneService;
@@ -134,12 +133,12 @@ public class SceneMarshaller extends InvocationMarshaller
public static final int MOVE_TO = 1;
// from interface SceneService
public void moveTo (Client arg1, int arg2, int arg3, SceneService.SceneMoveListener arg4)
public void moveTo (int arg1, int arg2, SceneService.SceneMoveListener arg3)
{
SceneMarshaller.SceneMoveMarshaller listener4 = new SceneMarshaller.SceneMoveMarshaller();
listener4.listener = arg4;
sendRequest(arg1, MOVE_TO, new Object[] {
Integer.valueOf(arg2), Integer.valueOf(arg3), listener4
SceneMarshaller.SceneMoveMarshaller listener3 = new SceneMarshaller.SceneMoveMarshaller();
listener3.listener = arg3;
sendRequest(MOVE_TO, new Object[] {
Integer.valueOf(arg1), Integer.valueOf(arg2), listener3
});
}
}
src/main/java/com/threerings/whirled/server/SceneRegistry.java
-1
View File
@@ -236,7 +236,6 @@ public class SceneRegistry
return newList;
}
/**
* Called when the scene resolution has completed successfully.
*/
src/main/java/com/threerings/whirled/spot/client/SpotSceneDirector.java
+4 -4
View File
@@ -162,7 +162,7 @@ public class SpotSceneDirector extends BasicDirector
// issue a traversePortal request
log.info("Issuing traversePortal(" + sceneId + ", " + dest + ", " + sceneVer + ").");
_sservice.traversePortal(_ctx.getClient(), sceneId, portalId, sceneVer,
_sservice.traversePortal(sceneId, portalId, sceneVer,
new SpotService.SpotSceneMoveListener() {
public void requestFailed (String cause) {
_scdir.requestFailed(cause);
@@ -257,7 +257,7 @@ public class SpotSceneDirector extends BasicDirector
}
}
};
_sservice.changeLocation(_ctx.getClient(), sceneId, loc, clist);
_sservice.changeLocation(sceneId, loc, clist);
}
/**
@@ -282,7 +282,7 @@ public class SpotSceneDirector extends BasicDirector
log.info("Joining cluster", "friend", froid);
_sservice.joinCluster(_ctx.getClient(), froid, new ConfirmListener() {
_sservice.joinCluster(froid, new ConfirmListener() {
public void requestProcessed () {
if (listener != null) {
listener.requestCompleted(null);
@@ -334,7 +334,7 @@ public class SpotSceneDirector extends BasicDirector
message = _chatdir.filter(message, null, true);
if (message != null) {
_sservice.clusterSpeak(_ctx.getClient(), message, mode);
_sservice.clusterSpeak(message, mode);
}
return true;
}
src/main/java/com/threerings/whirled/spot/client/SpotService.java
+4 -8
View File
@@ -21,7 +21,6 @@
package com.threerings.whirled.spot.client;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.whirled.client.SceneService.SceneMoveListener;
@@ -55,8 +54,7 @@ public interface SpotService extends InvocationService
* @param destSceneVer the version of the destination scene data that
* the client has in its local repository.
*/
public void traversePortal (
Client client, int sceneId, int portalId, int destSceneVer,
public void traversePortal (int sceneId, int portalId, int destSceneVer,
SpotSceneMoveListener listener);
/**
@@ -67,8 +65,7 @@ public interface SpotService extends InvocationService
* @param sceneId the id of the scene in which to change location.
* @param loc the location to which to move.
*/
public void changeLocation (Client client, int sceneId, Location loc,
ConfirmListener listener);
public void changeLocation (int sceneId, Location loc, ConfirmListener listener);
/**
* Requests that this client start or join the specified cluster. They
@@ -79,8 +76,7 @@ public interface SpotService extends InvocationService
* or target user's cluster, or create a cluster with the target user
* if they are not already in one.
*/
public void joinCluster (Client client, int friendOid,
ConfirmListener listener);
public void joinCluster (int friendOid, ConfirmListener listener);
/**
* Requests that the supplied message be delivered to listeners in the
@@ -90,5 +86,5 @@ public interface SpotService extends InvocationService
* @param mode an associated mode constant that can be used to
* identify different kinds of "speech" (emote, thought bubble, etc.).
*/
public void clusterSpeak (Client client, String message, byte mode);
public void clusterSpeak (String message, byte mode);
}
src/main/java/com/threerings/whirled/spot/data/SpotMarshaller.java
+18 -19
View File
@@ -24,7 +24,6 @@ package com.threerings.whirled.spot.data;
import javax.annotation.Generated;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
@@ -155,12 +154,12 @@ public class SpotMarshaller extends InvocationMarshaller
public static final int CHANGE_LOCATION = 1;
// from interface SpotService
public void changeLocation (Client arg1, int arg2, Location arg3, InvocationService.ConfirmListener arg4)
public void changeLocation (int arg1, Location arg2, InvocationService.ConfirmListener arg3)
{
InvocationMarshaller.ConfirmMarshaller listener4 = new InvocationMarshaller.ConfirmMarshaller();
listener4.listener = arg4;
sendRequest(arg1, CHANGE_LOCATION, new Object[] {
Integer.valueOf(arg2), arg3, listener4
InvocationMarshaller.ConfirmMarshaller listener3 = new InvocationMarshaller.ConfirmMarshaller();
listener3.listener = arg3;
sendRequest(CHANGE_LOCATION, new Object[] {
Integer.valueOf(arg1), arg2, listener3
});
}
@@ -168,10 +167,10 @@ public class SpotMarshaller extends InvocationMarshaller
public static final int CLUSTER_SPEAK = 2;
// from interface SpotService
public void clusterSpeak (Client arg1, String arg2, byte arg3)
public void clusterSpeak (String arg1, byte arg2)
{
sendRequest(arg1, CLUSTER_SPEAK, new Object[] {
arg2, Byte.valueOf(arg3)
sendRequest(CLUSTER_SPEAK, new Object[] {
arg1, Byte.valueOf(arg2)
});
}
@@ -179,12 +178,12 @@ public class SpotMarshaller extends InvocationMarshaller
public static final int JOIN_CLUSTER = 3;
// from interface SpotService
public void joinCluster (Client arg1, int arg2, InvocationService.ConfirmListener arg3)
public void joinCluster (int arg1, InvocationService.ConfirmListener arg2)
{
InvocationMarshaller.ConfirmMarshaller listener3 = new InvocationMarshaller.ConfirmMarshaller();
listener3.listener = arg3;
sendRequest(arg1, JOIN_CLUSTER, new Object[] {
Integer.valueOf(arg2), listener3
InvocationMarshaller.ConfirmMarshaller listener2 = new InvocationMarshaller.ConfirmMarshaller();
listener2.listener = arg2;
sendRequest(JOIN_CLUSTER, new Object[] {
Integer.valueOf(arg1), listener2
});
}
@@ -192,12 +191,12 @@ public class SpotMarshaller extends InvocationMarshaller
public static final int TRAVERSE_PORTAL = 4;
// from interface SpotService
public void traversePortal (Client arg1, int arg2, int arg3, int arg4, SpotService.SpotSceneMoveListener arg5)
public void traversePortal (int arg1, int arg2, int arg3, SpotService.SpotSceneMoveListener arg4)
{
SpotMarshaller.SpotSceneMoveMarshaller listener5 = new SpotMarshaller.SpotSceneMoveMarshaller();
listener5.listener = arg5;
sendRequest(arg1, TRAVERSE_PORTAL, new Object[] {
Integer.valueOf(arg2), Integer.valueOf(arg3), Integer.valueOf(arg4), listener5
SpotMarshaller.SpotSceneMoveMarshaller listener4 = new SpotMarshaller.SpotSceneMoveMarshaller();
listener4.listener = arg4;
sendRequest(TRAVERSE_PORTAL, new Object[] {
Integer.valueOf(arg1), Integer.valueOf(arg2), Integer.valueOf(arg3), listener4
});
}
}
src/main/java/com/threerings/whirled/zone/client/ZoneDirector.java
+1 -1
View File
@@ -152,7 +152,7 @@ public class ZoneDirector extends BasicDirector
// issue a moveTo request
log.info("Issuing zoned moveTo(" + ZoneUtil.toString(_pendingZoneId) +
", " + sceneId + ", " + sceneVers + ").");
_zservice.moveTo(_ctx.getClient(), _pendingZoneId, sceneId, sceneVers, this);
_zservice.moveTo(_pendingZoneId, sceneId, sceneVers, this);
}
@Override
src/main/java/com/threerings/whirled/zone/client/ZoneService.java
+1 -3
View File
@@ -21,7 +21,6 @@
package com.threerings.whirled.zone.client;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.crowd.data.PlaceConfig;
@@ -72,6 +71,5 @@ public interface ZoneService extends InvocationService
* @param version the version number of the scene object that we have in our local repository.
* @param listener receives the callback when the request succeeds or fails.
*/
public void moveTo (Client client, int zoneId, int sceneId, int version,
ZoneMoveListener listener);
public void moveTo (int zoneId, int sceneId, int version, ZoneMoveListener listener);
}
src/main/java/com/threerings/whirled/zone/data/ZoneMarshaller.java
+5 -6
View File
@@ -24,7 +24,6 @@ package com.threerings.whirled.zone.data;
import javax.annotation.Generated;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
import com.threerings.whirled.data.SceneModel;
@@ -136,12 +135,12 @@ public class ZoneMarshaller extends InvocationMarshaller
public static final int MOVE_TO = 1;
// from interface ZoneService
public void moveTo (Client arg1, int arg2, int arg3, int arg4, ZoneService.ZoneMoveListener arg5)
public void moveTo (int arg1, int arg2, int arg3, ZoneService.ZoneMoveListener arg4)
{
ZoneMarshaller.ZoneMoveMarshaller listener5 = new ZoneMarshaller.ZoneMoveMarshaller();
listener5.listener = arg5;
sendRequest(arg1, MOVE_TO, new Object[] {
Integer.valueOf(arg2), Integer.valueOf(arg3), Integer.valueOf(arg4), listener5
ZoneMarshaller.ZoneMoveMarshaller listener4 = new ZoneMarshaller.ZoneMoveMarshaller();
listener4.listener = arg4;
sendRequest(MOVE_TO, new Object[] {
Integer.valueOf(arg1), Integer.valueOf(arg2), Integer.valueOf(arg3), listener4
});
}
}
src/main/java/com/threerings/whirled/zone/peer/data/HostedZone.java
-1
View File
@@ -55,5 +55,4 @@ public class HostedZone extends SimpleStreamableObject
return zoneId;
}
}
src/main/java/com/threerings/whirled/zone/peer/server/ZoneNodeObject.java
-1
View File
@@ -38,7 +38,6 @@ public class ZoneNodeObject extends CrowdNodeObject
/** Contains info on all zones hosted by this server. */
public DSet<HostedZone> hostedZones = DSet.newDSet();
// AUTO-GENERATED: METHODS START
/**
* Requests that the specified entry be added to the