Skip to content

Commit 8b2e311

Browse files
committed
Lobby updates
1 parent ede31e9 commit 8b2e311

File tree

4 files changed

+7
-25
lines changed

4 files changed

+7
-25
lines changed

Client/Atari/FujiLlama.bas

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -213,27 +213,8 @@ DATA = $A4,$78, $74,$08, $12,$18, $04,$08 ' PAL
213213
colorTheme=-1
214214

215215

216-
serverEndpoint$=""
217-
query$=""
218-
219-
' Read server endpoint stored from Lobby
220-
@NReadAppKey AK_LOBBY_CREATOR_ID, AK_LOBBY_APP_ID, AK_LOBBY_KEY_SERVER, &serverEndpoint$
221-
'serverEndpoint$="" ' Clear for testing - comment out to use lobby server setting
222-
223-
' Parse endpoint url into server and query
224-
if serverEndpoint$<>""
225-
for i=1 to len(serverEndpoint$)
226-
if serverEndpoint$[i,1]="?"
227-
query$=serverEndpoint$[i]
228-
serverEndpoint$=serverEndpoint$[1,i-1]
229-
exit
230-
endif
231-
next
232-
else
233-
' Default to known server if not specified by lobby. Override for local testing
234-
serverEndpoint$="N:https://fujillama.spysoft.nz"
235-
'serverEndpoint$="N:http://192.168.68.100:8080" ' Local server for testing
236-
endif
216+
serverEndpoint$="N:https://fujillama.spysoft.nz"
217+
'serverEndpoint$="N:http://192.168.68.100:8080" ' Local server for testing
237218

238219
' Fuji-Net Setup Variblies
239220
UNIT=1

Client/Atari/bin/FujiLlama.xex

-96 Bytes
Binary file not shown.

server/lobbyClient.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
const (
1414
// LOBBY_ENDPOINT_UPSERT = "http://qalobby.fujinet.online/server" --- use for testing
15-
LOBBY_ENDPOINT_UPSERT = "http://qalobby.fujinet.online/server"
15+
LOBBY_ENDPOINT_UPSERT = "http://lobby.fujinet.online/server"
1616
)
1717

1818
// Defaults for this game server

server/main.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -352,8 +352,8 @@ func StartNewGame(c *gin.Context) {
352352
tables[tableIndex].Status = gameStates[tableIndex].Table.Status // Update the quick table view status
353353
gameStates[tableIndex].Players[0].Status = STATUS_PLAYING // make the first player status to playing
354354
gameStates[tableIndex].LastMovePlayed = "Game Started, Waiting for " + gameStates[tableIndex].Players[0].Name + " to make a move" // Update the last move played to indicate the game has started
355-
356-
dealCards(tableIndex) // Deal cards to all players at the table
355+
updateLobby(tableIndex) // Update the lobby with the new table state
356+
dealCards(tableIndex) // Deal cards to all players at the table
357357

358358
}
359359
}
@@ -937,7 +937,8 @@ func resetGame(tableIndex int) {
937937
Players: Players{},
938938
LastMovePlayed: "Waiting for players to join",
939939
}
940-
setUpTable(tableIndex) // Initialize each table with a new deck and shuffle it
940+
setUpTable(tableIndex) // Initialize each table with a new deck and shuffle it
941+
updateLobby(tableIndex) // Update the lobby with the new table state
941942
}
942943

943944
// Reset the game state for the next round

0 commit comments

Comments
 (0)