Merge branch 'master' of https://github.com/ottomated/CrewLink

IVLIVS-III · Dec 30, 2020 · b9d0509 · b9d0509
2 parents 23a6e02 + b712295
commit b9d0509
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/main/GameReader.ts b/src/main/GameReader.ts
@@ -202,7 +202,8 @@ export default class GameReader {
 					this.PlayerStruct
 				);
 				playerAddrPtr += 4;
-				players.push(player);
+				if (state !== GameState.MENU)
+					players.push(player);
 
 				if (
 					player.name === '' ||

diff --git a/src/renderer/Avatar.tsx b/src/renderer/Avatar.tsx
@@ -141,6 +141,7 @@ const useCanvasStyles = makeStyles(() => ({
 		position: 'absolute',
 		top: '38%',
 		left: '17%',
+		width: '73.5%',
 		transform: 'scale(0.8)',
 		zIndex: 3,
 		display: ({ isAlive }: UseCanvasStylesParams) =>

diff --git a/src/renderer/Voice.tsx b/src/renderer/Voice.tsx
@@ -390,7 +390,6 @@ const Voice: React.FC<VoiceProps> = function ({
 					clientId: number
 				) => {
 					console.log('Connect called', lobbyCode, playerId, clientId);
-					socket.emit('leave');
 					if (lobbyCode === 'MENU') {
 						Object.keys(peerConnections).forEach((k) => {
 							disconnectPeer(k);
@@ -476,7 +475,7 @@ const Voice: React.FC<VoiceProps> = function ({
 						});
 					});
 					connection.on('data', (data) => {
-						if (gameState.hostId !== socketClientsRef.current[peer].clientId)
+						if (gameState.hostId !== socketClientsRef.current[peer]?.clientId)
 							return;
 						const settings = JSON.parse(data);
 						Object.keys(lobbySettings).forEach((field: string) => {
@@ -655,7 +654,7 @@ const Voice: React.FC<VoiceProps> = function ({
 	} = {};
 
 	for (const k of Object.keys(socketClients)) {
-		if (socketClients[k].playerId)
+		if (socketClients[k].playerId !== undefined)
 			playerSocketIds[socketClients[k].playerId] = k;
 	}
 	return (

diff --git a/src/renderer/settings/Settings.tsx b/src/renderer/settings/Settings.tsx
@@ -472,7 +472,7 @@ const Settings: React.FC<SettingsProps> = function ({
 		if (k === 'Control' || k === 'Alt' || k === 'Shift')
 			k = (ev.location === 1 ? 'L' : 'R') + k;
 
-		if (/^[0-9A-Z]$/.test(k) || /^F[0-9]{1, 2}$/.test(k) || keys.has(k)) {
+		if (/^[0-9A-Z]$/.test(k) || /^F[0-9]{1,2}$/.test(k) || keys.has(k)) {
 			setSettings({
 				type: 'setOne',
 				action: [shortcut, k],