[Scummvm-cvs-logs] scummvm master -> 3c2bec3f3a9e7738b9ec95f860d7f7d095d00f90
sev-
sev at scummvm.org
Tue Mar 1 12:11:18 CET 2016
This automated email contains information about 7 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
eb50edb539 WAGE: Added detection for Twisted! and Exploration Zeta!
0bf89a0f1e WAGE: Simplified detection entries for fan games
f2e2d0f05d WAGE: Fix bufer overrun in bitmap code
589ffcd3b9 WAGE: Added detection for The Phoenix
410eb2912b WAGE: Added detection for 2 more games
57e1e36867 WAGE: Added detection for The Tower
3c2bec3f3a WAGE: Added two more games
Commit: eb50edb539fab1cd1db0ab22862f9ecc887b7266
https://github.com/scummvm/scummvm/commit/eb50edb539fab1cd1db0ab22862f9ecc887b7266
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-01T12:11:09+01:00
Commit Message:
WAGE: Added detection for Twisted! and Exploration Zeta!
Changed paths:
engines/wage/detection.cpp
engines/wage/detection_tables.h
diff --git a/engines/wage/detection.cpp b/engines/wage/detection.cpp
index 91e20f3..35e33cd 100644
--- a/engines/wage/detection.cpp
+++ b/engines/wage/detection.cpp
@@ -42,6 +42,7 @@ static const PlainGameDescriptor wageGames[] = {
{"amot", "A Mess O' Trouble"},
{"cantitoe", "Camp Cantitoe"},
{"scepters", "Enchanted Scepters"},
+ {"twisted", "Twisted!"},
{"wage", "WAGE"},
{0, 0}
};
diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
index 8723310..07f10ba 100644
--- a/engines/wage/detection_tables.h
+++ b/engines/wage/detection_tables.h
@@ -42,11 +42,14 @@ static const ADGameDescription gameDescriptions[] = {
FANGAME("Double Trouble", "Double Trouble", "5e9ee13d09ac54918ed111fa9727ac1c", 557184),
FANGAME("Eidisi I", "Eidisi I", "299d1de4baccf1c66118396519953652", 180480),
FANGAME("Escape from School!", "Escape from School!", "a854be48d4af20126d18a9cad93a969b", 51840),
+ FANGAME("Exploration Zeta!", "Exploration Zeta!", "b9fbb704017d7ea9613b0160f86527bb", 370944),
FANGAME("Magic Rings", "Magic Rings", "6e0d1dd561d3dad8f9a7a20ed1f09b16", 112000),
FANGAME("Midnight Snack", "Midnight Snack", "346982a32fc701f53bb19771d72063d0", 69504),
FANGAME("Queen Quest", "Queen Quest", "730605d312efedb5e3ff108522fcac18", 59776),
BIGGAME("scepters", "", "Scepters", "b80bff315897776dda7689cdf829fab4", 360832),
FANGAME("Time Bomb", "Time Bomb", "2df84b636237686b624e736a698a16c4", 66432),
+ // Doesn't go past first scene
+ BIGGAME("Twisted!", "", "Twisted! 1.6", "8ea8cc13d26d7975dc43ea7e6c193217", 992896),
FANGAME("ZikTuria", "ZikTuria", "e793155bed1a70fa2074a3fcd696b751", 54784),
FANGAME("Zoony", "Zoony", "e6cc8a914a4215dafbcce6315dd12cf5", 160256),
Commit: 0bf89a0f1e9c7407e1ea4977f66d0c4c076360b3
https://github.com/scummvm/scummvm/commit/0bf89a0f1e9c7407e1ea4977f66d0c4c076360b3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-01T12:11:09+01:00
Commit Message:
WAGE: Simplified detection entries for fan games
Changed paths:
engines/wage/detection_tables.h
diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
index 07f10ba..95adc7a 100644
--- a/engines/wage/detection_tables.h
+++ b/engines/wage/detection_tables.h
@@ -25,33 +25,34 @@ namespace Wage {
#define ADGF_DEFAULT (ADGF_DROPLANGUAGE|ADGF_DROPPLATFORM)
#define ADGF_GENERIC (ADGF_DROPLANGUAGE|ADGF_DROPPLATFORM|ADGF_USEEXTRAASTITLE)
-#define FANGAME(n,f,m,s) { "wage",n,AD_ENTRY1s(f,m,s),Common::EN_ANY,Common::kPlatformMacintosh,ADGF_GENERIC,GUIO0()}
+#define FANGAME(n,m,s) { "wage",n,AD_ENTRY1s(n,m,s),Common::EN_ANY,Common::kPlatformMacintosh,ADGF_GENERIC,GUIO0()}
+#define FANGAMEN(n,f,m,s) { "wage",n,AD_ENTRY1s(f,m,s),Common::EN_ANY,Common::kPlatformMacintosh,ADGF_GENERIC,GUIO0()}
#define BIGGAME(t,v,f,m,s) { t,v,AD_ENTRY1s(f,m,s),Common::EN_ANY,Common::kPlatformMacintosh,ADGF_DEFAULT,GUIO0()}
static const ADGameDescription gameDescriptions[] = {
- FANGAME("3rd Floor", "3rd Floor", "a107d7a177970b2259e32681bd8b47c9", 285056),
+ FANGAME("3rd Floor", "a107d7a177970b2259e32681bd8b47c9", 285056),
BIGGAME("afm", "v1.8", "Another Fine Mess 1.8", "8e5aa915f3253efb2aab52435647b25e", 1456000),
BIGGAME("amot", "v1.8", "A Mess O' Trouble 1.8", "b3ef53afed282671b704e45df829350c", 1895552),
- FANGAME("Bug Hunt", "Bug Hunt", "2ebd3515a87941063ad66c3cf93c5e78", 200064),
+ FANGAME("Bug Hunt", "2ebd3515a87941063ad66c3cf93c5e78", 200064),
// Problems with letter rendering
- FANGAME("Canal District", "Canal District", "8856bc699a20fc5b7fc67accee12cac7", 658176),
+ FANGAME("Canal District", "8856bc699a20fc5b7fc67accee12cac7", 658176),
BIGGAME("cantitoe", "", "Camp Cantitoe", "098aa5c11c58e1ef274a30a9e01b4755", 621440),
- FANGAME("Deep Angst", "Deep Angst", "635f62bbc569e72b03cab9107927d03d", 335232),
- FANGAME("Dungeon World II", "DungeonWorld2", "e10c5e3cc17879c298b1551f33571b15", 234880),
+ FANGAME("Deep Angst", "635f62bbc569e72b03cab9107927d03d", 335232),
+ FANGAMEN("Dungeon World II", "DungeonWorld2", "e10c5e3cc17879c298b1551f33571b15", 234880),
// Polygons with ignored byte 1
- FANGAME("Double Trouble", "Double Trouble", "5e9ee13d09ac54918ed111fa9727ac1c", 557184),
- FANGAME("Eidisi I", "Eidisi I", "299d1de4baccf1c66118396519953652", 180480),
- FANGAME("Escape from School!", "Escape from School!", "a854be48d4af20126d18a9cad93a969b", 51840),
- FANGAME("Exploration Zeta!", "Exploration Zeta!", "b9fbb704017d7ea9613b0160f86527bb", 370944),
- FANGAME("Magic Rings", "Magic Rings", "6e0d1dd561d3dad8f9a7a20ed1f09b16", 112000),
- FANGAME("Midnight Snack", "Midnight Snack", "346982a32fc701f53bb19771d72063d0", 69504),
- FANGAME("Queen Quest", "Queen Quest", "730605d312efedb5e3ff108522fcac18", 59776),
+ FANGAME("Double Trouble", "5e9ee13d09ac54918ed111fa9727ac1c", 557184),
+ FANGAME("Eidisi I", "299d1de4baccf1c66118396519953652", 180480),
+ FANGAME("Escape from School!", "a854be48d4af20126d18a9cad93a969b", 51840),
+ FANGAME("Exploration Zeta!", "b9fbb704017d7ea9613b0160f86527bb", 370944),
+ FANGAME("Magic Rings", "6e0d1dd561d3dad8f9a7a20ed1f09b16", 112000),
+ FANGAME("Midnight Snack", "346982a32fc701f53bb19771d72063d0", 69504),
+ FANGAME("Queen Quest", "730605d312efedb5e3ff108522fcac18", 59776),
BIGGAME("scepters", "", "Scepters", "b80bff315897776dda7689cdf829fab4", 360832),
- FANGAME("Time Bomb", "Time Bomb", "2df84b636237686b624e736a698a16c4", 66432),
+ FANGAME("Time Bomb", "2df84b636237686b624e736a698a16c4", 66432),
// Doesn't go past first scene
BIGGAME("Twisted!", "", "Twisted! 1.6", "8ea8cc13d26d7975dc43ea7e6c193217", 992896),
- FANGAME("ZikTuria", "ZikTuria", "e793155bed1a70fa2074a3fcd696b751", 54784),
- FANGAME("Zoony", "Zoony", "e6cc8a914a4215dafbcce6315dd12cf5", 160256),
+ FANGAME("ZikTuria", "e793155bed1a70fa2074a3fcd696b751", 54784),
+ FANGAME("Zoony", "e6cc8a914a4215dafbcce6315dd12cf5", 160256),
AD_TABLE_END_MARKER
};
Commit: f2e2d0f05d43c6b3615b13e28f37d33ab69aba17
https://github.com/scummvm/scummvm/commit/f2e2d0f05d43c6b3615b13e28f37d33ab69aba17
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-01T12:11:09+01:00
Commit Message:
WAGE: Fix bufer overrun in bitmap code
Changed paths:
engines/wage/design.cpp
diff --git a/engines/wage/design.cpp b/engines/wage/design.cpp
index 2a63436..a3dbd97 100644
--- a/engines/wage/design.cpp
+++ b/engines/wage/design.cpp
@@ -435,7 +435,7 @@ void Design::drawBitmap(Graphics::Surface *surface, Common::SeekableReadStream &
}
ff.fill();
- for (y = 0; y < h; y++) {
+ for (y = 0; y < h && y1 + y < surface->h; y++) {
byte *src = (byte *)tmp.getBasePtr(0, y);
byte *dst = (byte *)surface->getBasePtr(x1, y1 + y);
for (x = 0; x < w; x++) {
Commit: 589ffcd3b921961d86d00b1ad35ab52feab6e0fc
https://github.com/scummvm/scummvm/commit/589ffcd3b921961d86d00b1ad35ab52feab6e0fc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-01T12:11:09+01:00
Commit Message:
WAGE: Added detection for The Phoenix
Changed paths:
engines/wage/detection_tables.h
engines/wage/entities.cpp
engines/wage/util.cpp
diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
index 95adc7a..9b9b9c8 100644
--- a/engines/wage/detection_tables.h
+++ b/engines/wage/detection_tables.h
@@ -49,6 +49,8 @@ static const ADGameDescription gameDescriptions[] = {
FANGAME("Queen Quest", "730605d312efedb5e3ff108522fcac18", 59776),
BIGGAME("scepters", "", "Scepters", "b80bff315897776dda7689cdf829fab4", 360832),
FANGAME("Time Bomb", "2df84b636237686b624e736a698a16c4", 66432),
+ // Invalid rect in scene "Access Tube 1"
+ FANGAMEN("The Phoenix v1.2", "The Phoenix", "7fa2a2ac740f22572516843922b7c630", 434560),
// Doesn't go past first scene
BIGGAME("Twisted!", "", "Twisted! 1.6", "8ea8cc13d26d7975dc43ea7e6c193217", 992896),
FANGAME("ZikTuria", "e793155bed1a70fa2074a3fcd696b751", 54784),
diff --git a/engines/wage/entities.cpp b/engines/wage/entities.cpp
index d9e4b60..a2648c4 100644
--- a/engines/wage/entities.cpp
+++ b/engines/wage/entities.cpp
@@ -97,6 +97,8 @@ Scene::Scene() {
}
Scene::Scene(Common::String name, Common::SeekableReadStream *data) {
+ debug(9, "Creating scene: %s", name.c_str());
+
_name = name;
_classType = SCENE;
_design = new Design(data);
diff --git a/engines/wage/util.cpp b/engines/wage/util.cpp
index 1b3dfc9..f31a83c 100644
--- a/engines/wage/util.cpp
+++ b/engines/wage/util.cpp
@@ -81,6 +81,8 @@ Common::Rect *readRect(Common::SeekableReadStream *in) {
y2 = in->readUint16BE() + 4;
x2 = in->readUint16BE() + 4;
+ debug(9, "readRect: %d, %d, %d, %d", x1, y1, x2, y2);
+
return new Common::Rect(x1, y1, x2, y2);
}
Commit: 410eb2912b80aa7675df47e48ef03b4748cb2cea
https://github.com/scummvm/scummvm/commit/410eb2912b80aa7675df47e48ef03b4748cb2cea
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-01T12:11:10+01:00
Commit Message:
WAGE: Added detection for 2 more games
Changed paths:
engines/wage/detection_tables.h
diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
index 9b9b9c8..15babc0 100644
--- a/engines/wage/detection_tables.h
+++ b/engines/wage/detection_tables.h
@@ -44,10 +44,13 @@ static const ADGameDescription gameDescriptions[] = {
FANGAME("Eidisi I", "299d1de4baccf1c66118396519953652", 180480),
FANGAME("Escape from School!", "a854be48d4af20126d18a9cad93a969b", 51840),
FANGAME("Exploration Zeta!", "b9fbb704017d7ea9613b0160f86527bb", 370944),
+ FANGAME("Lost Crystal", "4f21ba8ee64f8d655b9eeb1e3ffd50f7", 792064),
FANGAME("Magic Rings", "6e0d1dd561d3dad8f9a7a20ed1f09b16", 112000),
FANGAME("Midnight Snack", "346982a32fc701f53bb19771d72063d0", 69504),
FANGAME("Queen Quest", "730605d312efedb5e3ff108522fcac18", 59776),
BIGGAME("scepters", "", "Scepters", "b80bff315897776dda7689cdf829fab4", 360832),
+ // ??? problems with dog bitmap?
+ FANGAMEN("Space Adventure", "SpaceAdventure", "e5b0d8ad6d235ede2f08583342642dfa", 158720),
FANGAME("Time Bomb", "2df84b636237686b624e736a698a16c4", 66432),
// Invalid rect in scene "Access Tube 1"
FANGAMEN("The Phoenix v1.2", "The Phoenix", "7fa2a2ac740f22572516843922b7c630", 434560),
Commit: 57e1e3686727c6a175c027198b060e7e75473e5b
https://github.com/scummvm/scummvm/commit/57e1e3686727c6a175c027198b060e7e75473e5b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-01T12:11:10+01:00
Commit Message:
WAGE: Added detection for The Tower
Changed paths:
engines/wage/detection_tables.h
diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
index 15babc0..8573d8b 100644
--- a/engines/wage/detection_tables.h
+++ b/engines/wage/detection_tables.h
@@ -54,6 +54,7 @@ static const ADGameDescription gameDescriptions[] = {
FANGAME("Time Bomb", "2df84b636237686b624e736a698a16c4", 66432),
// Invalid rect in scene "Access Tube 1"
FANGAMEN("The Phoenix v1.2", "The Phoenix", "7fa2a2ac740f22572516843922b7c630", 434560),
+ FANGAME("The Tower", "75eba57a12ed181e07f34eaf6aa9d2c4", 568320),
// Doesn't go past first scene
BIGGAME("Twisted!", "", "Twisted! 1.6", "8ea8cc13d26d7975dc43ea7e6c193217", 992896),
FANGAME("ZikTuria", "e793155bed1a70fa2074a3fcd696b751", 54784),
Commit: 3c2bec3f3a9e7738b9ec95f860d7f7d095d00f90
https://github.com/scummvm/scummvm/commit/3c2bec3f3a9e7738b9ec95f860d7f7d095d00f90
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-01T12:11:10+01:00
Commit Message:
WAGE: Added two more games
Changed paths:
engines/wage/detection_tables.h
diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
index 8573d8b..2df16f1 100644
--- a/engines/wage/detection_tables.h
+++ b/engines/wage/detection_tables.h
@@ -37,6 +37,8 @@ static const ADGameDescription gameDescriptions[] = {
// Problems with letter rendering
FANGAME("Canal District", "8856bc699a20fc5b7fc67accee12cac7", 658176),
BIGGAME("cantitoe", "", "Camp Cantitoe", "098aa5c11c58e1ef274a30a9e01b4755", 621440),
+ // Invalid rect in scene "FINALE"
+ FANGAME("Castle of Ert", "85f56731635e825e49a672c4fb0490dd", 205312),
FANGAME("Deep Angst", "635f62bbc569e72b03cab9107927d03d", 335232),
FANGAMEN("Dungeon World II", "DungeonWorld2", "e10c5e3cc17879c298b1551f33571b15", 234880),
// Polygons with ignored byte 1
@@ -54,9 +56,11 @@ static const ADGameDescription gameDescriptions[] = {
FANGAME("Time Bomb", "2df84b636237686b624e736a698a16c4", 66432),
// Invalid rect in scene "Access Tube 1"
FANGAMEN("The Phoenix v1.2", "The Phoenix", "7fa2a2ac740f22572516843922b7c630", 434560),
+ // Admission for on 3rd screen is messed up
FANGAME("The Tower", "75eba57a12ed181e07f34eaf6aa9d2c4", 568320),
// Doesn't go past first scene
BIGGAME("Twisted!", "", "Twisted! 1.6", "8ea8cc13d26d7975dc43ea7e6c193217", 992896),
+ FANGAME("Wishing Well", "3ee884d0d1a168d088cf2250d3a83c73", 105600),
FANGAME("ZikTuria", "e793155bed1a70fa2074a3fcd696b751", 54784),
FANGAME("Zoony", "e6cc8a914a4215dafbcce6315dd12cf5", 160256),
More information about the Scummvm-git-logs
mailing list