From a19b77e68bc84e92758d15fa748bd6db92201808 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Sat, 10 Jul 2004 04:17:21 +0000
Subject: [PATCH] Confirm our start puzzle requests.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3056 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../com/threerings/puzzle/client/PuzzleService.java    |  4 ++--
 .../com/threerings/puzzle/data/PuzzleMarshaller.java   |  8 ++++----
 .../com/threerings/puzzle/server/PuzzleDispatcher.java |  6 +++---
 .../com/threerings/puzzle/server/PuzzleProvider.java   | 10 ++++++----
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/java/com/threerings/puzzle/client/PuzzleService.java b/src/java/com/threerings/puzzle/client/PuzzleService.java
index cc6e3e4f0..067000a60 100644
--- a/src/java/com/threerings/puzzle/client/PuzzleService.java
+++ b/src/java/com/threerings/puzzle/client/PuzzleService.java
@@ -1,5 +1,5 @@
 //
-// $Id: PuzzleService.java,v 1.2 2004/06/22 14:08:58 mdb Exp $
+// $Id: PuzzleService.java,v 1.3 2004/07/10 04:17:21 mdb Exp $
 
 package com.threerings.puzzle.client;
 
@@ -31,7 +31,7 @@ public interface PuzzleService extends InvocationService
      * puzzle.
      */
     public void startPuzzle (Client client, SolitairePuzzleConfig config,
-                             InvocationListener listener);
+                             ConfirmListener listener);
 
     /**
      * Requests that this client enter the specified puzzle.
diff --git a/src/java/com/threerings/puzzle/data/PuzzleMarshaller.java b/src/java/com/threerings/puzzle/data/PuzzleMarshaller.java
index 5b2d9cf51..2f454d42d 100644
--- a/src/java/com/threerings/puzzle/data/PuzzleMarshaller.java
+++ b/src/java/com/threerings/puzzle/data/PuzzleMarshaller.java
@@ -1,11 +1,11 @@
 //
-// $Id: PuzzleMarshaller.java,v 1.2 2004/06/22 14:08:58 mdb Exp $
+// $Id: PuzzleMarshaller.java,v 1.3 2004/07/10 04:17:21 mdb Exp $
 
 package com.threerings.puzzle.data;
 
 import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.presents.client.Client;
-import com.threerings.presents.client.InvocationService.InvocationListener;
+import com.threerings.presents.client.InvocationService.ConfirmListener;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.dobj.InvocationResponseEvent;
 import com.threerings.puzzle.client.PuzzleService;
@@ -57,9 +57,9 @@ public class PuzzleMarshaller extends InvocationMarshaller
     public static final int START_PUZZLE = 1;
 
     // documentation inherited from interface
-    public void startPuzzle (Client arg1, SolitairePuzzleConfig arg2, InvocationListener arg3)
+    public void startPuzzle (Client arg1, SolitairePuzzleConfig arg2, ConfirmListener arg3)
     {
-        ListenerMarshaller listener3 = new ListenerMarshaller();
+        ConfirmMarshaller listener3 = new ConfirmMarshaller();
         listener3.listener = arg3;
         sendRequest(arg1, START_PUZZLE, new Object[] {
             arg2, listener3
diff --git a/src/java/com/threerings/puzzle/server/PuzzleDispatcher.java b/src/java/com/threerings/puzzle/server/PuzzleDispatcher.java
index 74afa7e7e..ffea9b732 100644
--- a/src/java/com/threerings/puzzle/server/PuzzleDispatcher.java
+++ b/src/java/com/threerings/puzzle/server/PuzzleDispatcher.java
@@ -1,11 +1,11 @@
 //
-// $Id: PuzzleDispatcher.java,v 1.2 2004/06/22 14:08:58 mdb Exp $
+// $Id: PuzzleDispatcher.java,v 1.3 2004/07/10 04:17:21 mdb Exp $
 
 package com.threerings.puzzle.server;
 
 import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.presents.client.Client;
-import com.threerings.presents.client.InvocationService.InvocationListener;
+import com.threerings.presents.client.InvocationService.ConfirmListener;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.server.InvocationDispatcher;
@@ -44,7 +44,7 @@ public class PuzzleDispatcher extends InvocationDispatcher
         case PuzzleMarshaller.START_PUZZLE:
             ((PuzzleProvider)provider).startPuzzle(
                 source,
-                (SolitairePuzzleConfig)args[0], (InvocationListener)args[1]
+                (SolitairePuzzleConfig)args[0], (ConfirmListener)args[1]
             );
             return;
 
diff --git a/src/java/com/threerings/puzzle/server/PuzzleProvider.java b/src/java/com/threerings/puzzle/server/PuzzleProvider.java
index 9e4008928..0b667786a 100644
--- a/src/java/com/threerings/puzzle/server/PuzzleProvider.java
+++ b/src/java/com/threerings/puzzle/server/PuzzleProvider.java
@@ -1,11 +1,11 @@
 //
-// $Id: PuzzleProvider.java,v 1.4 2004/06/22 14:08:58 mdb Exp $
+// $Id: PuzzleProvider.java,v 1.5 2004/07/10 04:17:21 mdb Exp $
 
 package com.threerings.puzzle.server;
 
 import com.threerings.util.Name;
 
-import com.threerings.presents.client.InvocationService.InvocationListener;
+import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.dobj.RootDObjectManager;
 import com.threerings.presents.server.InvocationException;
@@ -46,7 +46,7 @@ public class PuzzleProvider
      */
     public void startPuzzle (
         ClientObject caller, SolitairePuzzleConfig config,
-        InvocationListener listener)
+        InvocationService.ConfirmListener listener)
         throws InvocationException
     {
         BodyObject user = (BodyObject)caller;
@@ -63,7 +63,9 @@ public class PuzzleProvider
             GameManager gmgr = (GameManager)_plreg.createPlace(config, null);
 
             // the game manager will take care of notifying the player
-            // that the game has been created once it has been started up
+            // that the game has been created once it has been started up;
+            // but we let the caller know that we processed their request
+            listener.requestProcessed();
 
         } catch (InstantiationException ie) {
             Log.warning("Error instantiating puzzle manager " +