Miroirs/eliot
1
0
Fork 0
mirror of git://git.savannah.nongnu.org/eliot.git synced 2024-11-17 07:48:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed a nasty bug, due to the way jokers are handled

Browse source
This commit is contained in:
Olivier Teulière 2006-11-05 17:04:39 +00:00
parent f0949a59de
commit 9949225b8b
3 changed files with 124 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
game/board_search.cpp
View file

@ -146,7 +146,7 @@ static void ExtendRight(const Board &iBoard,
l = iTilesMx[iRow][iCol];
for (succ = Dic_succ(iDic, iNode); succ ; succ = Dic_next(iDic, succ))
{
if (Tile(Dic_char(iDic, succ)) == l)
if (Dic_char(iDic, succ) == toupper(l.toChar()))
{
ioPartialWord.addRightFromBoard(l);
ExtendRight(iBoard, iDic, iTilesMx, iCrossMx, iPointsMx,

106
test/training_joker2.ref
View file

@ -1,18 +1,88 @@
commande> a gd
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
A [.ffffffff-.ffffffff][.ffffffff-.ffffffff][.ffffffff-.ffffffff][.ffffffff-.ffffffff][.ffffffff-.ffffffff][.ffffffff-.ffffffff][.ffffffff-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00000000]
B [.ffffffff-.ffffffff][.00000000-.ffffffff][.ffffffff-.ffffffff][.ffffffff-.ffffffff][.ffffffff-.ffffffff][.ffffffff-.ffffffff][.ffffffff-.010d714e][.00000000-.00000000][.00005040-.00005040][.00200200-.ffffffff][.00200222-.00000000][.002c4108-.00000000][.00200222-.00000000][.01384100-.00000000][.01384100-.00008020]
C [.00000000-.00000200][.00004190-.00000000][.00000000-.00200222][.00587018-.ffffffff][.00008020-.ffffffff][.ffffffff-.ffffffff][.ffffffff-.00000000][.00000000-.00000000][.ffffffff-.00280022][.00000000-.00000000][.ffffffff-.00000222][.00100022-.ffffffff][.0118d208-.ffffffff][.00000000-.ffffffff][.ffffffff-.ffffffff]
D [.00000000-.00000000][.00000000-.00000000][.00000000-.00000000][.00608022-.00000000][.005c795a-.00000000][.00ddf036-.00080000][.00000000-.005c7518][j00000000-J00000000][.005c7518-.01384100][.00208222-.00000000][.00ddf036-.00005040][.ffffffff-.ffffffff][.ffffffff-.ffffffff][.ffffffff-.ffffffff][.ffffffff-.ffffffff]
E [.00008000-.00004190][.002c4108-.00000000][.00208022-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00008000][.00000000-.00000000][.00000000-.00200222][.00000000-.00000000][.00000000-.00000000][.ffffffff-.00080020][.ffffffff-.ffffffff][.00000008-.ffffffff][.ffffffff-.ffffffff]
F [.00000000-.00000000][.00000000-.00000000][.00000000-.00000002][.00200222-.00084000][.02284302-.ffffffff][.00184000-.ffffffff][.00008000-.00200020][.00000000-.00000000][.01384100-.00200022][.00208222-.00000000][.00184000-.00000000][.ffffffff-.ffffffff][.00000000-.00008022][.00000000-.00000000][.ffffffff-.00008222]
G [.00000000-.00000000][.00080020-.00208222][.00000000-.00000000][.ffffffff-.00208222][.ffffffff-.ffffffff][.ffffffff-.ffffffff][.ffffffff-.010d714e][.00000000-.00000000][.00000000-.00005040][.00608022-.ffffffff][.005c795a-.ffffffff][.00008000-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00080000]
H [.00080040-.ffffffff][.ffffffff-.00000000][.00000000-.00000000][.ffffffff-.00208022][.ffffffff-.ffffffff][.ffffffff-.ffffffff][.ffffffff-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00000000]
I [.ffffffff-.ffffffff][.ffffffff-.010d714e][.00000000-.00000000][.ffffffff-.00005040][.ffffffff-.ffffffff][.ffffffff-.ffffffff][.00000000-.00000004][.00000000-.00000000][.00000000-.00000000][.00200222-.00000000][.02284302-.ffffffff][.00000222-.00608022][.00000000-.00000000][.040c0020-.00210800][.00000000-.00000000]
J [.ffffffff-.ffffffff][.00000000-.00208222][.005c7518-.00000000][.00008000-.00208222][.00008000-.ffffffff][.005c795a-.00000000][.00000000-.00000000][.00080200-.00000000][.00002020-.00000000][.00000000-.00000000][.ffffffff-.00080000][.00000000-.00200020][.00000000-.00000000][.ffffffff-.00008000][.00000000-.00000000]
K [.ffffffff-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00000000][.00200200-.00000000][.00180000-.00000000][.00000000-.00000000][.00000202-.ffffffff][.ffffffff-.00000000][.00000000-.00000000][.00000000-.00000000][.ffffffff-.00000000][.00000000-.00000000]
L [.ffffffff-.ffffffff][.00280022-.ffffffff][.01384100-.005c795a][.00200222-.00000000][.00200222-.02284302][.02284302-.ffffffff][.00198008-.ffffffff][.00000000-.ffffffff][.ffffffff-.ffffffff][.ffffffff-.ffffffff][.ffffffff-.00000048][.00000000-.00000000][.00000000-.00000000][.ffffffff-.00004000][.00000000-.00000000]
M [.ffffffff-.ffffffff][.00000000-.ffffffff][.0000001c-.00000000][.00000000-.00000000][.00200002-.00200222][.00587018-.ffffffff][.ffffffff-.ffffffff][.ffffffff-.ffffffff][.ffffffff-.ffffffff][.ffffffff-.ffffffff][.ffffffff-.00000144][.00000000-.00000000][.00000000-.00000000][.ffffffff-.00080220][.00080000-.ffffffff]
N [.00000200-.00000000][.005c795a-.00000000][.00ddf036-.005c7518][.00000000-.00000000][.005c7518-.01384100][.00608022-.00000000][.ffffffff-.00080000][.00200020-.ffffffff][.005c7518-.ffffffff][.00000200-.ffffffff][.005c7518-.010d714e][.00000000-.00000000][.00000000-.00005040][.00000000-.ffffffff][.005c7518-.ffffffff]
O [.00000000-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00000000][.ffffffff-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00000000][.00000000-.00000000]
commande>
[?] pour l'aide
commande> c rosace
mode entra絜ement
[?] pour l'aide
commande> n -13
commande> a P
Eliot
WAEROSC ROSACE 22 H 8
W+TSREIN WESTERN 54 13 G
I+RDTVI? DIVeRTIR * 83 8 A
ELMOEAH AH 30 I 8
EELMO+PI DIPLOMEE * 89 A 8
OHUMJUI JOUI 37 12 K
HMU+EAUA HUE 34 14 F
AAMU+UBS SAMBA 57 15 H
UU+NYTEP TYPE 61 O 12
total 467
commande> a t
NUUS?GE
commande> a l
A B C D E F G H I J K L M N O P Q R S T U V W X Y Z ?
5 1 1 2 9 2 2 0 4 0 1 4 1 5 3 0 1 3 3 3 4 1 0 1 0 1 1
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
A - - - - - - - D I P L O M E E
B - - - - - - - I - - - - - - -
C - - - - - - - V - - - - - - -
D - - - - - - - e - - - - - - -
E - - - - - - - R - - - - - - -
F - - - - - - - T - - - - - H -
G - - - - - - - I - - - - W U -
H - - - - - - - R O S A C E E S
I - - - - - - - A H - - - S - A
J - - - - - - - - - - - - T - M
K - - - - - - - - - - - J E - B
L - - - - - - - - - - - O R - A
M - - - - - - - - - - - U N - -
N - - - - - - - - - - - I - - -
O - - - - - - - - - - - T Y P E
commande> a gd # j1
Ar [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1]
Br [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00005040: 1][00200200: 3][00200222: 1][002c4108: 1][00200222: 2][01384100: 1][01384100: 1]
Cr [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Dr [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Er [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000008: 6][ffffffff:-1]
Fr [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:16][00000000:-1][ffffffff:-1]
Gr [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000: 5][00608022: 1][005c795a: 1][00008000: 3][00000000:-1][00000000:-1][00000000: 8]
Hr [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1]
Ir [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][00200222: 1][02284302: 1][00000222: 3][00000000:-1][040c0020: 6][00000000:-1]
Jr [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00080200:12][00002020: 5][ffffffff:-1][ffffffff:-1][00000000:12][00000000:-1][ffffffff:-1][00000000:-1]
Kr [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][ffffffff:-1][00000000:-1]
Lr [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][ffffffff:-1][00000000:-1]
Mr [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][ffffffff:-1][00080000: 8]
Nr [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:26][00000000: 3][005c7518: 1]
Or [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1]
-
Ac [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:12][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1]
Bc [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][010d714e: 1][00000000:-1][00005040: 1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Cc [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000: 4][00000000:-1][00280022: 4][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Dc [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][005c7518: 0][00000000:-1][01384100: 0][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Ec [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00008000: 1][00000000:-1][00200222: 1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Fc [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00200020: 1][00000000:-1][00200022: 1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00008022: 4][00000000:-1][00008222: 4]
Gc [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][010d714e: 1][00000000:-1][00005040: 1][ffffffff:-1][ffffffff:-1][00000000:11][00000000:-1][00000000:-1][00080000:11]
Hc [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:10][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1]
Ic [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000004: 5][00000000:-1][00000000:-1][00000000: 5][ffffffff:-1][00608022: 1][00000000:-1][00210800: 2][00000000:-1]
Jc [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00200020: 1][00000000:-1][00008000: 3][00000000:-1]
Kc [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000: 9][00000000:-1][00000000:-1][00000000:12][00000000:-1]
Lc [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000048: 2][00000000:-1][00000000:-1][00004000: 3][00000000:-1]
Mc [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000144: 2][00000000:-1][00000000:-1][00080220: 2][ffffffff:-1]
Nc [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][010d714e: 1][00000000:-1][00005040: 1][ffffffff:-1][ffffffff:-1]
Oc [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:15][00000000:-1][00000000:-1][00000000:-1][00000000:-1]
commande> r
commande> a r
1: SaUGRENU * 82 E4
2: eNjUGUES * 66 D8
3: NUaGEUSe * 66 D1
4: GUEUSANt * 66 11C
5: GUeUSENt * 64 D6
6: NUaGeUSE * 64 D4
7: GUEUSeNt * 64 D3
8: ENjUGUeS * 64 D2
9: GUeUSENT * 62 F1
10: GUEUSeNT * 60 F1
commande> q
fin du mode entra絜ement
commande> q

68
test/training_search.ref
View file

@ -814,39 +814,41 @@ commande> a r 50
13: En 5 G7
14: Es 5 G7
15: Ex 5 G7
16: aIE 2 8G
17: fIE 2 8G
18: IxE 2 8H
19: IvE 2 8H
20: IrE 2 8H
21: IpE 2 8H
22: IlE 2 8H
23: IdE 2 8H
24: lEI 2 8F
25: EpI 2 8F
26: hIE 2 8G
27: lIE 2 8G
28: mIE 2 8G
29: nIE 2 8G
30: oIE 2 8G
31: pIE 2 8G
32: vIE 2 8G
33: rIE 2 8G
34: hI 1 8G
35: lI 1 8G
36: xI 1 8G
37: aI 1 8G
38: mI 1 8G
39: bI 1 8G
40: cI 1 8G
41: fI 1 8G
42: sI 1 8G
43: nI 1 8G
44: rI 1 8G
45: pI 1 8G
46: In 1 8H
47: If 1 8H
48: Il 1 8H
16: pIE 2 8G
17: oIE 2 8G
18: nIE 2 8G
19: mIE 2 8G
20: lIE 2 8G
21: hIE 2 8G
22: fIE 2 8G
23: aIE 2 8G
24: pEu 2 7F
25: lEu 2 7F
26: jEu 2 7F
27: hEu 2 7F
28: fEu 2 7F
29: rIE 2 8G
30: vIE 2 8G
31: EpI 2 8F
32: lEI 2 8F
33: IdE 2 8H
34: IlE 2 8H
35: IpE 2 8H
36: IrE 2 8H
37: IvE 2 8H
38: IxE 2 8H
39: Eu 2 7G
40: duE 2 7G
41: buE 2 7G
42: Eue 2 7G
43: Euh 2 7G
44: Eus 2 7G
45: Eut 2 7G
46: Eux 2 7G
47: euE 2 7G
48: guE 2 7G
49: huE 2 7G
50: luE 2 7G
commande> q
fin du mode entraînement
commande> q