1 | Index: mythgame/mythgame/gamehandler.cpp |
---|
2 | =================================================================== |
---|
3 | --- mythgame/mythgame/gamehandler.cpp (Revision 7093) |
---|
4 | +++ mythgame/mythgame/gamehandler.cpp (Arbeitskopie) |
---|
5 | @@ -216,7 +216,7 @@ |
---|
6 | QString queryvalues; |
---|
7 | |
---|
8 | QString lastrom = ""; |
---|
9 | - QRegExp multiDiskRGXP = QRegExp( ".[0-4].*$", TRUE, FALSE ); |
---|
10 | + QRegExp multiDiskRGXP = QRegExp( "[0-4]$", TRUE, FALSE ); |
---|
11 | int diskcount = 0; |
---|
12 | QString firstname; |
---|
13 | QString basename; |
---|
14 | @@ -280,10 +280,19 @@ |
---|
15 | |
---|
16 | if (handler->SpanDisks()) |
---|
17 | { |
---|
18 | - if (RomName.contains(multiDiskRGXP)) |
---|
19 | { |
---|
20 | - basename = GameName.left(GameName.findRev(".")); |
---|
21 | + basename = GameName.right(1); |
---|
22 | + |
---|
23 | + if (basename.contains(multiDiskRGXP)) |
---|
24 | + { |
---|
25 | + basename = GameName.left(GameName.length() - 1); |
---|
26 | |
---|
27 | + if (basename.right(1) == ".") |
---|
28 | + basename = GameName.left(GameName.length() - 2); |
---|
29 | + } |
---|
30 | + else |
---|
31 | + basename = GameName; |
---|
32 | + |
---|
33 | if (basename == lastrom) |
---|
34 | { |
---|
35 | displayrom = 0; |
---|
36 | @@ -299,8 +308,7 @@ |
---|
37 | lastrom = basename; |
---|
38 | diskcount = 1; |
---|
39 | } |
---|
40 | - GameName = GameName.left(GameName.findRev(".")); |
---|
41 | - |
---|
42 | + GameName = basename; |
---|
43 | } |
---|
44 | } |
---|
45 | |
---|
46 | @@ -481,7 +489,7 @@ |
---|
47 | { |
---|
48 | if (romdata->DiskCount() > 1) |
---|
49 | { |
---|
50 | - QString basename = romdata->Gamename().left(romdata->Gamename().findRev(".")); |
---|
51 | + QString basename = romdata->Gamename().left(romdata->Gamename().length() - 1); |
---|
52 | QString extension = romdata->getExtension(); |
---|
53 | QString rom; |
---|
54 | QString diskid[] = { "%d0", "%d1", "%d2", "%d3", "%d4", "%d5", "%d6" }; |
---|
55 | Index: mythgame/mythgame/gametree.cpp |
---|
56 | =================================================================== |
---|
57 | --- mythgame/mythgame/gametree.cpp (Revision 7093) |
---|
58 | +++ mythgame/mythgame/gametree.cpp (Arbeitskopie) |
---|
59 | @@ -331,6 +331,7 @@ |
---|
60 | info_popup->addLabel(QString("CRC : %1").arg(rom->CRC_VALUE())); |
---|
61 | info_popup->addLabel(QString("Path: %1").arg(rom->Rompath())); |
---|
62 | info_popup->addLabel(QString("Type: %1").arg(rom->GameType())); |
---|
63 | + info_popup->addLabel(QString("Diskcount: %1").arg(rom->DiskCount())); |
---|
64 | info_popup->addLabel(QString("Player(s): %1").arg(rom->AllSystems())); |
---|
65 | |
---|
66 | OKButton = info_popup->addButton(QString("OK"), this, |
---|