Merge branch 'master' of https://labs.murkfall.net/bluesaxman/deckard-and-company
forgot to pull
This commit is contained in:
commit
736f6e6354
@ -127,22 +127,9 @@ sub addPool {
|
||||
$sessions{$sessionID}{"pools"}{$poolID} = { name => "$poolID", cards => [] };
|
||||
}
|
||||
|
||||
sub reapCards {
|
||||
my $arrayRef = $_[0];
|
||||
my @reapedCards = ();
|
||||
print "Reaping cards";
|
||||
while(@{$arrayRef}) {
|
||||
push(@reapedCards,shift(@{$arrayRef}));
|
||||
print ".";
|
||||
}
|
||||
print "Done\nReaped:";
|
||||
print join(", ",@reapedCards)."\n";
|
||||
return @reapedCards;
|
||||
}
|
||||
|
||||
sub delPool {
|
||||
my ($sessionID,$poolID) = @_;
|
||||
my @reapedCards = reapCards(\@{$sessions{$sessionID}{"pools"}{$poolID}->{cards}});
|
||||
my @reapedCards = splice($sessions{$sessionID}{"pools"}{$poolID}{cards});
|
||||
delete($sessions{$sessionID}{"pools"}{$poolID});
|
||||
return @reapedCards;
|
||||
}
|
||||
@ -202,7 +189,7 @@ sub addHand {
|
||||
|
||||
sub delHand {
|
||||
my ($sessionID, $userID, $handID) = @_;
|
||||
my @leftoverCards = reapCards(\@{$sessions{$sessionID}{"users"}{$userID}->{hands}{$handID}->{cards}});
|
||||
my @leftoverCards = splice($sessions{$sessionID}{"users"}{$userID}->{hands}{$handID}->{cards});
|
||||
delete($sessions{$sessionID}{"users"}{$userID}{hands}{$handID});
|
||||
return @leftoverCards;
|
||||
}
|
||||
@ -290,16 +277,16 @@ my $server = Net::WebSocket::Server->new(
|
||||
my ($serv, $conn) = @_;
|
||||
$conn->on(
|
||||
handshake => sub {
|
||||
my ($conn,$handshake) = @_;
|
||||
my ($conn,$handshake) = @_;
|
||||
$conn->{"initHand"} = $handshake;
|
||||
},
|
||||
ready => sub {
|
||||
my ($conn) = @_;
|
||||
my ($conn) = @_;
|
||||
$conn->send_utf8('{"request":"user"}');
|
||||
$conn->send_utf8('{"request":"session"}');
|
||||
},
|
||||
utf8 => sub {
|
||||
my ($conn, $msg) = @_;
|
||||
my ($conn, $msg) = @_;
|
||||
my $sessionID = $conn->{"currentSession"}{"id"};
|
||||
my $messageData = "";
|
||||
eval { $messageData = from_json($msg) };
|
||||
|
Loading…
x
Reference in New Issue
Block a user