[Scummvm-git-logs] scummvm master -> 2ff338c1cab896722aa8fa8275d439faaec0fde2
sev-
noreply at scummvm.org
Sat Aug 31 16:44:32 UTC 2024
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2ff338c1ca QDENGINE: Merged qd_runtime.cpp into qdengine.cpp
Commit: 2ff338c1cab896722aa8fa8275d439faaec0fde2
https://github.com/scummvm/scummvm/commit/2ff338c1cab896722aa8fa8275d439faaec0fde2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-08-31T18:44:22+02:00
Commit Message:
QDENGINE: Merged qd_runtime.cpp into qdengine.cpp
Changed paths:
R engines/qdengine/qd_runtime.cpp
engines/qdengine/module.mk
engines/qdengine/qdengine.cpp
diff --git a/engines/qdengine/module.mk b/engines/qdengine/module.mk
index f2e24ed4d96..957cbf221d3 100644
--- a/engines/qdengine/module.mk
+++ b/engines/qdengine/module.mk
@@ -4,7 +4,6 @@ MODULE_OBJS = \
qdengine.o \
console.o \
metaengine.o \
- qd_runtime.o \
parser/qdscr_parser.o \
parser/xml_parser.o \
parser/xml_tag_buffer.o \
diff --git a/engines/qdengine/qd_runtime.cpp b/engines/qdengine/qd_runtime.cpp
deleted file mode 100644
index e4a4ab56061..00000000000
--- a/engines/qdengine/qd_runtime.cpp
+++ /dev/null
@@ -1,386 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "common/archive.h"
-#include "common/config-manager.h"
-#include "common/events.h"
-
-#include "qdengine/resource.h"
-#include "qdengine/qdcore/qd_game_dispatcher.h"
-#include "qdengine/qdcore/qd_game_scene.h"
-#include "qdengine/qdcore/qd_trigger_chain.h"
-#include "qdengine/qdcore/qd_setup.h"
-#include "qdengine/system/sound/snd_dispatcher.h"
-#include "qdengine/qdcore/qd_file_manager.h"
-#include "qdengine/qdcore/util/plaympp_api.h"
-#include "qdengine/qdcore/util/splash_screen.h"
-#include "qdengine/qdcore/util/ResourceDispatcher.h"
-#include "qdengine/qdcore/util/WinVideo.h"
-#include "qdengine/system/graphics/gr_dispatcher.h"
-#include "qdengine/system/graphics/rle_compress.h"
-#include "qdengine/system/input/input_wndproc.h"
-#include "qdengine/system/input/mouse_input.h"
-#include "qdengine/system/input/keyboard_input.h"
-
-namespace QDEngine {
-
-namespace qdrt {
-
-void init_graphics();
-bool init_graphics_dispatcher();
-void restore_graphics();
-
-void qd_show_load_progress(int percents_loaded, void *p);
-
-void restore();
-
-grDispatcher *grD = NULL;
-
-qdGameDispatcher *qd_gameD = NULL;
-
-} // namespace qdrt
-
-using namespace qdrt;
-
-static void generateTagMap(int date, bool verbose = true) {
- int n = 0;
-
- memset(g_engine->_tagMap, 0, QDSCR_MAX_KEYWORD_ID * sizeof(int));
-
- for (int i = 0; i < QDSCR_MAX_KEYWORD_ID; i++)
- if (idTagVersionAll[i * 2] <= date)
- g_engine->_tagMap[n++] = idTagVersionAll[i * 2 + 1];
-
- if (verbose)
- warning("Generated %d ids for version %d", n, date);
-}
-
-void searchTagMap(int id, int targetVal) {
- Common::HashMap<int, bool> dates;
-
- for (int i = 0; i < QDSCR_MAX_KEYWORD_ID; i++)
- dates[idTagVersionAll[i * 2]] = true;
-
- Common::Array<int> sdates;
- for (auto it : dates)
- sdates.push_back(it._key);
-
- Common::sort(sdates.begin(), sdates.end());
-
- for (auto d : sdates) {
- generateTagMap(d, false);
-
- int matchedId = -1;
- int len = QDSCR_MAX_KEYWORD_ID;
-
- for (int i = 0; i < QDSCR_MAX_KEYWORD_ID; i++) {
- if (!g_engine->_tagMap[i]) {
- len = i;
- break;
- }
-
- if (g_engine->_tagMap[i] == id)
- matchedId = i + 1;
- }
-
- warning("ver: %d val: %d of %d", d, matchedId, len);
-
- if (g_engine->_tagMap[targetVal - 1] == id)
- warning("searchTagMap(): Matched version %d", d);
- }
-
- warning("searchTagMap(): No match");
-}
-
-static int detectVersion(Common::String gameID) {
- if (gameID == "karliknos") {
- return 20030919; // QDSCR_GAME_TITLE = 182, 06b1cf45d (repo-vss)
- } else if (gameID == "nupogodi3" && g_engine->getLanguage() == Common::RU_RUS) {
- return 20031014; // QDSCR_TEXT_DB = 184, d864cc279 (repo-vss)
- } else if (gameID == "nupogodi3" && g_engine->getLanguage() == Common::LT_LTU) {
- return 20031206; // QDSCR_TEXT_DB = 185
- } else if (gameID == "pilots3") {
- return 20040519; // QDSCR_GAME_TITLE = 203
- } else if (gameID == "rybalka") {
- return 20040601; // QDSCR_GAME_TITLE = 206
- } else if (gameID == "pilots3d") {
- return 20040601; // QDSCR_GAME_TITLE = 206
- } else if (gameID == "pilots3d-2") {
- return 20041201; // QDSCR_GAME_TITLE = 207
- } else if (gameID == "mng") {
- return 20050101; // QDSCR_GLOBAL_DEPEND = 214
- } else if (gameID == "maski") {
- return 20060129; // QDSCR_GAME_TITLE = 214, 54bcf92 (repo-git)
- } else if (gameID == "3mice1") {
- return 20060715; // QDSCR_SCREEN_TRANSFORM = 232
- } else if (gameID == "shveik") {
- return 20070503; // QDSCR_GAME_TITLE = 231, QDSCR_RESOURCE_COMPRESSION = 243
- } else if (gameID == "klepa") {
- return 20070503; // QDSCR_GAME_TITLE = 231, QDSCR_RESOURCE_COMPRESSION = 243
- } else if (gameID == "3mice2") {
- return 20070503; // QDSCR_RESOURCE_COMPRESSION = 243
- } else if (gameID == "dogncat") {
- return 20070503; // QDSCR_RESOURCE_COMPRESSION = 243
- } else if (gameID == "dogncat2") {
- return 20070503; // QDSCR_RESOURCE_COMPRESSION = 243
- } else {
- warning("Unprocessed tagMap, switching to shveik");
-
- return 20070503;
- }
-}
-
-int QDEngineEngine::engineMain() {
- Common::ArchiveMemberList files;
- SearchMan.listMatchingMembers(files, "*.qml");
- Common::ArchiveMemberPtr p = files.front();
- Common::String firstFileName;
- Common::String script_name;
-
- if (p) {
- firstFileName = p->getFileName();
- script_name = firstFileName.c_str();
- }
-
- if (script_name.empty()) {
- return 0;
- }
-
- grD = new grDispatcher();
-
- grD->hideMouse();
-
- grD->showMouse(); // FIXME HACK
-
- SplashScreen sp;
- if (ConfMan.getBool("splash_enabled")) {
- sp.create(IDB_SPLASH);
- sp.set_mask(IDB_SPLASH_MASK);
- sp.show();
- }
-
- //searchTagMap(QDSCR_GAME_TITLE, 207);
-
- _gameVersion = detectVersion(g_engine->getGameId());
-
- generateTagMap(_gameVersion);
-
- grDispatcher::set_default_font(qdGameDispatcher::create_font(0));
-
- qd_gameD = new qdGameDispatcher;
- qd_gameD->load_script(script_name.c_str());
-
- if (ConfMan.getBool("dump_scripts")) {
- qd_gameD->save_script("qd_game.xml");
- debug("Dumped qd_game.xml%s", debugChannelSet(-1, kDebugLog) ? " in human-readable form" : "");
- }
-
- qd_gameD->set_scene_loading_progress_callback(qd_show_load_progress);
-
- if (ConfMan.getBool("splash_enabled")) {
- sp.wait(ConfMan.getInt("splash_time"));
- sp.destroy();
- }
-
- init_graphics();
-
- sndDispatcher *sndD = new sndDispatcher;
-
- g_engine->syncSoundSettings();
-
- winVideo::init();
-
- qd_gameD->load_resources();
-
- if (ConfMan.hasKey("boot_param")) {
- const char *scene_name = ""; // FIXME. Implement actual scene selection
- if (!qd_gameD->select_scene(scene_name))
- error("Cannot find the startup scene");
- } else {
- bool music_enabled = mpegPlayer::instance().is_enabled();
- mpegPlayer::instance().disable();
-
- qd_gameD->toggle_main_menu(true);
- if (!qd_gameD->start_intro_videos()) {
- if (music_enabled)
- mpegPlayer::instance().enable(true);
- } else {
- if (music_enabled)
- mpegPlayer::instance().enable(false);
- }
- }
-
- qd_gameD->update_time();
- qd_gameD->quant();
-
- ResourceDispatcher resD;
- resD.setTimer(ConfMan.getBool("logic_synchro_by_clock"), ConfMan.getInt("logic_period"), 300);
- resD.attach(new MemberFunctionCallResourceUser<qdGameDispatcher>(*qd_gameD, &qdGameDispatcher::quant, ConfMan.getInt("logic_period")));
- sndD->set_frequency_coeff(ConfMan.getFloat("game_speed"));
- resD.set_speed(ConfMan.getFloat("game_speed"));
- resD.start();
-
- bool exit_flag = false;
- bool was_inactive = false;
-
- // Activate the window
- grDispatcher::activate(true);
-
- Common::Event event;
-
- while (!exit_flag && !qd_gameD->need_exit()) {
- while (g_system->getEventManager()->pollEvent(event)) {
- switch (event.type) {
- case Common::EVENT_QUIT:
- if (!grDispatcher::instance()->is_in_reinit_mode())
- exit_flag = true;
- break;
- case Common::EVENT_KEYDOWN:
- if (event.kbd.ascii == 'f')
- ConfMan.setBool("show_fps", !ConfMan.getBool("show_fps"));
-#ifdef __QD_DEBUG_ENABLE__
- else if (event.kbd.keycode == Common::KEYCODE_PAGEDOWN) {
- float speed = ConfMan.getFloat("game_speed") * 0.9f;
- if (speed < 0.1f) speed = 0.1f;
- ConfMan.setFloat("game_speed", speed);
- sndD->set_frequency_coeff(speed);
- resD.set_speed(ConfMan.getFloat("game_speed"));
- ConfMan.flushToDisk();
- } else if (event.kbd.keycode == Common::KEYCODE_PAGEUP) {
- float speed = ConfMan.getFloat("game_speed") * 1.1f;
- if (speed > 10.0f) speed = 10.0f;
- ConfMan.setFloat("game_speed", speed);
- sndD->set_frequency_coeff(speed);
- resD.set_speed(ConfMan.getFloat("game_speed"));
- ConfMan.flushToDisk();
- } else if (event.kbd.keycode == Common::KEYCODE_HOME) {
- ConfMan.setFloat("game_speed", 1.0f);
- sndD->set_frequency_coeff(1.0f);
- resD.set_speed(ConfMan.getFloat("game_speed"));
- ConfMan.flushToDisk();
- } else if (event.kbd.ascii == 'g')
- qdGameConfig::get_config().toggle_show_grid();
-#endif
- break;
- default:
- break;
- }
-
- input::keyboard_wndproc(event, keyboardDispatcher::instance());
- input::mouse_wndproc(event, mouseDispatcher::instance());
- }
-
- if (grDispatcher::instance()->is_mouse_hidden())
- grDispatcher::instance()->set_null_mouse_cursor();
- else
- grDispatcher::instance()->set_default_mouse_cursor();
-
- if (grDispatcher::is_active()) {
- if (was_inactive) {
- was_inactive = false;
- // При активации ждем, чтобы Ð·Ð²ÑƒÐºÐ¾Ð²Ð¾Ð²Ð°Ñ ÑиÑтема уÑпела наÑтроитьÑÑ
- // на наше приложение (предположение)
- g_system->delayMillis(500);
- }
- resD.quant();
- qd_gameD->redraw();
-
- } else {
- was_inactive = true;
- g_system->delayMillis(100);
- resD.skip_time();
- }
-
- g_system->updateScreen();
- }
-
- delete qd_gameD;
-
- grDispatcher::instance()->finit();
-
- qdFileManager::instance().Finit();
-
- delete sndD;
- delete grD;
-
- winVideo::done();
-
- RLEBuffer::releaseBuffers();
-
- return 0;
-}
-
-namespace qdrt {
-
-void init_graphics() {
- grDispatcher::set_restore_handler(restore_graphics);
- grDispatcher::instance()->finit();
-
- grDispatcher::set_instance(grD);
-
- if (!init_graphics_dispatcher())
- return;
-
- grDispatcher::instance()->setClip();
- grDispatcher::instance()->setClipMode(1);
-
- grDispatcher::instance()->fill(0);
-
- g_system->updateScreen();
-
- grDispatcher::instance()->flush();
-}
-
-bool init_graphics_dispatcher() {
- grDispatcher::instance()->init(g_engine->_screenW, g_engine->_screenH, GR_RGB565);
- return true;
-}
-
-void qd_show_load_progress(int percents_loaded, void *p) {
- const int rect_sx = 200;
- const int rect_sy = 10;
-
- int sx = rect_sx * percents_loaded / 100;
- if (sx < 0) sx = 0;
- if (sx > rect_sx) sx = rect_sx;
-
- int x = 10;
- int y = grDispatcher::instance()->get_SizeY() - rect_sy - 10;
-
- grDispatcher::instance()->rectangle(x, y, rect_sx, rect_sy, 0xFFFFFF, 0, GR_OUTLINED);
- grDispatcher::instance()->rectangle(x, y, sx, rect_sy, 0xFFFFFF, 0xFFFFFF, GR_FILLED);
- grDispatcher::instance()->flush(x, y, rect_sx, rect_sy);
-}
-
-void restore_graphics() {
- if (sndDispatcher * dp = sndDispatcher::get_dispatcher())
- dp->set_volume(dp->volume());
-
- if (qdGameDispatcher * dp = qdGameDispatcher::get_dispatcher())
- dp->set_flag(qdGameDispatcher::FULLSCREEN_REDRAW_FLAG);
-}
-
-void restore() {
-}
-
-} // namespace main
-
-} // namespace QDEngine
diff --git a/engines/qdengine/qdengine.cpp b/engines/qdengine/qdengine.cpp
index a1578141e78..6499a01799b 100644
--- a/engines/qdengine/qdengine.cpp
+++ b/engines/qdengine/qdengine.cpp
@@ -32,14 +32,41 @@
#include "qdengine/qdengine.h"
#include "qdengine/console.h"
+#include "qdengine/resource.h"
+
#include "qdengine/parser/qdscr_parser.h"
+
+#include "qdengine/qdcore/qd_file_manager.h"
#include "qdengine/qdcore/qd_game_dispatcher.h"
+
#include "qdengine/qdcore/util/plaympp_api.h"
+#include "qdengine/qdcore/util/ResourceDispatcher.h"
+#include "qdengine/qdcore/util/splash_screen.h"
+
+#include "qdengine/system/graphics/gr_dispatcher.h"
+#include "qdengine/system/graphics/rle_compress.h"
+
+#include "qdengine/system/input/keyboard_input.h"
+#include "qdengine/system/input/mouse_input.h"
+#include "qdengine/system/input/input_wndproc.h"
#include "qdengine/system/sound/snd_dispatcher.h"
namespace QDEngine {
QDEngineEngine *g_engine;
+grDispatcher *grD = NULL;
+qdGameDispatcher *qd_gameD = NULL;
+
+static void generateTagMap(int date, bool verbose = true);
+void searchTagMap(int id, int targetVal);
+static int detectVersion(Common::String gameID);
+
+static void init_graphics();
+static bool init_graphics_dispatcher();
+static void restore_graphics();
+
+static void qd_show_load_progress(int percents_loaded, void *p);
+
QDEngineEngine::QDEngineEngine(OSystem *syst, const ADGameDescription *gameDesc) : Engine(syst),
_gameDescription(gameDesc), _randomSource("QDEngine") {
@@ -93,10 +120,186 @@ Common::Error QDEngineEngine::run() {
// If a savegame was selected from the launcher, load it
int saveSlot = ConfMan.getInt("save_slot");
- if (saveSlot != -1)
+ if (saveSlot != -1) {
+ warning("STUB: savegame loading is not yet supported");
(void)loadGameState(saveSlot);
+ }
+
+ Common::ArchiveMemberList files;
+ SearchMan.listMatchingMembers(files, "*.qml");
+ Common::ArchiveMemberPtr p = files.front();
+ Common::String firstFileName;
+ Common::String script_name;
+
+ if (p) {
+ firstFileName = p->getFileName();
+ script_name = firstFileName.c_str();
+ }
+
+ if (script_name.empty()) {
+ return Common::kNoGameDataFoundError;
+ }
+
+ grD = new grDispatcher();
+
+ grD->hideMouse();
+
+ grD->showMouse(); // FIXME HACK
+
+ SplashScreen sp;
+ if (ConfMan.getBool("splash_enabled")) {
+ sp.create(IDB_SPLASH);
+ sp.set_mask(IDB_SPLASH_MASK);
+ sp.show();
+ }
+
+ //searchTagMap(QDSCR_GAME_TITLE, 207);
+
+ _gameVersion = detectVersion(g_engine->getGameId());
+
+ generateTagMap(_gameVersion);
+
+ grDispatcher::set_default_font(qdGameDispatcher::create_font(0));
+
+ qd_gameD = new qdGameDispatcher;
+ qd_gameD->load_script(script_name.c_str());
+
+ if (ConfMan.getBool("dump_scripts")) {
+ qd_gameD->save_script("qd_game.xml");
+ debug("Dumped qd_game.xml%s", debugChannelSet(-1, kDebugLog) ? " in human-readable form" : "");
+ }
+
+ qd_gameD->set_scene_loading_progress_callback(qd_show_load_progress);
+
+ if (ConfMan.getBool("splash_enabled")) {
+ sp.wait(ConfMan.getInt("splash_time"));
+ sp.destroy();
+ }
+
+ init_graphics();
+
+ sndDispatcher *sndD = new sndDispatcher;
+
+ g_engine->syncSoundSettings();
+
+ winVideo::init();
+
+ qd_gameD->load_resources();
+
+ if (ConfMan.hasKey("boot_param")) {
+ const char *scene_name = ""; // FIXME. Implement actual scene selection
+ if (!qd_gameD->select_scene(scene_name))
+ error("Cannot find the startup scene");
+ } else {
+ bool music_enabled = mpegPlayer::instance().is_enabled();
+ mpegPlayer::instance().disable();
+
+ qd_gameD->toggle_main_menu(true);
+ if (!qd_gameD->start_intro_videos()) {
+ if (music_enabled)
+ mpegPlayer::instance().enable(true);
+ } else {
+ if (music_enabled)
+ mpegPlayer::instance().enable(false);
+ }
+ }
+
+ qd_gameD->update_time();
+ qd_gameD->quant();
+
+ ResourceDispatcher resD;
+ resD.setTimer(ConfMan.getBool("logic_synchro_by_clock"), ConfMan.getInt("logic_period"), 300);
+ resD.attach(new MemberFunctionCallResourceUser<qdGameDispatcher>(*qd_gameD, &qdGameDispatcher::quant, ConfMan.getInt("logic_period")));
+ sndD->set_frequency_coeff(ConfMan.getFloat("game_speed"));
+ resD.set_speed(ConfMan.getFloat("game_speed"));
+ resD.start();
+
+ bool exit_flag = false;
+ bool was_inactive = false;
+
+ // Activate the window
+ grDispatcher::activate(true);
+
+ Common::Event event;
+
+ while (!exit_flag && !qd_gameD->need_exit()) {
+ while (g_system->getEventManager()->pollEvent(event)) {
+ switch (event.type) {
+ case Common::EVENT_QUIT:
+ if (!grDispatcher::instance()->is_in_reinit_mode())
+ exit_flag = true;
+ break;
+ case Common::EVENT_KEYDOWN:
+ if (event.kbd.ascii == 'f')
+ ConfMan.setBool("show_fps", !ConfMan.getBool("show_fps"));
+#ifdef __QD_DEBUG_ENABLE__
+ else if (event.kbd.keycode == Common::KEYCODE_PAGEDOWN) {
+ float speed = ConfMan.getFloat("game_speed") * 0.9f;
+ if (speed < 0.1f) speed = 0.1f;
+ ConfMan.setFloat("game_speed", speed);
+ sndD->set_frequency_coeff(speed);
+ resD.set_speed(ConfMan.getFloat("game_speed"));
+ ConfMan.flushToDisk();
+ } else if (event.kbd.keycode == Common::KEYCODE_PAGEUP) {
+ float speed = ConfMan.getFloat("game_speed") * 1.1f;
+ if (speed > 10.0f) speed = 10.0f;
+ ConfMan.setFloat("game_speed", speed);
+ sndD->set_frequency_coeff(speed);
+ resD.set_speed(ConfMan.getFloat("game_speed"));
+ ConfMan.flushToDisk();
+ } else if (event.kbd.keycode == Common::KEYCODE_HOME) {
+ ConfMan.setFloat("game_speed", 1.0f);
+ sndD->set_frequency_coeff(1.0f);
+ resD.set_speed(ConfMan.getFloat("game_speed"));
+ ConfMan.flushToDisk();
+ } else if (event.kbd.ascii == 'g')
+ qdGameConfig::get_config().toggle_show_grid();
+#endif
+ break;
+ default:
+ break;
+ }
+
+ input::keyboard_wndproc(event, keyboardDispatcher::instance());
+ input::mouse_wndproc(event, mouseDispatcher::instance());
+ }
+
+ if (grDispatcher::instance()->is_mouse_hidden())
+ grDispatcher::instance()->set_null_mouse_cursor();
+ else
+ grDispatcher::instance()->set_default_mouse_cursor();
+
+ if (grDispatcher::is_active()) {
+ if (was_inactive) {
+ was_inactive = false;
+ // При активации ждем, чтобы Ð·Ð²ÑƒÐºÐ¾Ð²Ð¾Ð²Ð°Ñ ÑиÑтема уÑпела наÑтроитьÑÑ
+ // на наше приложение (предположение)
+ g_system->delayMillis(500);
+ }
+ resD.quant();
+ qd_gameD->redraw();
+
+ } else {
+ was_inactive = true;
+ g_system->delayMillis(100);
+ resD.skip_time();
+ }
+
+ g_system->updateScreen();
+ }
+
+ delete qd_gameD;
+
+ grDispatcher::instance()->finit();
+
+ qdFileManager::instance().Finit();
+
+ delete sndD;
+ delete grD;
- engineMain();
+ winVideo::done();
+
+ RLEBuffer::releaseBuffers();
return Common::kNoError;
}
@@ -126,6 +329,142 @@ void QDEngineEngine::syncSoundSettings() {
mpegPlayer::instance().syncMusicSettings();
}
+static void generateTagMap(int date, bool verbose) {
+ int n = 0;
+
+ memset(g_engine->_tagMap, 0, QDSCR_MAX_KEYWORD_ID * sizeof(int));
+
+ for (int i = 0; i < QDSCR_MAX_KEYWORD_ID; i++)
+ if (idTagVersionAll[i * 2] <= date)
+ g_engine->_tagMap[n++] = idTagVersionAll[i * 2 + 1];
+
+ if (verbose)
+ warning("Generated %d ids for version %d", n, date);
+}
+
+void searchTagMap(int id, int targetVal) {
+ Common::HashMap<int, bool> dates;
+
+ for (int i = 0; i < QDSCR_MAX_KEYWORD_ID; i++)
+ dates[idTagVersionAll[i * 2]] = true;
+
+ Common::Array<int> sdates;
+ for (auto it : dates)
+ sdates.push_back(it._key);
+
+ Common::sort(sdates.begin(), sdates.end());
+
+ for (auto d : sdates) {
+ generateTagMap(d, false);
+
+ int matchedId = -1;
+ int len = QDSCR_MAX_KEYWORD_ID;
+
+ for (int i = 0; i < QDSCR_MAX_KEYWORD_ID; i++) {
+ if (!g_engine->_tagMap[i]) {
+ len = i;
+ break;
+ }
+
+ if (g_engine->_tagMap[i] == id)
+ matchedId = i + 1;
+ }
+
+ warning("ver: %d val: %d of %d", d, matchedId, len);
+
+ if (g_engine->_tagMap[targetVal - 1] == id)
+ warning("searchTagMap(): Matched version %d", d);
+ }
+
+ warning("searchTagMap(): No match");
+}
+
+static int detectVersion(Common::String gameID) {
+ if (gameID == "karliknos") {
+ return 20030919; // QDSCR_GAME_TITLE = 182, 06b1cf45d (repo-vss)
+ } else if (gameID == "nupogodi3" && g_engine->getLanguage() == Common::RU_RUS) {
+ return 20031014; // QDSCR_TEXT_DB = 184, d864cc279 (repo-vss)
+ } else if (gameID == "nupogodi3" && g_engine->getLanguage() == Common::LT_LTU) {
+ return 20031206; // QDSCR_TEXT_DB = 185
+ } else if (gameID == "pilots3") {
+ return 20040519; // QDSCR_GAME_TITLE = 203
+ } else if (gameID == "rybalka") {
+ return 20040601; // QDSCR_GAME_TITLE = 206
+ } else if (gameID == "pilots3d") {
+ return 20040601; // QDSCR_GAME_TITLE = 206
+ } else if (gameID == "pilots3d-2") {
+ return 20041201; // QDSCR_GAME_TITLE = 207
+ } else if (gameID == "mng") {
+ return 20050101; // QDSCR_GLOBAL_DEPEND = 214
+ } else if (gameID == "maski") {
+ return 20060129; // QDSCR_GAME_TITLE = 214, 54bcf92 (repo-git)
+ } else if (gameID == "3mice1") {
+ return 20060715; // QDSCR_SCREEN_TRANSFORM = 232
+ } else if (gameID == "shveik") {
+ return 20070503; // QDSCR_GAME_TITLE = 231, QDSCR_RESOURCE_COMPRESSION = 243
+ } else if (gameID == "klepa") {
+ return 20070503; // QDSCR_GAME_TITLE = 231, QDSCR_RESOURCE_COMPRESSION = 243
+ } else if (gameID == "3mice2") {
+ return 20070503; // QDSCR_RESOURCE_COMPRESSION = 243
+ } else if (gameID == "dogncat") {
+ return 20070503; // QDSCR_RESOURCE_COMPRESSION = 243
+ } else if (gameID == "dogncat2") {
+ return 20070503; // QDSCR_RESOURCE_COMPRESSION = 243
+ } else {
+ warning("Unprocessed tagMap, switching to shveik");
+
+ return 20070503;
+ }
+}
+
+void init_graphics() {
+ grDispatcher::set_restore_handler(restore_graphics);
+ grDispatcher::instance()->finit();
+
+ grDispatcher::set_instance(grD);
+
+ if (!init_graphics_dispatcher())
+ return;
+
+ grDispatcher::instance()->setClip();
+ grDispatcher::instance()->setClipMode(1);
+
+ grDispatcher::instance()->fill(0);
+
+ g_system->updateScreen();
+
+ grDispatcher::instance()->flush();
+}
+
+bool init_graphics_dispatcher() {
+ grDispatcher::instance()->init(g_engine->_screenW, g_engine->_screenH, GR_RGB565);
+ return true;
+}
+
+void qd_show_load_progress(int percents_loaded, void *p) {
+ const int rect_sx = 200;
+ const int rect_sy = 10;
+
+ int sx = rect_sx * percents_loaded / 100;
+ if (sx < 0) sx = 0;
+ if (sx > rect_sx) sx = rect_sx;
+
+ int x = 10;
+ int y = grDispatcher::instance()->get_SizeY() - rect_sy - 10;
+
+ grDispatcher::instance()->rectangle(x, y, rect_sx, rect_sy, 0xFFFFFF, 0, GR_OUTLINED);
+ grDispatcher::instance()->rectangle(x, y, sx, rect_sy, 0xFFFFFF, 0xFFFFFF, GR_FILLED);
+ grDispatcher::instance()->flush(x, y, rect_sx, rect_sy);
+}
+
+void restore_graphics() {
+ if (sndDispatcher * dp = sndDispatcher::get_dispatcher())
+ dp->set_volume(dp->volume());
+
+ if (qdGameDispatcher * dp = qdGameDispatcher::get_dispatcher())
+ dp->set_flag(qdGameDispatcher::FULLSCREEN_REDRAW_FLAG);
+}
+
} // namespace QDEngine
// Translates cp-1251..utf-8
More information about the Scummvm-git-logs
mailing list