bluesaxman/deckard-and-company
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://labs.murkfall.net/bluesaxman/deckard-and-company

Browse Source 
forgot to pull
This commit is contained in:
bluesaxman 2020-09-14 13:58:53 -06:00
commit 736f6e6354
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Server/server.pl
View File

@ -127,22 +127,9 @@ sub addPool {
$sessions{$sessionID}{"pools"}{$poolID} = { name => "$poolID", cards => [] }; $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 { sub delPool {
my ($sessionID,$poolID) = @_; my ($sessionID,$poolID) = @_;
my @reapedCards = reapCards(\@{$sessions{$sessionID}{"pools"}{$poolID}->{cards}}); my @reapedCards = splice($sessions{$sessionID}{"pools"}{$poolID}{cards});
delete($sessions{$sessionID}{"pools"}{$poolID}); delete($sessions{$sessionID}{"pools"}{$poolID});
return @reapedCards; return @reapedCards;
} }
@ -202,7 +189,7 @@ sub addHand {
sub delHand { sub delHand {
my ($sessionID, $userID, $handID) = @_; 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}); delete($sessions{$sessionID}{"users"}{$userID}{hands}{$handID});
return @leftoverCards; return @leftoverCards;
} }
@ -290,16 +277,16 @@ my $server = Net::WebSocket::Server->new(
my ($serv, $conn) = @_; my ($serv, $conn) = @_;
$conn->on( $conn->on(
handshake => sub { handshake => sub {
my ($conn,$handshake) = @_; my ($conn,$handshake) = @_;
$conn->{"initHand"} = $handshake; $conn->{"initHand"} = $handshake;
}, },
ready => sub { ready => sub {
my ($conn) = @_; my ($conn) = @_;
$conn->send_utf8('{"request":"user"}'); $conn->send_utf8('{"request":"user"}');
$conn->send_utf8('{"request":"session"}'); $conn->send_utf8('{"request":"session"}');
}, },
utf8 => sub { utf8 => sub {
my ($conn, $msg) = @_; my ($conn, $msg) = @_;
my $sessionID = $conn->{"currentSession"}{"id"}; my $sessionID = $conn->{"currentSession"}{"id"};
my $messageData = ""; my $messageData = "";
eval { $messageData = from_json($msg) }; eval { $messageData = from_json($msg) };