Skip to content

Commit a2bb970

Browse files
Add files via upload
1 parent 75359cb commit a2bb970

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

CBriscola.Avalonia/MainWindow.axaml.cs

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,18 @@
11
using Avalonia.Controls;
22
using Avalonia.Interactivity;
3-
using Avalonia.Threading;
4-
using Microsoft.Win32;
53
using System.Collections.Generic;
64
using System.Diagnostics;
75
using System.IO;
86
using System;
9-
using System.Runtime.CompilerServices;
107
using Avalonia.Platform;
11-
using Avalonia;
128
using System.Reflection;
139
using Avalonia.Media.Imaging;
1410
using System.Globalization;
15-
using org.altervista.numerone.framework;
16-
using static System.Net.WebRequestMethods;
17-
using System.Threading.Tasks;
18-
using Avalonia.Controls.Shapes;
19-
using DesktopNotifications;
2011
using DesktopNotifications.FreeDesktop;
2112
using System.Runtime.InteropServices;
22-
using Avalonia.Controls.Notifications;
2313
using INotificationManager = DesktopNotifications.INotificationManager;
2414
using Notification= DesktopNotifications.Notification;
15+
using org.altervista.numerone.framework;
2516

2617
namespace CBriscola.Avalonia
2718
{
@@ -43,6 +34,7 @@ public partial class MainWindow : Window
4334
private Stream asset;
4435
private INotificationManager notification;
4536
private Opzioni o;
37+
private static CartaHelperBriscola cartaHelper;
4638
private static INotificationManager CreateManager()
4739
{
4840
if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
@@ -71,7 +63,7 @@ public MainWindow()
7163
m = new Mazzo(e);
7264

7365
m.SetNome(o.nomeMazzo);
74-
Carta.Inizializza(App.path, m, 40, CartaHelperBriscola.GetIstanza(e), d);
66+
Carta.Inizializza(App.path, m, 40, cartaHelper=new CartaHelperBriscola(ElaboratoreCarteBriscola.GetCartaBriscola()), d["bastoni"] as string, d["coppe"] as string, d["denari"] as string, d["spade"] as string, d["Fiori"] as string, d["Quadri"] as string, d["Cuori"] as string, d["Picche"] as string);
7567

7668
if (o.nomeMazzo == "Napoletano")
7769
{
@@ -387,6 +379,7 @@ private void NuovaPartita()
387379
cartaBriscola = false;
388380
e = new ElaboratoreCarteBriscola(cartaBriscola);
389381
m = new Mazzo(e);
382+
Carta.SetHelper(cartaHelper=new CartaHelperBriscola(ElaboratoreCarteBriscola.GetCartaBriscola()));
390383
m.SetNome(o.nomeMazzo);
391384
briscola = Carta.GetCarta(ElaboratoreCarteBriscola.GetCartaBriscola());
392385
g = new Giocatore(new GiocatoreHelperUtente(), g.GetNome(), 3);
@@ -514,7 +507,7 @@ public void OnOk_Click(Object source, RoutedEventArgs evt)
514507
if (i != null)
515508
{
516509
m.SetNome((string)i.Content);
517-
Carta.CaricaImmagini(App.path, m, 40, CartaHelperBriscola.GetIstanza(e), d);
510+
Carta.CaricaImmagini(App.path, m, 40, d["bastoni"] as string, d["coppe"] as string, d["denari"] as string, d["spade"] as string, d["Fiori"] as string, d["Quadri"] as string, d["Cuori"] as string, d["Picche"] as string);
518511
Utente0.Source = g.GetImmagine(0);
519512
Utente1.Source = g.GetImmagine(1);
520513
Utente2.Source = g.GetImmagine(2);

0 commit comments

Comments
 (0)