switching pcs

This commit is contained in:
Ben
2021-05-06 21:56:31 +01:00
parent 4395da5710
commit a0fde3ec23
5 changed files with 26 additions and 7 deletions

View File

@@ -29,7 +29,11 @@ document.addEventListener('touchmove', mouseMove);
document.addEventListener('mouseup', mouseUp); document.addEventListener('mouseup', mouseUp);
document.addEventListener('touchend', mouseUp); document.addEventListener('touchend', mouseUp);
document.querySelectorAll('piece').forEach(element => { function updatePieceEventListeners()
element.addEventListener('mousedown', e => mouseDown(e, element)); {
element.addEventListener('touchstart', e => mouseDown(e, element)); document.querySelectorAll('piece').forEach(element => {
}); element.addEventListener('mousedown', e => mouseDown(e, element));
element.addEventListener('touchstart', e => mouseDown(e, element));
});
}
updatePieceEventListeners();

View File

@@ -7,8 +7,18 @@ function computeTurn()
} }
function initGame(boardstate, myplayer, players) function initGame(boardstate, tileset, myplayer, players)
{ {
// construct piece array
// structure [{letter: '', score: int}]
let drawerStructure = [];
for (const tile of myplayer.activetiles)
{
console.log(tile);
}
addPiecesToDrawer(); addPiecesToDrawer();
return true; return true;
} }

View File

@@ -175,16 +175,17 @@ function onGameBegin(socket, args)
console.log(args); console.log(args);
const boardstate = args.game.gamestates[args.game.gamestates.length-1]; const boardstate = args.game.gamestates[args.game.gamestates.length-1];
const tileset = args.game.tileset;
const myplayer = args.gameuser; const myplayer = args.gameuser;
const players = args.game.players; const players = args.game.players;
if (!boardstate || !myplayer || !players) if (!boardstate || !myplayer || !players || !tileset)
{ {
ConnectionState.innerHTML = localeString('error-game-begin'); ConnectionState.innerHTML = localeString('error-game-begin');
return; return;
} }
const status = initGame(boardstate, myplayer, players); const status = initGame(boardstate, tileset, myplayer, players);
if (!status) if (!status)
{ {

View File

@@ -41,6 +41,7 @@ function addPiecesToDrawer(pieces)
Drawer.appendChild(piece); Drawer.appendChild(piece);
setupPieces(); setupPieces();
updatePieceEventListeners();
} }
// Removes regardless of vadility // Removes regardless of vadility

View File

@@ -2,6 +2,7 @@ const Logger = require('./logger.js');
const WebServer = require('./webserver.js'); const WebServer = require('./webserver.js');
const Game = require('./game.js'); const Game = require('./game.js');
const Error = require('./error.js'); const Error = require('./error.js');
const Dist = require('./letter-distributions.js');
let io = {}; let io = {};
@@ -460,6 +461,7 @@ function EmitGameBegin(game)
// getsafegame function is needed // getsafegame function is needed
io.to(gameuserconnection).emit('game-begin', { io.to(gameuserconnection).emit('game-begin', {
game: game, game: game,
tileset: Dist.GetDist(game.locale).dist,
gameuser: gameuser gameuser: gameuser
}); });
} }
@@ -478,6 +480,7 @@ function EmitGameReconnect(user, game)
io.to(gameuserconnection).emit('game-begin', { io.to(gameuserconnection).emit('game-begin', {
game: game, game: game,
tileset: Dist.GetDist(game.locale).dist,
gameuser: gameuser gameuser: gameuser
}); });