diff --git a/src/as/com/threerings/parlor/data/ParlorMarshaller.as b/src/as/com/threerings/parlor/data/ParlorMarshaller.as index b259855b..5972b9fb 100644 --- a/src/as/com/threerings/parlor/data/ParlorMarshaller.as +++ b/src/as/com/threerings/parlor/data/ParlorMarshaller.as @@ -22,13 +22,20 @@ package com.threerings.parlor.data { 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.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_ConfirmListener; import com.threerings.presents.client.InvocationService_InvocationListener; import com.threerings.presents.data.InvocationMarshaller; +import com.threerings.presents.data.InvocationMarshaller_ConfirmMarshaller; +import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller; import com.threerings.presents.dobj.InvocationResponseEvent; + +import com.threerings.util.Integer; import com.threerings.util.Name; /** @@ -89,7 +96,7 @@ public class ParlorMarshaller extends InvocationMarshaller // documentation inherited from interface public function joinTable (arg1 :Client, arg2 :int, arg3 :int, arg4 :int, arg5 :InvocationService_InvocationListener) :void { - var listener5 :InvocationMarshaller_ListenerMarshaller listener5 = + var listener5 :InvocationMarshaller_ListenerMarshaller = new InvocationMarshaller_ListenerMarshaller(); listener5.listener = arg5; sendRequest(arg1, JOIN_TABLE, [ @@ -118,7 +125,7 @@ public class ParlorMarshaller extends InvocationMarshaller public function respond (arg1 :Client, arg2 :int, arg3 :int, arg4 :Object, arg5 :InvocationService_InvocationListener) :void { var listener5 :InvocationMarshaller_ListenerMarshaller = - new InvocationMarshallerListenerMarshaller(); + new InvocationMarshaller_ListenerMarshaller(); listener5.listener = arg5; sendRequest(arg1, RESPOND, [ Integer.valueOf(arg2), Integer.valueOf(arg3), arg4, listener5 diff --git a/src/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as b/src/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as index e909ec8e..ab4cc829 100644 --- a/src/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as +++ b/src/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as @@ -2,11 +2,15 @@ package com.threerings.parlor.data { import com.threerings.util.Integer; +import com.threerings.presents.dobj.InvocationResponseEvent; + import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller; +import com.threerings.parlor.client.ParlorService_InviteListener; + public class ParlorMarshaller_InviteMarshaller extends InvocationMarshaller_ListenerMarshaller - implements InviteListener + implements ParlorService_InviteListener { /** The method id used to dispatch {@link #inviteReceived} * responses. */ @@ -15,7 +19,6 @@ public class ParlorMarshaller_InviteMarshaller // documentation inherited from interface public function inviteReceived (arg1 :int) :void { - _invId = null; omgr.postEvent(new InvocationResponseEvent( callerOid, requestId, INVITE_RECEIVED, [ Integer.valueOf(arg1) ])); @@ -26,7 +29,7 @@ public class ParlorMarshaller_InviteMarshaller { switch (methodId) { case INVITE_RECEIVED: - (listener as InviteListener).inviteReceived( + (listener as ParlorService_InviteListener).inviteReceived( (args[0] as Integer).value); return; diff --git a/src/as/com/threerings/parlor/data/ParlorMarshaller_TableMarshaller.as b/src/as/com/threerings/parlor/data/ParlorMarshaller_TableMarshaller.as index cfc3f129..6496ad1d 100644 --- a/src/as/com/threerings/parlor/data/ParlorMarshaller_TableMarshaller.as +++ b/src/as/com/threerings/parlor/data/ParlorMarshaller_TableMarshaller.as @@ -2,11 +2,15 @@ package com.threerings.parlor.data { import com.threerings.util.Integer; +import com.threerings.presents.dobj.InvocationResponseEvent; + import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller; +import com.threerings.parlor.client.ParlorService_TableListener; + public class ParlorMarshaller_TableMarshaller extends InvocationMarshaller_ListenerMarshaller - implements TableListener + implements ParlorService_TableListener { /** The method id used to dispatch {@link #tableCreated} * responses. */ @@ -15,7 +19,6 @@ public class ParlorMarshaller_TableMarshaller // documentation inherited from interface public function tableCreated (arg1 :int) :void { - _invId = null; omgr.postEvent(new InvocationResponseEvent( callerOid, requestId, TABLE_CREATED, [ Integer.valueOf(arg1) ])); @@ -26,7 +29,7 @@ public class ParlorMarshaller_TableMarshaller { switch (methodId) { case TABLE_CREATED: - (listener as TableListener).tableCreated( + (listener as ParlorService_TableListener).tableCreated( (args[0] as Integer).value); return;