Skip to content

Commit e169f47

Browse files
committed
hearts 1.5b
1 parent 2c9c004 commit e169f47

25 files changed

+1202
-1047
lines changed

Hearts.pro

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ SOURCES += main.cpp\
2222
rules.cpp \
2323
credits.cpp \
2424
settings.cpp \
25-
cstats.cpp \
2625
debug.cpp \
2726
cdeck.cpp \
2827
client.cpp \
@@ -41,7 +40,6 @@ HEADERS += mainwindow.h \
4140
credits.h \
4241
settings.h \
4342
define.h \
44-
cstats.h \
4543
debug.h \
4644
cdeck.h \
4745
client.h \

Hearts.pro.user

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE QtCreatorProject>
3-
<!-- Written by QtCreator 4.8.2, 2020-04-13T19:41:24. -->
3+
<!-- Written by QtCreator 4.8.2, 2020-05-03T17:43:32. -->
44
<qtcreator>
55
<data>
66
<variable>EnvironmentId</variable>

cgame.ui

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@
453453
</palette>
454454
</property>
455455
<property name="windowTitle">
456-
<string>Dialog</string>
456+
<string>Create table</string>
457457
</property>
458458
<widget class="QDialogButtonBox" name="buttonBox">
459459
<property name="geometry">
@@ -476,7 +476,7 @@
476476
<rect>
477477
<x>110</x>
478478
<y>70</y>
479-
<width>141</width>
479+
<width>160</width>
480480
<height>23</height>
481481
</rect>
482482
</property>
@@ -489,7 +489,7 @@
489489
<rect>
490490
<x>110</x>
491491
<y>100</y>
492-
<width>111</width>
492+
<width>160</width>
493493
<height>23</height>
494494
</rect>
495495
</property>
@@ -502,7 +502,7 @@
502502
<rect>
503503
<x>110</x>
504504
<y>130</y>
505-
<width>92</width>
505+
<width>160</width>
506506
<height>23</height>
507507
</rect>
508508
</property>
@@ -515,7 +515,7 @@
515515
<rect>
516516
<x>280</x>
517517
<y>70</y>
518-
<width>131</width>
518+
<width>160</width>
519519
<height>23</height>
520520
</rect>
521521
</property>
@@ -528,7 +528,7 @@
528528
<rect>
529529
<x>280</x>
530530
<y>100</y>
531-
<width>131</width>
531+
<width>160</width>
532532
<height>23</height>
533533
</rect>
534534
</property>
@@ -541,7 +541,7 @@
541541
<rect>
542542
<x>280</x>
543543
<y>130</y>
544-
<width>92</width>
544+
<width>160</width>
545545
<height>23</height>
546546
</rect>
547547
</property>
@@ -552,15 +552,18 @@
552552
<widget class="QLabel" name="label">
553553
<property name="geometry">
554554
<rect>
555-
<x>190</x>
555+
<x>170</x>
556556
<y>20</y>
557-
<width>121</width>
557+
<width>160</width>
558558
<height>20</height>
559559
</rect>
560560
</property>
561561
<property name="text">
562562
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:14pt; color:#73d216;&quot;&gt;Game Options&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
563563
</property>
564+
<property name="alignment">
565+
<set>Qt::AlignCenter</set>
566+
</property>
564567
</widget>
565568
</widget>
566569
<resources/>

chearts.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1195,7 +1195,7 @@ void CHearts::process_next_pass(bool skip_moon_check)
11951195
}
11961196

11971197
moon_add_to_scores = true; // reset to default: true. this is important.
1198-
emit sig_end_hand(false);
1198+
emit sig_end_hand(plr_hand_score[0], plr_hand_score[1], plr_hand_score[2], plr_hand_score[3]);
11991199

12001200
if (is_it_draw() && no_draw)
12011201
game_over = false; // we must reset game_over to false, if it's a draw and no draw

chearts.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ class CHearts : public QObject
204204
void sig_play_card(int card, int idx);
205205
void sig_refresh_deck(int plr, bool d);
206206
void sig_score(int score, int idx);
207-
void sig_end_hand(bool online);
207+
void sig_end_hand(int score1, int score2, int score3, int score4);
208208
void sig_hand_score(int score, int idx);
209209
void sig_your_turn(int idx);
210210
void sig_breaking_heart();

0 commit comments

Comments
 (0)