mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-21 03:06:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify playerassignments code

Browse Source 
Deduplicate a check by moving it to isSlotAvailable.

Based on a patch by @elexis.
This commit is contained in:
phosit
2024-12-30 17:57:48 +01:00
parent fa19cb10fd
commit eafcb814cd
1 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/gui/gamesetup/Controllers/PlayerAssignmentsController.js
+20 -24
View File
@@ -109,37 +109,33 @@ class PlayerAssignmentsController
return;
}
// Find a player slot that no other player is assigned to.
const possibleSlots = [...Array(g_GameSettings.playerCount.nbPlayers).keys()].map(i => i + 1);
const slot = this.findAssignmentSlot(newGUID, newAssignments);
let slot;
const newName = newAssignments[newGUID].name;
// First check if we know them and try to give them their old assignment back.
if (this.lastAssigned[newName] > 0 && this.lastAssigned[newName] <= g_GameSettings.playerCount.nbPlayers)
{
let free = true;
for (const guid in newAssignments)
if (newAssignments[guid].player === this.lastAssigned[newName])
{
free = false;
break;
}
if (free)
slot = this.lastAssigned[newName];
}
if (!slot)
slot = possibleSlots.find(i => {
for (const guid in newAssignments)
if (newAssignments[guid].player == i)
return false;
return true;
});
if (slot === undefined)
return;
this.assignClient(newGUID, slot);
}
findAssignmentSlot(newGUID, newAssignments)
{
const newAssignmentsArray = Object.values(newAssignments);
const isSlotAvailable = slot => newAssignmentsArray.every(elem => elem.player !== slot);
const newName = newAssignments[newGUID].name;
// First check if we know them and try to give them their old assignment back.
if (this.lastAssigned[newName] > 0 &&
this.lastAssigned[newName] <= g_GameSettings.playerCount.nbPlayers &&
isSlotAvailable(this.lastAssigned[newName]))
{
return this.lastAssigned[newName];
}
// If we can't restore the slot, assign the client to the first free slot.
return Array.from(Array(g_GameSettings.playerCount.nbPlayers).keys(), i => i + 1).find(
isSlotAvailable);
}
/**
* To be called when g_PlayerAssignments is modified.
*/