ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

You can now play multiple games at the same time.

Browse Source
This commit is contained in:
marcins78@gmail.com
2013-01-17 22:55:42 +00:00
parent 07c6024231
commit 08dd11dd81
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/hallUi.js
View File

@@ -604,7 +604,7 @@ var GempLotrHallUI = Class.extend({
lastField.append(but);
}
if (playing == "true") {
if (playing == "true" && status=="PLAYING") {
var participantId = getUrlParam("participantId");
var participantIdAppend = "";
if (participantId != null)
@@ -665,9 +665,10 @@ var GempLotrHallUI = Class.extend({
}
this.animateRowUpdate(".table" + id);
if (playing)
row.addClass("played");
}
if (playing == "true")
row.addClass("played");
} else if (action == "remove") {
$(".table" + id, this.tablesDiv).remove();
}
@@ -686,7 +687,7 @@ var GempLotrHallUI = Class.extend({
var participantIdAppend = "";
if (participantId != null)
participantIdAppend = "&participantId=" + participantId;
this.tablesDiv.append("<embed src='/gemp-lotr/fanfare_x.wav' hidden=true autostart=true loop=false>");
this.tablesDiv.append("<embed src='/gemp-lotr/fanfare_x.wav' hidden='true' autostart='true' loop='false'>");
window.open("/gemp-lotr/game.html?gameId=" + waitingGameId + participantIdAppend, "_blank");
}

6
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
View File

@@ -464,6 +464,8 @@ public class HallServer extends AbstractServer {
visitor.visitTable(runningGame.getKey(), runningTable.getGameId(), player.getType().contains("a") || lotroGameMediator.isAllowSpectators(), HallInfoVisitor.TableStatus.PLAYING, lotroGameMediator.getGameStatus(), runningTable.getFormatName(), runningTable.getTournamentName(), lotroGameMediator.getPlayersPlaying(), lotroGameMediator.getWinner());
else
finishedTables.put(runningGame.getKey(), runningTable);
if (lotroGameMediator != null && !lotroGameMediator.isFinished() && lotroGameMediator.getPlayersPlaying().contains(player.getName()))
visitor.runningPlayerGame(runningTable.getGameId());
}
}
@@ -492,10 +494,6 @@ public class HallServer extends AbstractServer {
tournament.getTournamentStage().getHumanReadable(),
tournament.getCurrentRound(), tournament.getPlayersInCompetitionCount(), tournament.isPlayerInCompetition(player.getName()));
}
String gameId = getPlayingPlayerGameId(player.getName());
if (gameId != null)
visitor.runningPlayerGame(gameId);
} finally {
_hallDataAccessLock.readLock().unlock();
}