diff --git a/ebiten-game/game/main.go b/ebiten-game/game/main.go index adda483f..5648cc3f 100644 --- a/ebiten-game/game/main.go +++ b/ebiten-game/game/main.go @@ -410,6 +410,11 @@ func (g *game) startClient() { if err != nil { panic(err) } + if response.StatusCode != http.StatusOK { + g.writeLog("Failed to join lobby, probably doesn't exist.\n") + + return + } var pData playerData err = json.NewDecoder(response.Body).Decode(&pData) if err != nil { diff --git a/ebiten-game/game/ui.go b/ebiten-game/game/ui.go index 3dfba330..5b5e34a6 100644 --- a/ebiten-game/game/ui.go +++ b/ebiten-game/game/ui.go @@ -56,9 +56,11 @@ func (g *game) logWindow(ctx *debugui.Context) { ctx.Button("Host Game").On(func() { submitOpen() }) - ctx.Button("Join").On(func() { - submitJoin() - }) + if !g.isHost { + ctx.Button("Join").On(func() { + submitJoin() + }) + } }) }) } diff --git a/go.mod b/go.mod index 1603a8d0..8f2e4077 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/go-gst/go-gst v1.3.0 github.com/google/uuid v1.6.0 github.com/gorilla/websocket v1.5.3 - github.com/hajimehoshi/ebiten/v2 v2.9.3 + github.com/hajimehoshi/ebiten/v2 v2.9.4 github.com/kelindar/binary v1.0.19 github.com/notedit/janus-go v0.0.0-20210115013133-fdce1b146d0e github.com/pion/interceptor v0.1.41 diff --git a/go.sum b/go.sum index 76f00734..f0df9a52 100644 --- a/go.sum +++ b/go.sum @@ -38,8 +38,8 @@ github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aN github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/hajimehoshi/bitmapfont/v4 v4.1.0 h1:eE3qa5Do4qhowZVIHjsrX5pYyyPN6sAFWMsO7QREm3U= github.com/hajimehoshi/bitmapfont/v4 v4.1.0/go.mod h1:/PD+aLjAJ0F2UoQx6hkOfXqWN7BkroDUMr5W+IT1dpE= -github.com/hajimehoshi/ebiten/v2 v2.9.3 h1:i2xYZ7GUk7/Bwa4CUxI/cZq+zrDrYCHGgwHLO61/Dok= -github.com/hajimehoshi/ebiten/v2 v2.9.3/go.mod h1:DAt4tnkYYpCvu3x9i1X/nK/vOruNXIlYq/tBXxnhrXM= +github.com/hajimehoshi/ebiten/v2 v2.9.4 h1:IlPJpwtksylmmvNhQjv4W2bmCFWXtjY7Z10Esise1bk= +github.com/hajimehoshi/ebiten/v2 v2.9.4/go.mod h1:DAt4tnkYYpCvu3x9i1X/nK/vOruNXIlYq/tBXxnhrXM= github.com/icholy/digest v1.1.0 h1:HfGg9Irj7i+IX1o1QAmPfIBNu/Q5A5Tu3n/MED9k9H4= github.com/icholy/digest v1.1.0/go.mod h1:QNrsSGQ5v7v9cReDI0+eyjsXGUoRSUZQHeQ5C4XLa0Y= github.com/jezek/xgb v1.1.1 h1:bE/r8ZZtSv7l9gk6nU0mYx51aXrvnyb44892TwSaqS4=