diff options
Diffstat (limited to 'frontend/app')
| -rw-r--r-- | frontend/app/.server/api/schema.d.ts | 18 | ||||
| -rw-r--r-- | frontend/app/components/GolfPlayApp.client.tsx | 7 |
2 files changed, 4 insertions, 21 deletions
diff --git a/frontend/app/.server/api/schema.d.ts b/frontend/app/.server/api/schema.d.ts index 93385f2..2d116b9 100644 --- a/frontend/app/.server/api/schema.d.ts +++ b/frontend/app/.server/api/schema.d.ts @@ -104,7 +104,7 @@ export interface components { * @example closed * @enum {string} */ - state: "closed" | "waiting_entries" | "waiting_start" | "prepare" | "starting" | "gaming" | "finished"; + state: "closed" | "waiting" | "starting" | "gaming" | "finished"; /** @example Game 1 */ display_name: string; /** @example 360 */ @@ -130,11 +130,7 @@ export interface components { description: string; }; GamePlayerMessage: components["schemas"]["GamePlayerMessageS2C"] | components["schemas"]["GamePlayerMessageC2S"]; - GamePlayerMessageS2C: components["schemas"]["GamePlayerMessageS2CPrepare"] | components["schemas"]["GamePlayerMessageS2CStart"] | components["schemas"]["GamePlayerMessageS2CExecResult"]; - GamePlayerMessageS2CPrepare: { - /** @constant */ - type: "player:s2c:prepare"; - }; + GamePlayerMessageS2C: components["schemas"]["GamePlayerMessageS2CStart"] | components["schemas"]["GamePlayerMessageS2CExecResult"]; GamePlayerMessageS2CStart: { /** @constant */ type: "player:s2c:start"; @@ -158,15 +154,7 @@ export interface components { /** @example 100 */ score: number | null; }; - GamePlayerMessageC2S: components["schemas"]["GamePlayerMessageC2SEntry"] | components["schemas"]["GamePlayerMessageC2SReady"] | components["schemas"]["GamePlayerMessageC2SCode"] | components["schemas"]["GamePlayerMessageC2SSubmit"]; - GamePlayerMessageC2SEntry: { - /** @constant */ - type: "player:c2s:entry"; - }; - GamePlayerMessageC2SReady: { - /** @constant */ - type: "player:c2s:ready"; - }; + GamePlayerMessageC2S: components["schemas"]["GamePlayerMessageC2SCode"] | components["schemas"]["GamePlayerMessageC2SSubmit"]; GamePlayerMessageC2SCode: { /** @constant */ type: "player:c2s:code"; diff --git a/frontend/app/components/GolfPlayApp.client.tsx b/frontend/app/components/GolfPlayApp.client.tsx index 4e200e2..eafbd1d 100644 --- a/frontend/app/components/GolfPlayApp.client.tsx +++ b/frontend/app/components/GolfPlayApp.client.tsx @@ -104,10 +104,7 @@ export default function GolfPlayApp({ } else if (readyState === ReadyState.OPEN) { if (lastJsonMessage !== null) { console.log(lastJsonMessage.type); - if (lastJsonMessage.type === "player:s2c:prepare") { - console.log("player:c2s:ready"); - sendJsonMessage({ type: "player:c2s:ready" }); - } else if (lastJsonMessage.type === "player:s2c:start") { + if (lastJsonMessage.type === "player:s2c:start") { if ( gameState !== "starting" && gameState !== "gaming" && @@ -131,8 +128,6 @@ export default function GolfPlayApp({ } } else { setGameState("waiting"); - console.log("player:c2s:entry"); - sendJsonMessage({ type: "player:c2s:entry" }); } } }, [sendJsonMessage, lastJsonMessage, readyState, gameState, currentScore]); |