[Scummvm-cvs-logs] SF.net SVN: scummvm: [23974] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sat Sep 23 02:43:55 CEST 2006
Revision: 23974
http://svn.sourceforge.net/scummvm/?rev=23974&view=rev
Author: fingolfin
Date: 2006-09-22 17:42:35 -0700 (Fri, 22 Sep 2006)
Log Message:
-----------
Moved base/engine.cpp and .h to engines/ (main motivation: helps untangle the linker dependency graph). Porters will have to update project files
Modified Paths:
--------------
scummvm/trunk/Makefile.common
scummvm/trunk/backends/fs/amigaos4/amigaos4-fs.cpp
scummvm/trunk/backends/fs/morphos/abox-fs.cpp
scummvm/trunk/backends/fs/psp/psp_fs.cpp
scummvm/trunk/backends/platform/dc/audio.cpp
scummvm/trunk/backends/platform/dc/softkbd.cpp
scummvm/trunk/backends/platform/dc/vmsave.cpp
scummvm/trunk/backends/platform/gp32/gp32_launcher.cpp
scummvm/trunk/backends/platform/gp32/gp32_osys.h
scummvm/trunk/backends/platform/gp32/gp32std.cpp
scummvm/trunk/backends/platform/gp32/gp32std_memory.cpp
scummvm/trunk/backends/platform/morphos/morphos.cpp
scummvm/trunk/backends/platform/morphos/morphos_scaler.cpp
scummvm/trunk/backends/platform/morphos/morphos_sound.cpp
scummvm/trunk/backends/platform/morphos/morphos_timer.cpp
scummvm/trunk/backends/platform/ps2/fileio.cpp
scummvm/trunk/backends/platform/ps2/systemps2.cpp
scummvm/trunk/backends/platform/wince/CELauncherDialog.cpp
scummvm/trunk/backends/platform/wince/wince-sdl.cpp
scummvm/trunk/base/commandLine.cpp
scummvm/trunk/base/main.cpp
scummvm/trunk/base/module.mk
scummvm/trunk/base/plugins.cpp
scummvm/trunk/common/util.cpp
scummvm/trunk/engines/agi/agi.h
scummvm/trunk/engines/cine/cine.h
scummvm/trunk/engines/gob/gob.h
scummvm/trunk/engines/kyra/kyra.h
scummvm/trunk/engines/kyra/seqplayer.cpp
scummvm/trunk/engines/lure/game.h
scummvm/trunk/engines/lure/lure.h
scummvm/trunk/engines/lure/screen.h
scummvm/trunk/engines/queen/queen.h
scummvm/trunk/engines/saga/saga.h
scummvm/trunk/engines/scumm/imuse/imuse_player.cpp
scummvm/trunk/engines/scumm/insane/insane.cpp
scummvm/trunk/engines/scumm/insane/insane.h
scummvm/trunk/engines/scumm/insane/insane_ben.cpp
scummvm/trunk/engines/scumm/insane/insane_enemy.cpp
scummvm/trunk/engines/scumm/insane/insane_iact.cpp
scummvm/trunk/engines/scumm/insane/insane_scenes.cpp
scummvm/trunk/engines/scumm/player_nes.cpp
scummvm/trunk/engines/scumm/player_v1.cpp
scummvm/trunk/engines/scumm/player_v2.cpp
scummvm/trunk/engines/scumm/player_v2a.cpp
scummvm/trunk/engines/scumm/player_v3a.cpp
scummvm/trunk/engines/scumm/script.h
scummvm/trunk/engines/scumm/scumm.h
scummvm/trunk/engines/scumm/smush/smush_player.cpp
scummvm/trunk/engines/simon/simon.h
scummvm/trunk/engines/sky/sky.h
scummvm/trunk/engines/sword1/resman.cpp
scummvm/trunk/engines/sword1/sword1.h
scummvm/trunk/engines/sword2/sword2.h
scummvm/trunk/gui/PopUpWidget.cpp
scummvm/trunk/gui/about.cpp
scummvm/trunk/gui/console.cpp
scummvm/trunk/gui/launcher.cpp
scummvm/trunk/sound/audiocd.cpp
scummvm/trunk/sound/mididrv.cpp
scummvm/trunk/sound/rate.h
Added Paths:
-----------
scummvm/trunk/engines/engine.cpp
scummvm/trunk/engines/engine.h
scummvm/trunk/engines/engines.mk
scummvm/trunk/engines/module.mk
Removed Paths:
-------------
scummvm/trunk/base/engine.cpp
scummvm/trunk/base/engine.h
scummvm/trunk/engines/module.mk
Modified: scummvm/trunk/Makefile.common
===================================================================
--- scummvm/trunk/Makefile.common 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/Makefile.common 2006-09-23 00:42:35 UTC (rev 23974)
@@ -33,10 +33,11 @@
MODULES := test tools base $(MODULES)
--include $(srcdir)/engines/module.mk
+-include $(srcdir)/engines/engines.mk
# After the game specific modules follow the shared modules
MODULES += \
+ engines \
gui \
graphics \
sound \
Modified: scummvm/trunk/backends/fs/amigaos4/amigaos4-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/amigaos4/amigaos4-fs.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/backends/fs/amigaos4/amigaos4-fs.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -36,7 +36,7 @@
#include "common/util.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "backends/fs/abstract-fs.h"
#define ENTER() /* debug(6, "Enter") */
Modified: scummvm/trunk/backends/fs/morphos/abox-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/morphos/abox-fs.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/backends/fs/morphos/abox-fs.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -25,7 +25,7 @@
#include <stdio.h>
-#include "base/engine.h"
+#include "engines/engine.h"
#include "backends/fs/abstract-fs.h"
/*
Modified: scummvm/trunk/backends/fs/psp/psp_fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/psp/psp_fs.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/backends/fs/psp/psp_fs.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -23,7 +23,7 @@
*/
#ifdef __PSP__
-#include "base/engine.h"
+#include "engines/engine.h"
#include "backends/fs/abstract-fs.h"
Modified: scummvm/trunk/backends/platform/dc/audio.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/audio.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/backends/platform/dc/audio.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -23,7 +23,7 @@
#include <common/stdafx.h>
#include <common/scummsys.h>
-#include "base/engine.h"
+#include "engines/engine.h"
#include "dc.h"
EXTERN_C void *memcpy4s(void *s1, const void *s2, unsigned int n);
Modified: scummvm/trunk/backends/platform/dc/softkbd.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/softkbd.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/backends/platform/dc/softkbd.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -23,7 +23,7 @@
#include <common/stdafx.h>
#include <common/scummsys.h>
-#include "base/engine.h"
+#include "engines/engine.h"
#include <ronin/ronin.h>
#include <string.h>
Modified: scummvm/trunk/backends/platform/dc/vmsave.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/vmsave.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/backends/platform/dc/vmsave.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -23,7 +23,7 @@
#include <common/stdafx.h>
#include <common/scummsys.h>
-#include "base/engine.h"
+#include "engines/engine.h"
#include "dc.h"
#include "icon.h"
#include <common/savefile.h>
Modified: scummvm/trunk/backends/platform/gp32/gp32_launcher.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp32/gp32_launcher.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/backends/platform/gp32/gp32_launcher.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -26,7 +26,7 @@
#include "common/scummsys.h"
#include "common/file.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "gp32std.h"
#include "gp32std_grap.h"
Modified: scummvm/trunk/backends/platform/gp32/gp32_osys.h
===================================================================
--- scummvm/trunk/backends/platform/gp32/gp32_osys.h 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/backends/platform/gp32/gp32_osys.h 2006-09-23 00:42:35 UTC (rev 23974)
@@ -32,7 +32,7 @@
#include "common/system.h"
#include "backends/intern.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "gp32std.h"
#include "gp32std_grap.h"
Modified: scummvm/trunk/backends/platform/gp32/gp32std.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp32/gp32std.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/backends/platform/gp32/gp32std.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -29,7 +29,7 @@
#include "common/system.h"
#include "backends/intern.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "gp32std.h"
#include "gp32std_grap.h"
Modified: scummvm/trunk/backends/platform/gp32/gp32std_memory.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp32/gp32std_memory.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/backends/platform/gp32/gp32std_memory.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -29,7 +29,7 @@
#include "common/system.h"
#include "backends/intern.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "gp32std.h"
#include "gp32std_grap.h"
Modified: scummvm/trunk/backends/platform/morphos/morphos.cpp
===================================================================
--- scummvm/trunk/backends/platform/morphos/morphos.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/backends/platform/morphos/morphos.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -23,7 +23,7 @@
*/
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "common/util.h"
#include "scumm/scumm.h"
Modified: scummvm/trunk/backends/platform/morphos/morphos_scaler.cpp
===================================================================
--- scummvm/trunk/backends/platform/morphos/morphos_scaler.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/backends/platform/morphos/morphos_scaler.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -20,7 +20,7 @@
*/
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include <exec/types.h>
#include <cybergraphics/cybergraphics.h>
Modified: scummvm/trunk/backends/platform/morphos/morphos_sound.cpp
===================================================================
--- scummvm/trunk/backends/platform/morphos/morphos_sound.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/backends/platform/morphos/morphos_sound.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -23,7 +23,7 @@
*/
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include <dos/dos.h>
#include <exec/memory.h>
Modified: scummvm/trunk/backends/platform/morphos/morphos_timer.cpp
===================================================================
--- scummvm/trunk/backends/platform/morphos/morphos_timer.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/backends/platform/morphos/morphos_timer.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -20,7 +20,7 @@
*/
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include <exec/memory.h>
#include <exec/semaphores.h>
Modified: scummvm/trunk/backends/platform/ps2/fileio.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/fileio.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/backends/platform/ps2/fileio.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -28,7 +28,7 @@
#include <assert.h>
#include <string.h>
#include "backends/platform/ps2/asyncfio.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "common/file.h"
#include "eecodyvdfs.h"
#include "common/config-manager.h"
Modified: scummvm/trunk/backends/platform/ps2/systemps2.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/systemps2.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/backends/platform/ps2/systemps2.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -33,7 +33,7 @@
#include <iopheap.h>
#include "common/scummsys.h"
#include "../intern.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "backends/platform/ps2/systemps2.h"
#include "backends/platform/ps2/Gs2dScreen.h"
#include "backends/platform/ps2/ps2input.h"
Modified: scummvm/trunk/backends/platform/wince/CELauncherDialog.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CELauncherDialog.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/backends/platform/wince/CELauncherDialog.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -26,7 +26,7 @@
#include "CELauncherDialog.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "gui/newgui.h"
#include "gui/widget.h"
Modified: scummvm/trunk/backends/platform/wince/wince-sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -24,7 +24,7 @@
#include "wince-sdl.h"
#include "common/util.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "base/main.h"
#include "base/plugins.h"
#include "common/timer.h"
Modified: scummvm/trunk/base/commandLine.cpp
===================================================================
--- scummvm/trunk/base/commandLine.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/base/commandLine.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -23,7 +23,7 @@
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "base/commandLine.h"
#include "base/plugins.h"
#include "base/version.h"
Deleted: scummvm/trunk/base/engine.cpp
===================================================================
--- scummvm/trunk/base/engine.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/base/engine.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -1,285 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
- *
- * 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 2
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- */
-
-#include "common/stdafx.h"
-#if defined(WIN32) && !defined (__SYMBIAN32__)
-#include <malloc.h>
-#endif
-#include "base/engine.h"
-#include "common/config-manager.h"
-#include "common/file.h"
-#include "common/timer.h"
-#include "common/savefile.h"
-#include "common/system.h"
-#include "sound/mixer.h"
-#include "gui/debugger.h"
-#include "gui/message.h"
-
-#ifdef _WIN32_WCE
-extern bool isSmartphone(void);
-#endif
-
-/* FIXME - BIG HACK for MidiEmu */
-Engine *g_engine = 0;
-
-Engine::Engine(OSystem *syst)
- : _system(syst),
- _gameDataPath(ConfMan.get("path")),
- _targetName(ConfMan.getActiveDomainName()){
- g_engine = this;
- _mixer = new Audio::Mixer();
-
- _timer = Common::g_timer;
-
- _saveFileMan = _system->getSavefileManager();
-
- _autosavePeriod = ConfMan.getInt("autosave_period");
-}
-
-Engine::~Engine() {
- delete _mixer;
- delete _saveFileMan;
-
- g_engine = NULL;
-}
-
-void Engine::initCommonGFX(bool defaultTo1XScaler) {
- const Common::ConfigManager::Domain *transientDomain = ConfMan.getDomain(Common::ConfigManager::kTransientDomain);
- const Common::ConfigManager::Domain *gameDomain = ConfMan.getActiveDomain();
-
- assert(transientDomain);
-
- const bool useDefaultGraphicsMode =
- !transientDomain->contains("gfx_mode") &&
- (
- !gameDomain ||
- !gameDomain->contains("gfx_mode") ||
- !scumm_stricmp(gameDomain->get("gfx_mode").c_str(), "normal") ||
- !scumm_stricmp(gameDomain->get("gfx_mode").c_str(), "default")
- );
-
- // See if the game should default to 1x scaler
- if (useDefaultGraphicsMode && defaultTo1XScaler) {
- // FIXME: As a hack, we use "1x" here. Would be nicer to use
- // getDefaultGraphicsMode() instead, but right now, we do not specify
- // whether that is a 1x scaler or not...
- _system->setGraphicsMode("1x");
- } else {
- // Override global scaler with any game-specific define
- if (ConfMan.hasKey("gfx_mode")) {
- _system->setGraphicsMode(ConfMan.get("gfx_mode").c_str());
- }
- }
-
- // Note: The following code deals with the fullscreen / ASR settings. This
- // is a bit tricky, because there are three ways the user can affect these
- // settings: Via the config file, via the command line, and via in-game
- // hotkeys.
- // Any global or command line settings already have been applied at the time
- // we get here. Hence we only do something
-
- // (De)activate aspect-ratio correction as determined by the config settings
- if (gameDomain && gameDomain->contains("aspect_ratio"))
- _system->setFeatureState(OSystem::kFeatureAspectRatioCorrection, ConfMan.getBool("aspect_ratio"));
-
- // (De)activate fullscreen mode as determined by the config settings
- if (gameDomain && gameDomain->contains("fullscreen"))
- _system->setFeatureState(OSystem::kFeatureFullscreenMode, ConfMan.getBool("fullscreen"));
-}
-
-void Engine::checkCD() {
-#if defined (WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
- // It is a known bug under Windows that games that play CD audio cause
- // ScummVM to crash if the data files are read from the same CD. Check
- // if this appears to be the case and issue a warning.
-
- // If we can find a compressed audio track, then it should be ok even
- // if it's running from CD.
-
-#ifdef USE_VORBIS
- if (Common::File::exists("track1.ogg"))
- return;
-#endif
-#ifdef USE_FLAC
- if (Common::File::exists("track1.fla") || Common::File::exists("track1.flac"))
- return;
-#endif
-#ifdef USE_MAD
- if (Common::File::exists("track1.mp3"))
- return;
-#endif
-
- char buffer[MAXPATHLEN];
- int i;
-
- if (strlen(_gameDataPath.c_str()) == 0) {
- // That's it! I give up!
- if (getcwd(buffer, MAXPATHLEN) == NULL)
- return;
- } else
- strncpy(buffer, _gameDataPath.c_str(), MAXPATHLEN);
-
- for (i = 0; i < MAXPATHLEN - 1; i++) {
- if (buffer[i] == '\\')
- break;
- }
-
- buffer[i + 1] = 0;
-
- if (GetDriveType(buffer) == DRIVE_CDROM) {
- GUI::MessageDialog dialog(
- "You appear to be playing this game directly\n"
- "from the CD. This is known to cause problems,\n"
- "and it's therefore recommended that you copy\n"
- "the data files to your hard disk instead.\n"
- "See the README file for details.", "OK");
- dialog.runModal();
- }
-#endif
-}
-
-bool Engine::shouldPerformAutoSave(int lastSaveTime) {
- const int diff = _system->getMillis() - lastSaveTime;
- return _autosavePeriod != 0 && diff > _autosavePeriod * 1000;
-}
-
-void Engine::errorString(const char *buf1, char *buf2) {
- strcpy(buf2, buf1);
-}
-
-void NORETURN CDECL error(const char *s, ...) {
- char buf_input[STRINGBUFLEN];
- char buf_output[STRINGBUFLEN];
- va_list va;
-
- // Generate the full error message
- va_start(va, s);
- vsnprintf(buf_input, STRINGBUFLEN, s, va);
- va_end(va);
-
-
- // Next, give the active engine (if any) a chance to augment the
- // error message
- if (g_engine) {
- g_engine->errorString(buf_input, buf_output);
- } else {
- strcpy(buf_output, buf_input);
- }
-
-
- // Print the error message to stderr
-#ifdef __GP32__
- printf("ERROR: %s\n", buf_output);
-#elif !defined(_WIN32_WCE)
- fprintf(stderr, "%s!\n", buf_output);
-#endif
-
-
-#ifndef __GP32__
- // Unless this error -originated- within the debugger itself, we
- // now invoke the debugger, if available / supported.
- if (g_engine) {
- GUI::Debugger *debugger = g_engine->getDebugger();
-#ifdef _WIN32_WCE
- if (isSmartphone())
- debugger = 0;
-#endif
- if (debugger && !debugger->isAttached()) {
- debugger->attach(buf_output);
- debugger->onFrame();
- }
- }
-#endif
-
-
-#if defined( USE_WINDBG )
-#if defined( _WIN32_WCE )
- TCHAR buf_output_unicode[1024];
- MultiByteToWideChar(CP_ACP, 0, buf_output, strlen(buf_output) + 1, buf_output_unicode, sizeof(buf_output_unicode));
- OutputDebugString(buf_output_unicode);
-#else
- OutputDebugString(buf_output);
-#endif
-#endif
-
-#if defined ( _WIN32_WCE )
- drawError(buf_output);
-#endif
-
-#ifdef PALMOS_MODE
- PalmFatalError(buf_output);
-#endif
-
-#ifdef __SYMBIAN32__
- Symbian::FatalError(buf_output);
-#endif
- // Finally exit. quit() will terminate the program if g_system is present
- if (g_system)
- g_system->quit();
-
- exit(1);
-}
-
-void CDECL warning(const char *s, ...) {
- char buf[STRINGBUFLEN];
- va_list va;
-
- va_start(va, s);
- vsnprintf(buf, STRINGBUFLEN, s, va);
- va_end(va);
-
-#ifdef __GP32__ //ph0x FIXME: implement fprint?
- printf("WARNING: %s\n", buf);
-#else
-#if !defined (_WIN32_WCE) && !defined (__SYMBIAN32__)
- fprintf(stderr, "WARNING: %s!\n", buf);
-#endif
-#endif
-#if defined( USE_WINDBG )
- strcat(buf, "\n");
-#if defined( _WIN32_WCE )
- TCHAR buf_unicode[1024];
- MultiByteToWideChar(CP_ACP, 0, buf, strlen(buf) + 1, buf_unicode, sizeof(buf_unicode));
- OutputDebugString(buf_unicode);
-#else
- OutputDebugString(buf);
-#endif
-#endif
-}
-
-void checkHeap() {
-#if defined(WIN32) && !defined(__SYMBIAN32__)
- if (_heapchk() != _HEAPOK) {
- error("Heap is invalid!");
- }
-#endif
-}
-
-void Engine::GUIErrorMessage(const Common::String msg) {
- _system->setWindowCaption("Error");
- _system->beginGFXTransaction();
- initCommonGFX(false);
- _system->initSize(320, 200);
- _system->endGFXTransaction();
-
- GUI::MessageDialog dialog(msg);
- dialog.runModal();
-}
Deleted: scummvm/trunk/base/engine.h
===================================================================
--- scummvm/trunk/base/engine.h 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/base/engine.h 2006-09-23 00:42:35 UTC (rev 23974)
@@ -1,96 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
- *
- * 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 2
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- */
-
-#ifndef BASE_ENGINE_H
-#define BASE_ENGINE_H
-
-#include "common/stdafx.h"
-#include "common/scummsys.h"
-#include "common/str.h"
-
-class OSystem;
-namespace Audio {
- class Mixer;
-}
-namespace Common {
- class SaveFileManager;
- class TimerManager;
-}
-namespace GUI {
- class Debugger;
-}
-
-class Engine {
-public:
- OSystem *_system;
- Audio::Mixer *_mixer;
- Common::TimerManager * _timer;
-
-protected:
- const Common::String _targetName; // target name for saves
- const Common::String _gameDataPath;
- Common::SaveFileManager *_saveFileMan;
-
-private:
- int _autosavePeriod;
-
-public:
- Engine(OSystem *syst);
- virtual ~Engine();
-
- /**
- * Init the engine.
- * @return 0 for success, else an error code.
- */
- virtual int init() = 0;
-
- /**
- * Start the main engine loop.
- * The return value is not yet used, but could indicate whether the user
- * wants to return to the launch or to fully quit ScummVM.
- * @return a result code
- */
- virtual int go() = 0;
-
- /** Specific for each engine: prepare error string. */
- virtual void errorString(const char *buf_input, char *buf_output);
-
- void initCommonGFX(bool defaultTo1XScaler);
-
- /** On some systems, check if the game appears to be run from CD. */
- void checkCD();
-
- /* Indicate if an autosave should be performed. */
- bool shouldPerformAutoSave(int lastSaveTime);
-
- /** Initialized graphics and shows error message. */
- void GUIErrorMessage(const Common::String msg);
-
- /**
- * Return the engine's debugger instance, if any. Used by error() to
- * invoke the debugger when a severe error is reported.
- */
- virtual GUI::Debugger *getDebugger() { return 0; }
-};
-
-extern Engine *g_engine;
-
-#endif
Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/base/main.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -30,7 +30,7 @@
*/
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "base/commandLine.h"
#include "base/plugins.h"
#include "base/version.h"
Modified: scummvm/trunk/base/module.mk
===================================================================
--- scummvm/trunk/base/module.mk 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/base/module.mk 2006-09-23 00:42:35 UTC (rev 23974)
@@ -1,7 +1,6 @@
MODULE := base
MODULE_OBJS := \
- engine.o \
main.o \
commandLine.o \
plugins.o \
Modified: scummvm/trunk/base/plugins.cpp
===================================================================
--- scummvm/trunk/base/plugins.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/base/plugins.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -23,7 +23,7 @@
#include "common/stdafx.h"
#include "base/plugins.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "common/util.h"
#include "common/fs.h"
Modified: scummvm/trunk/common/util.cpp
===================================================================
--- scummvm/trunk/common/util.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/common/util.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -20,7 +20,7 @@
*/
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "common/util.h"
namespace Common {
Modified: scummvm/trunk/engines/agi/agi.h
===================================================================
--- scummvm/trunk/engines/agi/agi.h 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/agi/agi.h 2006-09-23 00:42:35 UTC (rev 23974)
@@ -33,7 +33,7 @@
#include "common/savefile.h"
#include "common/system.h"
-#include "base/engine.h"
+#include "engines/engine.h"
namespace Agi {
Modified: scummvm/trunk/engines/cine/cine.h
===================================================================
--- scummvm/trunk/engines/cine/cine.h 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/cine/cine.h 2006-09-23 00:42:35 UTC (rev 23974)
@@ -29,7 +29,7 @@
#include "common/scummsys.h"
#include "common/util.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "cine/texte.h"
#include "cine/rel.h"
Copied: scummvm/trunk/engines/engine.cpp (from rev 23929, scummvm/trunk/base/engine.cpp)
===================================================================
--- scummvm/trunk/engines/engine.cpp (rev 0)
+++ scummvm/trunk/engines/engine.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -0,0 +1,285 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2002-2006 The ScummVM project
+ *
+ * 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 2
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ */
+
+#include "common/stdafx.h"
+#if defined(WIN32) && !defined (__SYMBIAN32__)
+#include <malloc.h>
+#endif
+#include "engines/engine.h"
+#include "common/config-manager.h"
+#include "common/file.h"
+#include "common/timer.h"
+#include "common/savefile.h"
+#include "common/system.h"
+#include "sound/mixer.h"
+#include "gui/debugger.h"
+#include "gui/message.h"
+
+#ifdef _WIN32_WCE
+extern bool isSmartphone(void);
+#endif
+
+/* FIXME - BIG HACK for MidiEmu */
+Engine *g_engine = 0;
+
+Engine::Engine(OSystem *syst)
+ : _system(syst),
+ _gameDataPath(ConfMan.get("path")),
+ _targetName(ConfMan.getActiveDomainName()){
+ g_engine = this;
+ _mixer = new Audio::Mixer();
+
+ _timer = Common::g_timer;
+
+ _saveFileMan = _system->getSavefileManager();
+
+ _autosavePeriod = ConfMan.getInt("autosave_period");
+}
+
+Engine::~Engine() {
+ delete _mixer;
+ delete _saveFileMan;
+
+ g_engine = NULL;
+}
+
+void Engine::initCommonGFX(bool defaultTo1XScaler) {
+ const Common::ConfigManager::Domain *transientDomain = ConfMan.getDomain(Common::ConfigManager::kTransientDomain);
+ const Common::ConfigManager::Domain *gameDomain = ConfMan.getActiveDomain();
+
+ assert(transientDomain);
+
+ const bool useDefaultGraphicsMode =
+ !transientDomain->contains("gfx_mode") &&
+ (
+ !gameDomain ||
+ !gameDomain->contains("gfx_mode") ||
+ !scumm_stricmp(gameDomain->get("gfx_mode").c_str(), "normal") ||
+ !scumm_stricmp(gameDomain->get("gfx_mode").c_str(), "default")
+ );
+
+ // See if the game should default to 1x scaler
+ if (useDefaultGraphicsMode && defaultTo1XScaler) {
+ // FIXME: As a hack, we use "1x" here. Would be nicer to use
+ // getDefaultGraphicsMode() instead, but right now, we do not specify
+ // whether that is a 1x scaler or not...
+ _system->setGraphicsMode("1x");
+ } else {
+ // Override global scaler with any game-specific define
+ if (ConfMan.hasKey("gfx_mode")) {
+ _system->setGraphicsMode(ConfMan.get("gfx_mode").c_str());
+ }
+ }
+
+ // Note: The following code deals with the fullscreen / ASR settings. This
+ // is a bit tricky, because there are three ways the user can affect these
+ // settings: Via the config file, via the command line, and via in-game
+ // hotkeys.
+ // Any global or command line settings already have been applied at the time
+ // we get here. Hence we only do something
+
+ // (De)activate aspect-ratio correction as determined by the config settings
+ if (gameDomain && gameDomain->contains("aspect_ratio"))
+ _system->setFeatureState(OSystem::kFeatureAspectRatioCorrection, ConfMan.getBool("aspect_ratio"));
+
+ // (De)activate fullscreen mode as determined by the config settings
+ if (gameDomain && gameDomain->contains("fullscreen"))
+ _system->setFeatureState(OSystem::kFeatureFullscreenMode, ConfMan.getBool("fullscreen"));
+}
+
+void Engine::checkCD() {
+#if defined (WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
+ // It is a known bug under Windows that games that play CD audio cause
+ // ScummVM to crash if the data files are read from the same CD. Check
+ // if this appears to be the case and issue a warning.
+
+ // If we can find a compressed audio track, then it should be ok even
+ // if it's running from CD.
+
+#ifdef USE_VORBIS
+ if (Common::File::exists("track1.ogg"))
+ return;
+#endif
+#ifdef USE_FLAC
+ if (Common::File::exists("track1.fla") || Common::File::exists("track1.flac"))
+ return;
+#endif
+#ifdef USE_MAD
+ if (Common::File::exists("track1.mp3"))
+ return;
+#endif
+
+ char buffer[MAXPATHLEN];
+ int i;
+
+ if (strlen(_gameDataPath.c_str()) == 0) {
+ // That's it! I give up!
+ if (getcwd(buffer, MAXPATHLEN) == NULL)
+ return;
+ } else
+ strncpy(buffer, _gameDataPath.c_str(), MAXPATHLEN);
+
+ for (i = 0; i < MAXPATHLEN - 1; i++) {
+ if (buffer[i] == '\\')
+ break;
+ }
+
+ buffer[i + 1] = 0;
+
+ if (GetDriveType(buffer) == DRIVE_CDROM) {
+ GUI::MessageDialog dialog(
+ "You appear to be playing this game directly\n"
+ "from the CD. This is known to cause problems,\n"
+ "and it's therefore recommended that you copy\n"
+ "the data files to your hard disk instead.\n"
+ "See the README file for details.", "OK");
+ dialog.runModal();
+ }
+#endif
+}
+
+bool Engine::shouldPerformAutoSave(int lastSaveTime) {
+ const int diff = _system->getMillis() - lastSaveTime;
+ return _autosavePeriod != 0 && diff > _autosavePeriod * 1000;
+}
+
+void Engine::errorString(const char *buf1, char *buf2) {
+ strcpy(buf2, buf1);
+}
+
+void NORETURN CDECL error(const char *s, ...) {
+ char buf_input[STRINGBUFLEN];
+ char buf_output[STRINGBUFLEN];
+ va_list va;
+
+ // Generate the full error message
+ va_start(va, s);
+ vsnprintf(buf_input, STRINGBUFLEN, s, va);
+ va_end(va);
+
+
+ // Next, give the active engine (if any) a chance to augment the
+ // error message
+ if (g_engine) {
+ g_engine->errorString(buf_input, buf_output);
+ } else {
+ strcpy(buf_output, buf_input);
+ }
+
+
+ // Print the error message to stderr
+#ifdef __GP32__
+ printf("ERROR: %s\n", buf_output);
+#elif !defined(_WIN32_WCE)
+ fprintf(stderr, "%s!\n", buf_output);
+#endif
+
+
+#ifndef __GP32__
+ // Unless this error -originated- within the debugger itself, we
+ // now invoke the debugger, if available / supported.
+ if (g_engine) {
+ GUI::Debugger *debugger = g_engine->getDebugger();
+#ifdef _WIN32_WCE
+ if (isSmartphone())
+ debugger = 0;
+#endif
+ if (debugger && !debugger->isAttached()) {
+ debugger->attach(buf_output);
+ debugger->onFrame();
+ }
+ }
+#endif
+
+
+#if defined( USE_WINDBG )
+#if defined( _WIN32_WCE )
+ TCHAR buf_output_unicode[1024];
+ MultiByteToWideChar(CP_ACP, 0, buf_output, strlen(buf_output) + 1, buf_output_unicode, sizeof(buf_output_unicode));
+ OutputDebugString(buf_output_unicode);
+#else
+ OutputDebugString(buf_output);
+#endif
+#endif
+
+#if defined ( _WIN32_WCE )
+ drawError(buf_output);
+#endif
+
+#ifdef PALMOS_MODE
+ PalmFatalError(buf_output);
+#endif
+
+#ifdef __SYMBIAN32__
+ Symbian::FatalError(buf_output);
+#endif
+ // Finally exit. quit() will terminate the program if g_system is present
+ if (g_system)
+ g_system->quit();
+
+ exit(1);
+}
+
+void CDECL warning(const char *s, ...) {
+ char buf[STRINGBUFLEN];
+ va_list va;
+
+ va_start(va, s);
+ vsnprintf(buf, STRINGBUFLEN, s, va);
+ va_end(va);
+
+#ifdef __GP32__ //ph0x FIXME: implement fprint?
+ printf("WARNING: %s\n", buf);
+#else
+#if !defined (_WIN32_WCE) && !defined (__SYMBIAN32__)
+ fprintf(stderr, "WARNING: %s!\n", buf);
+#endif
+#endif
+#if defined( USE_WINDBG )
+ strcat(buf, "\n");
+#if defined( _WIN32_WCE )
+ TCHAR buf_unicode[1024];
+ MultiByteToWideChar(CP_ACP, 0, buf, strlen(buf) + 1, buf_unicode, sizeof(buf_unicode));
+ OutputDebugString(buf_unicode);
+#else
+ OutputDebugString(buf);
+#endif
+#endif
+}
+
+void checkHeap() {
+#if defined(WIN32) && !defined(__SYMBIAN32__)
+ if (_heapchk() != _HEAPOK) {
+ error("Heap is invalid!");
+ }
+#endif
+}
+
+void Engine::GUIErrorMessage(const Common::String msg) {
+ _system->setWindowCaption("Error");
+ _system->beginGFXTransaction();
+ initCommonGFX(false);
+ _system->initSize(320, 200);
+ _system->endGFXTransaction();
+
+ GUI::MessageDialog dialog(msg);
+ dialog.runModal();
+}
Copied: scummvm/trunk/engines/engine.h (from rev 23929, scummvm/trunk/base/engine.h)
===================================================================
--- scummvm/trunk/engines/engine.h (rev 0)
+++ scummvm/trunk/engines/engine.h 2006-09-23 00:42:35 UTC (rev 23974)
@@ -0,0 +1,96 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2002-2006 The ScummVM project
+ *
+ * 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 2
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ */
+
+#ifndef BASE_ENGINE_H
+#define BASE_ENGINE_H
+
+#include "common/stdafx.h"
+#include "common/scummsys.h"
+#include "common/str.h"
+
+class OSystem;
+namespace Audio {
+ class Mixer;
+}
+namespace Common {
+ class SaveFileManager;
+ class TimerManager;
+}
+namespace GUI {
+ class Debugger;
+}
+
+class Engine {
+public:
+ OSystem *_system;
+ Audio::Mixer *_mixer;
+ Common::TimerManager * _timer;
+
+protected:
+ const Common::String _targetName; // target name for saves
+ const Common::String _gameDataPath;
+ Common::SaveFileManager *_saveFileMan;
+
+private:
+ int _autosavePeriod;
+
+public:
+ Engine(OSystem *syst);
+ virtual ~Engine();
+
+ /**
+ * Init the engine.
+ * @return 0 for success, else an error code.
+ */
+ virtual int init() = 0;
+
+ /**
+ * Start the main engine loop.
+ * The return value is not yet used, but could indicate whether the user
+ * wants to return to the launch or to fully quit ScummVM.
+ * @return a result code
+ */
+ virtual int go() = 0;
+
+ /** Specific for each engine: prepare error string. */
+ virtual void errorString(const char *buf_input, char *buf_output);
+
+ void initCommonGFX(bool defaultTo1XScaler);
+
+ /** On some systems, check if the game appears to be run from CD. */
+ void checkCD();
+
+ /* Indicate if an autosave should be performed. */
+ bool shouldPerformAutoSave(int lastSaveTime);
+
+ /** Initialized graphics and shows error message. */
+ void GUIErrorMessage(const Common::String msg);
+
+ /**
+ * Return the engine's debugger instance, if any. Used by error() to
+ * invoke the debugger when a severe error is reported.
+ */
+ virtual GUI::Debugger *getDebugger() { return 0; }
+};
+
+extern Engine *g_engine;
+
+#endif
Copied: scummvm/trunk/engines/engines.mk (from rev 23929, scummvm/trunk/engines/module.mk)
===================================================================
--- scummvm/trunk/engines/engines.mk (rev 0)
+++ scummvm/trunk/engines/engines.mk 2006-09-23 00:42:35 UTC (rev 23974)
@@ -0,0 +1,81 @@
+ifdef DISABLE_SCUMM
+DEFINES += -DDISABLE_SCUMM
+else
+MODULES += engines/scumm
+
+ifdef DISABLE_SCUMM_7_8
+DEFINES += -DDISABLE_SCUMM_7_8
+endif
+
+ifdef DISABLE_HE
+DEFINES += -DDISABLE_HE
+endif
+
+endif
+
+ifdef DISABLE_SIMON
+DEFINES += -DDISABLE_SIMON
+else
+MODULES += engines/simon
+endif
+
+ifdef DISABLE_SKY
+DEFINES += -DDISABLE_SKY
+else
+MODULES += engines/sky
+endif
+
+ifdef DISABLE_SWORD1
+DEFINES += -DDISABLE_SWORD1
+else
+MODULES += engines/sword1
+endif
+
+ifdef DISABLE_SWORD2
+DEFINES += -DDISABLE_SWORD2
+else
+MODULES += engines/sword2
+endif
+
+ifdef DISABLE_QUEEN
+DEFINES += -DDISABLE_QUEEN
+else
+MODULES += engines/queen
+endif
+
+ifdef DISABLE_SAGA
+DEFINES += -DDISABLE_SAGA
+else
+MODULES += engines/saga
+endif
+
+ifdef DISABLE_KYRA
+DEFINES += -DDISABLE_KYRA
+else
+MODULES += engines/kyra
+endif
+
+ifdef DISABLE_GOB
+DEFINES += -DDISABLE_GOB
+else
+MODULES += engines/gob
+endif
+
+ifdef DISABLE_LURE
+DEFINES += -DDISABLE_LURE
+else
+MODULES += engines/lure
+endif
+
+ifdef DISABLE_CINE
+DEFINES += -DDISABLE_CINE
+else
+MODULES += engines/cine
+endif
+
+ifdef DISABLE_AGI
+DEFINES += -DDISABLE_AGI
+else
+MODULES += engines/agi
+endif
+
Modified: scummvm/trunk/engines/gob/gob.h
===================================================================
--- scummvm/trunk/engines/gob/gob.h 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/gob/gob.h 2006-09-23 00:42:35 UTC (rev 23974)
@@ -26,7 +26,7 @@
#include "common/stdafx.h"
#include "common/system.h"
-#include "base/engine.h"
+#include "engines/engine.h"
namespace Gob {
Modified: scummvm/trunk/engines/kyra/kyra.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra.h 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/kyra/kyra.h 2006-09-23 00:42:35 UTC (rev 23974)
@@ -23,7 +23,7 @@
#ifndef KYRA_H
#define KYRA_H
-#include "base/engine.h"
+#include "engines/engine.h"
#include "common/rect.h"
namespace Kyra {
Modified: scummvm/trunk/engines/kyra/seqplayer.cpp
===================================================================
--- scummvm/trunk/engines/kyra/seqplayer.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/kyra/seqplayer.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -23,7 +23,7 @@
#include "common/stdafx.h"
#include "common/system.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "kyra/kyra.h"
#include "kyra/resource.h"
Modified: scummvm/trunk/engines/lure/game.h
===================================================================
--- scummvm/trunk/engines/lure/game.h 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/lure/game.h 2006-09-23 00:42:35 UTC (rev 23974)
@@ -24,7 +24,7 @@
#define LURE_GAME_H
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "lure/luredefs.h"
#include "lure/menu.h"
#include "lure/palette.h"
Modified: scummvm/trunk/engines/lure/lure.h
===================================================================
--- scummvm/trunk/engines/lure/lure.h 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/lure/lure.h 2006-09-23 00:42:35 UTC (rev 23974)
@@ -23,7 +23,7 @@
#ifndef LURE_H
#define LURE_H
-#include "base/engine.h"
+#include "engines/engine.h"
#include "common/rect.h"
#include "sound/mixer.h"
#include "common/file.h"
Modified: scummvm/trunk/engines/lure/screen.h
===================================================================
--- scummvm/trunk/engines/lure/screen.h 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/lure/screen.h 2006-09-23 00:42:35 UTC (rev 23974)
@@ -24,7 +24,7 @@
#define LURE_SCREEN_H
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "lure/luredefs.h"
#include "lure/palette.h"
#include "lure/disk.h"
Deleted: scummvm/trunk/engines/module.mk
===================================================================
--- scummvm/trunk/engines/module.mk 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/module.mk 2006-09-23 00:42:35 UTC (rev 23974)
@@ -1,81 +0,0 @@
-ifdef DISABLE_SCUMM
-DEFINES += -DDISABLE_SCUMM
-else
-MODULES += engines/scumm
-
-ifdef DISABLE_SCUMM_7_8
-DEFINES += -DDISABLE_SCUMM_7_8
-endif
-
-ifdef DISABLE_HE
-DEFINES += -DDISABLE_HE
-endif
-
-endif
-
-ifdef DISABLE_SIMON
-DEFINES += -DDISABLE_SIMON
-else
-MODULES += engines/simon
-endif
-
-ifdef DISABLE_SKY
-DEFINES += -DDISABLE_SKY
-else
-MODULES += engines/sky
-endif
-
-ifdef DISABLE_SWORD1
-DEFINES += -DDISABLE_SWORD1
-else
-MODULES += engines/sword1
-endif
-
-ifdef DISABLE_SWORD2
-DEFINES += -DDISABLE_SWORD2
-else
-MODULES += engines/sword2
-endif
-
-ifdef DISABLE_QUEEN
-DEFINES += -DDISABLE_QUEEN
-else
-MODULES += engines/queen
-endif
-
-ifdef DISABLE_SAGA
-DEFINES += -DDISABLE_SAGA
-else
-MODULES += engines/saga
-endif
-
-ifdef DISABLE_KYRA
-DEFINES += -DDISABLE_KYRA
-else
-MODULES += engines/kyra
-endif
-
-ifdef DISABLE_GOB
-DEFINES += -DDISABLE_GOB
-else
-MODULES += engines/gob
-endif
-
-ifdef DISABLE_LURE
-DEFINES += -DDISABLE_LURE
-else
-MODULES += engines/lure
-endif
-
-ifdef DISABLE_CINE
-DEFINES += -DDISABLE_CINE
-else
-MODULES += engines/cine
-endif
-
-ifdef DISABLE_AGI
-DEFINES += -DDISABLE_AGI
-else
-MODULES += engines/agi
-endif
-
Added: scummvm/trunk/engines/module.mk
===================================================================
--- scummvm/trunk/engines/module.mk (rev 0)
+++ scummvm/trunk/engines/module.mk 2006-09-23 00:42:35 UTC (rev 23974)
@@ -0,0 +1,7 @@
+MODULE := engines
+
+MODULE_OBJS := \
+ engine.o
+
+# Include common rules
+include $(srcdir)/rules.mk
Property changes on: scummvm/trunk/engines/module.mk
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: scummvm/trunk/engines/queen/queen.h
===================================================================
--- scummvm/trunk/engines/queen/queen.h 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/queen/queen.h 2006-09-23 00:42:35 UTC (rev 23974)
@@ -23,7 +23,7 @@
#ifndef QUEEN_H
#define QUEEN_H
-#include "base/engine.h"
+#include "engines/engine.h"
namespace Common {
class InSaveFile;
Modified: scummvm/trunk/engines/saga/saga.h
===================================================================
--- scummvm/trunk/engines/saga/saga.h 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/saga/saga.h 2006-09-23 00:42:35 UTC (rev 23974)
@@ -25,7 +25,7 @@
#ifndef SAGA_H
#define SAGA_H
-#include "base/engine.h"
+#include "engines/engine.h"
#include "common/stream.h"
Modified: scummvm/trunk/engines/scumm/imuse/imuse_player.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse/imuse_player.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/scumm/imuse/imuse_player.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -23,7 +23,7 @@
#include "common/stdafx.h"
#include "common/util.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "scumm/imuse/imuse_internal.h"
#include "scumm/saveload.h"
Modified: scummvm/trunk/engines/scumm/insane/insane.cpp
===================================================================
--- scummvm/trunk/engines/scumm/insane/insane.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/scumm/insane/insane.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -23,7 +23,7 @@
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "common/system.h"
Modified: scummvm/trunk/engines/scumm/insane/insane.h
===================================================================
--- scummvm/trunk/engines/scumm/insane/insane.h 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/scumm/insane/insane.h 2006-09-23 00:42:35 UTC (rev 23974)
@@ -23,7 +23,7 @@
#if !defined(INSANE_H) && !defined(DISABLE_SCUMM_7_8)
#define INSANE_H
-#include "base/engine.h"
+#include "engines/engine.h"
#include "scumm/intern.h"
#include "scumm/nut_renderer.h"
Modified: scummvm/trunk/engines/scumm/insane/insane_ben.cpp
===================================================================
--- scummvm/trunk/engines/scumm/insane/insane_ben.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/scumm/insane/insane_ben.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -23,7 +23,7 @@
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "scumm/insane/insane.h"
Modified: scummvm/trunk/engines/scumm/insane/insane_enemy.cpp
===================================================================
--- scummvm/trunk/engines/scumm/insane/insane_enemy.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/scumm/insane/insane_enemy.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -23,7 +23,7 @@
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "scumm/insane/insane.h"
Modified: scummvm/trunk/engines/scumm/insane/insane_iact.cpp
===================================================================
--- scummvm/trunk/engines/scumm/insane/insane_iact.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/scumm/insane/insane_iact.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -23,7 +23,7 @@
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "scumm/scumm.h"
Modified: scummvm/trunk/engines/scumm/insane/insane_scenes.cpp
===================================================================
--- scummvm/trunk/engines/scumm/insane/insane_scenes.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/scumm/insane/insane_scenes.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -23,7 +23,7 @@
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "common/config-manager.h"
Modified: scummvm/trunk/engines/scumm/player_nes.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_nes.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/scumm/player_nes.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -23,7 +23,7 @@
*/
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "scumm/player_nes.h"
#include "scumm/scumm.h"
#include "sound/mixer.h"
Modified: scummvm/trunk/engines/scumm/player_v1.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_v1.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/scumm/player_v1.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -22,7 +22,7 @@
*/
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "scumm/player_v1.h"
#include "scumm/scumm.h"
Modified: scummvm/trunk/engines/scumm/player_v2.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_v2.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/scumm/player_v2.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -22,7 +22,7 @@
*/
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "scumm/player_v2.h"
#include "scumm/scumm.h"
#include "sound/mididrv.h"
Modified: scummvm/trunk/engines/scumm/player_v2a.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_v2a.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/scumm/player_v2a.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -22,7 +22,7 @@
*/
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "scumm/player_v2a.h"
#include "scumm/scumm.h"
Modified: scummvm/trunk/engines/scumm/player_v3a.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_v3a.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/scumm/player_v3a.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -22,7 +22,7 @@
*/
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "scumm/player_v3a.h"
#include "scumm/scumm.h"
Modified: scummvm/trunk/engines/scumm/script.h
===================================================================
--- scummvm/trunk/engines/scumm/script.h 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/scumm/script.h 2006-09-23 00:42:35 UTC (rev 23974)
@@ -24,7 +24,7 @@
#ifndef SCRIPT_H
#define SCRIPT_H
-#include "base/engine.h"
+#include "engines/engine.h"
namespace Scumm {
Modified: scummvm/trunk/engines/scumm/scumm.h
===================================================================
--- scummvm/trunk/engines/scumm/scumm.h 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/scumm/scumm.h 2006-09-23 00:42:35 UTC (rev 23974)
@@ -24,7 +24,7 @@
#ifndef SCUMM_H
#define SCUMM_H
-#include "base/engine.h"
+#include "engines/engine.h"
#include "common/endian.h"
#include "common/file.h"
#include "common/rect.h"
Modified: scummvm/trunk/engines/scumm/smush/smush_player.cpp
===================================================================
--- scummvm/trunk/engines/scumm/smush/smush_player.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/scumm/smush/smush_player.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -22,7 +22,7 @@
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "common/config-manager.h"
#include "common/file.h"
Modified: scummvm/trunk/engines/simon/simon.h
===================================================================
--- scummvm/trunk/engines/simon/simon.h 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/simon/simon.h 2006-09-23 00:42:35 UTC (rev 23974)
@@ -24,7 +24,7 @@
#ifndef SIMON_H
#define SIMON_H
-#include "base/engine.h"
+#include "engines/engine.h"
#include "common/rect.h"
#include "common/util.h"
Modified: scummvm/trunk/engines/sky/sky.h
===================================================================
--- scummvm/trunk/engines/sky/sky.h 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/sky/sky.h 2006-09-23 00:42:35 UTC (rev 23974)
@@ -24,7 +24,7 @@
#define SKYMAIN_H
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
namespace Sky {
Modified: scummvm/trunk/engines/sword1/resman.cpp
===================================================================
--- scummvm/trunk/engines/sword1/resman.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/sword1/resman.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -26,7 +26,7 @@
#include "common/util.h"
#include "common/str.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "sword1/memman.h"
#include "sword1/resman.h"
Modified: scummvm/trunk/engines/sword1/sword1.h
===================================================================
--- scummvm/trunk/engines/sword1/sword1.h 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/sword1/sword1.h 2006-09-23 00:42:35 UTC (rev 23974)
@@ -23,7 +23,7 @@
#ifndef BSSWORD1_H
#define BSSWORD1_H
-#include "base/engine.h"
+#include "engines/engine.h"
#include "common/util.h"
#include "sword1/sworddefs.h"
Modified: scummvm/trunk/engines/sword2/sword2.h
===================================================================
--- scummvm/trunk/engines/sword2/sword2.h 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/engines/sword2/sword2.h 2006-09-23 00:42:35 UTC (rev 23974)
@@ -29,7 +29,7 @@
#define RIGHT_CLICK_CLEARS_LUGGAGE 0
-#include "base/engine.h"
+#include "engines/engine.h"
#include "common/util.h"
Modified: scummvm/trunk/gui/PopUpWidget.cpp
===================================================================
--- scummvm/trunk/gui/PopUpWidget.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/gui/PopUpWidget.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -25,7 +25,7 @@
#include "gui/eval.h"
#include "gui/newgui.h"
#include "gui/PopUpWidget.h"
-#include "base/engine.h"
+#include "engines/engine.h"
namespace GUI {
Modified: scummvm/trunk/gui/about.cpp
===================================================================
--- scummvm/trunk/gui/about.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/gui/about.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -20,7 +20,7 @@
*/
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "base/plugins.h"
#include "base/version.h"
#include "common/system.h"
Modified: scummvm/trunk/gui/console.cpp
===================================================================
--- scummvm/trunk/gui/console.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/gui/console.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -24,7 +24,7 @@
#include "gui/ScrollBarWidget.h"
#include "gui/eval.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "base/version.h"
#include "common/system.h"
Modified: scummvm/trunk/gui/launcher.cpp
===================================================================
--- scummvm/trunk/gui/launcher.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/gui/launcher.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -21,7 +21,7 @@
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "base/game.h"
#include "base/plugins.h"
#include "base/version.h"
Modified: scummvm/trunk/sound/audiocd.cpp
===================================================================
--- scummvm/trunk/sound/audiocd.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/sound/audiocd.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -26,7 +26,7 @@
#include "sound/mp3.h"
#include "sound/vorbis.h"
#include "sound/flac.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "common/file.h"
#include "common/util.h"
#include "common/system.h"
Modified: scummvm/trunk/sound/mididrv.cpp
===================================================================
--- scummvm/trunk/sound/mididrv.cpp 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/sound/mididrv.cpp 2006-09-23 00:42:35 UTC (rev 23974)
@@ -23,7 +23,7 @@
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "common/config-manager.h"
#include "common/str.h"
#include "common/util.h"
Modified: scummvm/trunk/sound/rate.h
===================================================================
--- scummvm/trunk/sound/rate.h 2006-09-21 23:17:27 UTC (rev 23973)
+++ scummvm/trunk/sound/rate.h 2006-09-23 00:42:35 UTC (rev 23974)
@@ -24,7 +24,7 @@
#define SOUND_RATE_H
#include "common/scummsys.h"
-#include "base/engine.h"
+#include "engines/engine.h"
class AudioStream;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list