Yay for rabbit holes. Revamped the table services to decouple them from places.
While I was in there, I extracted the communication between the client and the TableManager into a new-style "embedded in the TableLobbyObject" service instead of wonkily routing everything through the global ParlorService and the ParlorProvider (which got merged into the ParlorManager as a part of this rabbit holery). The GG build will break... I will fix it. git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@255 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
@@ -24,10 +24,7 @@ package com.threerings.parlor.client {
|
||||
import flash.utils.ByteArray;
|
||||
import com.threerings.parlor.client.ParlorService;
|
||||
import com.threerings.parlor.client.ParlorService_InviteListener;
|
||||
import com.threerings.parlor.client.ParlorService_TableListener;
|
||||
import com.threerings.parlor.data.ParlorMarshaller_InviteMarshaller;
|
||||
import com.threerings.parlor.data.ParlorMarshaller_TableMarshaller;
|
||||
import com.threerings.parlor.data.TableConfig;
|
||||
import com.threerings.parlor.game.data.GameConfig;
|
||||
import com.threerings.presents.client.Client;
|
||||
import com.threerings.presents.client.InvocationService;
|
||||
@@ -44,25 +41,13 @@ public interface ParlorService extends InvocationService
|
||||
// from Java interface ParlorService
|
||||
function cancel (arg1 :Client, arg2 :int, arg3 :InvocationService_InvocationListener) :void;
|
||||
|
||||
// from Java interface ParlorService
|
||||
function createTable (arg1 :Client, arg2 :int, arg3 :TableConfig, arg4 :GameConfig, arg5 :ParlorService_TableListener) :void;
|
||||
|
||||
// from Java interface ParlorService
|
||||
function invite (arg1 :Client, arg2 :Name, arg3 :GameConfig, arg4 :ParlorService_InviteListener) :void;
|
||||
|
||||
// from Java interface ParlorService
|
||||
function joinTable (arg1 :Client, arg2 :int, arg3 :int, arg4 :int, arg5 :InvocationService_InvocationListener) :void;
|
||||
|
||||
// from Java interface ParlorService
|
||||
function leaveTable (arg1 :Client, arg2 :int, arg3 :int, arg4 :InvocationService_InvocationListener) :void;
|
||||
|
||||
// from Java interface ParlorService
|
||||
function respond (arg1 :Client, arg2 :int, arg3 :int, arg4 :Object, arg5 :InvocationService_InvocationListener) :void;
|
||||
|
||||
// from Java interface ParlorService
|
||||
function startSolitaire (arg1 :Client, arg2 :GameConfig, arg3 :InvocationService_ConfirmListener) :void;
|
||||
|
||||
// from Java interface ParlorService
|
||||
function startTableNow (arg1 :Client, arg2 :int, arg3 :int, arg4 :InvocationService_InvocationListener) :void;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,10 +26,7 @@ import com.threerings.util.*; // for Float, Integer, etc.
|
||||
|
||||
import com.threerings.parlor.client.ParlorService;
|
||||
import com.threerings.parlor.client.ParlorService_InviteListener;
|
||||
import com.threerings.parlor.client.ParlorService_TableListener;
|
||||
import com.threerings.parlor.data.ParlorMarshaller_InviteMarshaller;
|
||||
import com.threerings.parlor.data.ParlorMarshaller_TableMarshaller;
|
||||
import com.threerings.parlor.data.TableConfig;
|
||||
import com.threerings.parlor.game.data.GameConfig;
|
||||
import com.threerings.presents.client.Client;
|
||||
import com.threerings.presents.client.InvocationService_ConfirmListener;
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
//
|
||||
// $Id$
|
||||
//
|
||||
// Vilya library - tools for developing networked games
|
||||
// Copyright (C) 2002-2007 Three Rings Design, Inc., All Rights Reserved
|
||||
// http://www.threerings.net/code/vilya/
|
||||
//
|
||||
// This library is free software; you can redistribute it and/or modify it
|
||||
// under the terms of the GNU Lesser General Public License as published
|
||||
// by the Free Software Foundation; either version 2.1 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
// Lesser General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Lesser General Public
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package com.threerings.parlor.client {
|
||||
|
||||
import flash.utils.ByteArray;
|
||||
import com.threerings.parlor.client.TableService;
|
||||
import com.threerings.parlor.data.TableConfig;
|
||||
import com.threerings.parlor.game.data.GameConfig;
|
||||
import com.threerings.presents.client.Client;
|
||||
import com.threerings.presents.client.InvocationService;
|
||||
import com.threerings.presents.client.InvocationService_InvocationListener;
|
||||
import com.threerings.presents.client.InvocationService_ResultListener;
|
||||
import com.threerings.presents.data.InvocationMarshaller_ResultMarshaller;
|
||||
|
||||
/**
|
||||
* An ActionScript version of the Java TableService interface.
|
||||
*/
|
||||
public interface TableService extends InvocationService
|
||||
{
|
||||
// from Java interface TableService
|
||||
function createTable (arg1 :Client, arg2 :TableConfig, arg3 :GameConfig, arg4 :InvocationService_ResultListener) :void;
|
||||
|
||||
// from Java interface TableService
|
||||
function joinTable (arg1 :Client, arg2 :int, arg3 :int, arg4 :InvocationService_InvocationListener) :void;
|
||||
|
||||
// from Java interface TableService
|
||||
function leaveTable (arg1 :Client, arg2 :int, arg3 :InvocationService_InvocationListener) :void;
|
||||
|
||||
// from Java interface TableService
|
||||
function startTableNow (arg1 :Client, arg2 :int, arg3 :InvocationService_InvocationListener) :void;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
//
|
||||
// $Id$
|
||||
//
|
||||
// Vilya library - tools for developing networked games
|
||||
// Copyright (C) 2002-2007 Three Rings Design, Inc., All Rights Reserved
|
||||
// http://www.threerings.net/code/vilya/
|
||||
//
|
||||
// This library is free software; you can redistribute it and/or modify it
|
||||
// under the terms of the GNU Lesser General Public License as published
|
||||
// by the Free Software Foundation; either version 2.1 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
// Lesser General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Lesser General Public
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package com.threerings.parlor.client {
|
||||
|
||||
import flash.utils.ByteArray;
|
||||
import com.threerings.util.*; // for Float, Integer, etc.
|
||||
|
||||
import com.threerings.parlor.client.TableService;
|
||||
import com.threerings.parlor.client.TableService_TableListener;
|
||||
import com.threerings.parlor.data.TableConfig;
|
||||
import com.threerings.parlor.data.TableMarshaller_TableMarshaller;
|
||||
import com.threerings.parlor.game.data.GameConfig;
|
||||
import com.threerings.presents.client.Client;
|
||||
import com.threerings.presents.client.InvocationService_InvocationListener;
|
||||
|
||||
/**
|
||||
* An ActionScript version of the Java TableService_TableListener interface.
|
||||
*/
|
||||
public interface TableService_TableListener
|
||||
extends InvocationService_InvocationListener
|
||||
{
|
||||
// from Java TableService_TableListener
|
||||
function tableCreated (arg1 :int) :void
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user