rparodi/ft_transcendence
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rebase

Browse source
This commit is contained in:
NigeParis 2026-01-12 13:38:36 +01:00
parent 96cfbef642
commit 0fbe08a5cf
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/pong/src/state.ts
View file

@ -223,16 +223,12 @@ class StateI {
} }
public newPausedGame(suid1: string, suid2: string): GameId | undefined { public newPausedGame(suid1: string, suid2: string): GameId | undefined {
<<<<<<< HEAD
if ( if (
!this.users.has(suid1 as UserId) || !this.users.has(suid1 as UserId) ||
!this.users.has(suid2 as UserId) !this.users.has(suid2 as UserId)
) { ) {
return undefined; return undefined;
} }
=======
>>>>>>> 78eb546 (Added U Game system)
const uid1: UserId = suid1 as UserId; const uid1: UserId = suid1 as UserId;
const uid2: UserId = suid2 as UserId; const uid2: UserId = suid2 as UserId;
const g = new Pong(uid1, uid2); const g = new Pong(uid1, uid2);