[Scummvm-cvs-logs] scummvm master -> 2c89f3b3d801a40d60872baf04d534dd2af296f8
sev-
sev at scummvm.org
Tue Apr 5 09:57:37 CEST 2016
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e027225b42 WAGE: Added three more fangames to detection
2a3c4cc160 WAGE: Added 4 more detection entries.
7555d041b5 WAGE: Split scene and console drawing
2c89f3b3d8 WAGE: Order scene and console drawing depending on what is active
Commit: e027225b42558b32f03830e188de514997a584b2
https://github.com/scummvm/scummvm/commit/e027225b42558b32f03830e188de514997a584b2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-05T09:23:00+02:00
Commit Message:
WAGE: Added three more fangames to detection
Changed paths:
engines/wage/detection_tables.h
diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
index 95712b4..3f04ba0 100644
--- a/engines/wage/detection_tables.h
+++ b/engines/wage/detection_tables.h
@@ -122,6 +122,7 @@ static const ADGameDescription gameDescriptions[] = {
// Cropped graphics at the first scene
FANGAME("Psychotic!", "29b30e6aae9cc6db5eccb09f695ff25e", 367309),
FANGAME("P-W Adventure", "9bf86fb946683500d23887ef185726ab", 219216),
+ FANGAMEN("Pyramid of Ert", "Pyramid of Ert V1.2", "fb931cd35440a66864a434c773b496da", 315783),
FANGAME("Queen Quest", "8273e29afe64a984eb0ce7b43fdf3a59", 57039), // alt version
FANGAME("Quest for T-Rex", "f16f2cd525c9aeb4733295d8d842b902", 592584),
// Crash in console rendering on the initial scene
@@ -146,6 +147,7 @@ static const ADGameDescription gameDescriptions[] = {
FANGAME("Sweetspace Now!", "1d419bc0b04c51468ddc40a90125bf00", 123813), // Comes with Jumble
// Wrong scrolling in the first console text
FANGAMEN("Sword of Siegfried", "Sword of Siegfried 1.0", "1ee92830690f89ea142ac0847176a0c3", 234763),
+ FANGAME("Terrorist", "68208fa5e426312fb12402894add5e4a", 524469), // Original file name "Terrorist†"
FANGAME("Time Bomb", "b7a369d57d43ec8d9fd53832fd38d7db", 64564),
FANGAME("Time Bomb", "b7a369d57d43ec8d9fd53832fd38d7db", 64578), // Alt version
FANGAMEND("The Ashland Revolution", "The Ashland Revolution Demo", "3c7a1bdeab48a077a4f54fe69da61a9f", 145023), // Original file name "The Ashland Revolution Demo†"
@@ -160,6 +162,7 @@ static const ADGameDescription gameDescriptions[] = {
FANGAME("The Tower", "135fe861928d15b5acd8b355460c54bf", 556539),
// Polygons with ignored byte 1 and 2 on second scene
FANGAME("The Village", "b9b5cfbfc7f482eae7587b55edc135ed", 314828),
+ FANGAMEND("Tombworld", "Demo TombWorld", "f7c86166e29fb8b57f7a1400d4963a4e", 664252), // Original file name "Demo TombWorld©"
// Doesn't go past first scene
BIGGAME("twisted", "", "Twisted! 1.6", "97ab265eddf0cfed6d43d062c853cbc0", 960954),
FANGAME("Wishing Well", "ece06c419cbb2d32941e6b5c7d9d7c1a", 103688),
Commit: 2a3c4cc16032fdc0ee5db3fe3c554941ec63b471
https://github.com/scummvm/scummvm/commit/2a3c4cc16032fdc0ee5db3fe3c554941ec63b471
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-05T09:31:39+02:00
Commit Message:
WAGE: Added 4 more detection entries.
Only Disk and SEA archives are left unprocessed. Once this is finished
I will put both originals and extracted archives online.
Changed paths:
engines/wage/detection_tables.h
diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
index 3f04ba0..0214f22 100644
--- a/engines/wage/detection_tables.h
+++ b/engines/wage/detection_tables.h
@@ -131,6 +131,8 @@ static const ADGameDescription gameDescriptions[] = {
FANGAME("Radical Castle 1.0", "8ae2e29ffeca52a5c7fae66dec4764a3", 347278),
BIGGAME("raysmaze", "v1.5", "Ray's Maze1.5", "521583e59bdc1d611f963cef1dc25869", 1408516),
BIGGAME("raysmaze", "v1.5/alt", "Ray's Maze1.5", "120e65bec953b981b2e0aed45ad45d70", 1408516),
+ // Next button is not visible
+ FANGAME("Ray's World Builder Demo", "d252ee8e38c9abc50455d071a367d031", 116056),
// Unhandled comparison case
FANGAME("Sands of Time", "b00ea866cb04cd87124e5720bc2c84c7", 122672), // Original file name "Sands of Time†"
BIGGAME("scepters", "", "Scepters", "f8db17cd96be056cf8a8bb9cfe46cf3a", 346595),
@@ -162,11 +164,14 @@ static const ADGameDescription gameDescriptions[] = {
FANGAME("The Tower", "135fe861928d15b5acd8b355460c54bf", 556539),
// Polygons with ignored byte 1 and 2 on second scene
FANGAME("The Village", "b9b5cfbfc7f482eae7587b55edc135ed", 314828),
+ FANGAME("The Wizard's Apprentice", "7eff3cb7d1a3f59639c62cf196039745", 782824),
FANGAMEND("Tombworld", "Demo TombWorld", "f7c86166e29fb8b57f7a1400d4963a4e", 664252), // Original file name "Demo TombWorld©"
// Doesn't go past first scene
BIGGAME("twisted", "", "Twisted! 1.6", "97ab265eddf0cfed6d43d062c853cbc0", 960954),
+ FANGAME("Volcano II", "4dbb7ec6111c0f872da8ed8ba14763c9", 82991), // Original file name "Volcano II†"
FANGAME("Wishing Well", "ece06c419cbb2d32941e6b5c7d9d7c1a", 103688),
FANGAME("Wizard's Warehouse", "ee1b86841583e2b58ac39bf97017dc7b", 159748),
+ FANGAMEN("Wizard's Warehouse 2", "WizWarehouse 2.0", "6502bd974fe149fe76d6d5ae9d1e6878", 230870),
FANGAME("ZikTuria", "1b934fca68d633d231dccd2047d2d274", 52972),
FANGAME("Zoony", "7bb293b81117cbd974ce54fafa06f258", 154990), // original filename "Zoony™"
Commit: 7555d041b5f7e8a196e05e906a4cf7bdc293a969
https://github.com/scummvm/scummvm/commit/7555d041b5f7e8a196e05e906a4cf7bdc293a969
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-05T09:39:16+02:00
Commit Message:
WAGE: Split scene and console drawing
Changed paths:
engines/wage/gui.cpp
engines/wage/gui.h
diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp
index 15d82a6..3591000 100644
--- a/engines/wage/gui.cpp
+++ b/engines/wage/gui.cpp
@@ -239,37 +239,10 @@ void Gui::draw() {
}
if (_scene != _engine->_world->_player->_currentScene || _sceneDirty) {
- _scene = _engine->_world->_player->_currentScene;
-
- drawDesktop();
-
- _sceneDirty = true;
- _consoleDirty = true;
- _menuDirty = true;
- _consoleFullRedraw = true;
-
- _scene->paint(&_screen, _scene->_designBounds->left, _scene->_designBounds->top);
-
- _sceneArea.left = _scene->_designBounds->left + kBorderWidth - 2;
- _sceneArea.top = _scene->_designBounds->top + kBorderWidth - 2;
- _sceneArea.setWidth(_scene->_designBounds->width() - 2 * kBorderWidth);
- _sceneArea.setHeight(_scene->_designBounds->height() - 2 * kBorderWidth);
-
- _consoleTextArea.left = _scene->_textBounds->left + kBorderWidth - 2;
- _consoleTextArea.top = _scene->_textBounds->top + kBorderWidth - 2;
- _consoleTextArea.setWidth(_scene->_textBounds->width() - 2 * kBorderWidth);
- _consoleTextArea.setHeight(_scene->_textBounds->height() - 2 * kBorderWidth);
+ drawScene();
}
- if (_scene && (_bordersDirty || _sceneDirty))
- paintBorder(&_screen, _sceneArea, kWindowScene);
-
- // Render console
- if (_consoleDirty || _consoleFullRedraw)
- renderConsole(&_screen, _consoleTextArea);
-
- if (_bordersDirty || _consoleDirty || _consoleFullRedraw)
- paintBorder(&_screen, _consoleTextArea, kWindowConsole);
+ drawConsole();
if (_menuDirty)
_menu->render();
@@ -288,6 +261,41 @@ void Gui::draw() {
_consoleFullRedraw = false;
}
+void Gui::drawScene() {
+ _scene = _engine->_world->_player->_currentScene;
+
+ drawDesktop();
+
+ _sceneDirty = true;
+ _consoleDirty = true;
+ _menuDirty = true;
+ _consoleFullRedraw = true;
+
+ _scene->paint(&_screen, _scene->_designBounds->left, _scene->_designBounds->top);
+
+ _sceneArea.left = _scene->_designBounds->left + kBorderWidth - 2;
+ _sceneArea.top = _scene->_designBounds->top + kBorderWidth - 2;
+ _sceneArea.setWidth(_scene->_designBounds->width() - 2 * kBorderWidth);
+ _sceneArea.setHeight(_scene->_designBounds->height() - 2 * kBorderWidth);
+
+ _consoleTextArea.left = _scene->_textBounds->left + kBorderWidth - 2;
+ _consoleTextArea.top = _scene->_textBounds->top + kBorderWidth - 2;
+ _consoleTextArea.setWidth(_scene->_textBounds->width() - 2 * kBorderWidth);
+ _consoleTextArea.setHeight(_scene->_textBounds->height() - 2 * kBorderWidth);
+
+ if (_scene && (_bordersDirty || _sceneDirty))
+ paintBorder(&_screen, _sceneArea, kWindowScene);
+}
+
+// Render console
+void Gui::drawConsole() {
+ if (_consoleDirty || _consoleFullRedraw)
+ renderConsole(&_screen, _consoleTextArea);
+
+ if (_bordersDirty || _consoleDirty || _consoleFullRedraw)
+ paintBorder(&_screen, _consoleTextArea, kWindowConsole);
+}
+
void Gui::drawBox(Graphics::Surface *g, int x, int y, int w, int h) {
Common::Rect r(x, y, x + w + 1, y + h + 1);
diff --git a/engines/wage/gui.h b/engines/wage/gui.h
index c136163..48ec41c 100644
--- a/engines/wage/gui.h
+++ b/engines/wage/gui.h
@@ -121,6 +121,8 @@ public:
void enableNewGameMenus();
private:
+ void drawScene();
+ void drawConsole();
void undrawCursor();
void drawDesktop();
void paintBorder(Graphics::Surface *g, Common::Rect &r, WindowType windowType, int highlightedPart = kBorderNone,
Commit: 2c89f3b3d801a40d60872baf04d534dd2af296f8
https://github.com/scummvm/scummvm/commit/2c89f3b3d801a40d60872baf04d534dd2af296f8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-05T09:57:30+02:00
Commit Message:
WAGE: Order scene and console drawing depending on what is active
Changed paths:
engines/wage/gui.cpp
diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp
index 3591000..4c84896 100644
--- a/engines/wage/gui.cpp
+++ b/engines/wage/gui.cpp
@@ -238,12 +238,14 @@ void Gui::draw() {
return;
}
- if (_scene != _engine->_world->_player->_currentScene || _sceneDirty) {
+ if (_sceneIsActive) {
+ drawConsole();
drawScene();
+ } else {
+ drawScene();
+ drawConsole();
}
- drawConsole();
-
if (_menuDirty)
_menu->render();
@@ -262,6 +264,9 @@ void Gui::draw() {
}
void Gui::drawScene() {
+ if (_scene == _engine->_world->_player->_currentScene && !_sceneDirty)
+ return;
+
_scene = _engine->_world->_player->_currentScene;
drawDesktop();
More information about the Scummvm-git-logs
mailing list