[Scummvm-cvs-logs] CVS: scummvm/base engine.cpp,NONE,1.1 engine.h,NONE,1.1 gameDetector.cpp,1.2,1.3 main.cpp,1.1,1.2 module.mk,1.1,1.2 plugins.cpp,1.2,1.3
Max Horn
fingolfin at users.sourceforge.net
Wed Sep 17 19:08:12 CEST 2003
Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1:/tmp/cvs-serv7244/base
Modified Files:
gameDetector.cpp main.cpp module.mk plugins.cpp
Added Files:
engine.cpp engine.h
Log Message:
moved engine.* to base; this fixes some linking issues when building a barebone ScummVM (or maybe I just want to increase our CVS stats? <g>)
--- NEW FILE: engine.cpp ---
/* ScummVM - Scumm Interpreter
* Copyright (C) 2002-2003 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Header: /cvsroot/scummvm/scummvm/base/engine.cpp,v 1.1 2003/09/18 02:07:16 fingolfin Exp $
*/
#include "stdafx.h"
#if defined(_MSC_VER)
#include <malloc.h>
#endif
#include "base/engine.h"
#include "base/gameDetector.h"
#include "common/config-file.h"
#include "common/timer.h"
#include "sound/mixer.h"
/* FIXME - BIG HACK for MidiEmu */
OSystem *g_system = 0;
Engine *g_engine = 0;
Engine::Engine(GameDetector *detector, OSystem *syst)
: _system(syst) {
g_engine = this;
_mixer = detector->createMixer();
_gameDataPath = detector->_gameDataPath;
g_system = _system; // FIXME - BIG HACK for MidiEmu
_timer = new Timer(_system);
}
Engine::~Engine() {
delete _mixer;
delete _timer;
}
const char *Engine::getSavePath() const {
const char *dir = NULL;
#ifdef _WIN32_WCE
dir = _gameDataPath;
#elif defined(__PALM_OS__)
dir = SCUMMVM_SAVEPATH;
#else
#if !defined(MACOS_CARBON)
dir = getenv("SCUMMVM_SAVEPATH");
#endif
// If SCUMMVM_SAVEPATH was not specified, try to use game specific savepath from config
if (!dir || dir[0] == 0)
dir = g_config->get("savepath");
// If SCUMMVM_SAVEPATH was not specified, try to use general path from config
if (!dir || dir[0] == 0)
dir = g_config->get("savepath", "scummvm");
// If no save path was specified, use no directory prefix
if (dir == NULL)
dir = "";
#endif
return dir;
}
void NORETURN CDECL error(const char *s, ...) {
#ifdef __PALM_OS__
char buf_input[256]; // 1024 is too big overflow the stack
char buf_output[256];
#else
char buf_input[1024];
char buf_output[1024];
#endif
va_list va;
va_start(va, s);
vsprintf(buf_input, s, va);
va_end(va);
if (g_engine) {
g_engine->errorString(buf_input, buf_output);
} else {
strcpy(buf_output, buf_input);
}
#ifdef __GP32__ //ph0x FIXME?
printf("ERROR: %s\n", buf_output);
#else
fprintf(stderr, "%s!\n", buf_output);
#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 __PALM_OS__
PalmFatalError(buf_output);
#endif
// Finally exit. quit() will terminate the program if g_system iss present
if (g_system)
g_system->quit();
exit(1);
}
void CDECL warning(const char *s, ...) {
#ifdef __PALM_OS__
char buf[256]; // 1024 is too big overflow the stack
#else
char buf[1024];
#endif
va_list va;
va_start(va, s);
vsprintf(buf, s, va);
va_end(va);
#ifdef __GP32__ //ph0x FIXME: implement fprint?
printf("WARNING: %s\n", buf);
#else
fprintf(stderr, "WARNING: %s!\n", buf);
#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
}
uint16 _debugLevel = 0;
void CDECL debug(int level, const char *s, ...) {
#ifdef __PALM_OS__
char buf[256]; // 1024 is too big overflow the stack
#else
char buf[1024];
#endif
va_list va;
if (level > _debugLevel)
return;
va_start(va, s);
vsprintf(buf, s, va);
va_end(va);
printf("%s\n", buf);
#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
fflush(stdout);
}
void checkHeap() {
#if defined(_MSC_VER)
if (_heapchk() != _HEAPOK) {
error("Heap is invalid!");
}
#endif
}
--- NEW FILE: engine.h ---
/* ScummVM - Scumm Interpreter
* Copyright (C) 2002-2003 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Header: /cvsroot/scummvm/scummvm/base/engine.h,v 1.1 2003/09/18 02:07:16 fingolfin Exp $
*/
#ifndef ENGINE_H
#define ENGINE_H
#include "common/scummsys.h"
#include "common/system.h"
extern const char *gScummVMVersion; // e.g. "0.4.1"
extern const char *gScummVMBuildDate; // e.g. "2003-06-24"
extern const char *gScummVMFullVersion; // e.g. "ScummVM 0.4.1 (2003-06-24)"
// TODO: Get rid of these enums. Ideally, GIDs should be
// 100% local to the module they are defined in. Right now
// we can't make this change since some of the backends
// and also gui/launcher.cpp contain tests on the GID.
// Ideally, all those should be converted to something else.
enum GameId {
GID_SCUMM_FIRST = 1,
GID_SCUMM_LAST = GID_SCUMM_FIRST + 99,
// Simon the Sorcerer
GID_SIMON_FIRST,
GID_SIMON_LAST = GID_SIMON_FIRST + 49,
// Beneath a Steel Sky
GID_SKY_FIRST,
GID_SKY_LAST = GID_SKY_FIRST + 49,
// Broken Sword 2
GID_SWORD2_FIRST,
GID_SWORD2_LAST = GID_SWORD2_FIRST + 49
};
class SoundMixer;
class GameDetector;
class Timer;
struct TargetSettings;
/* FIXME - BIG HACK for MidiEmu */
extern OSystem *g_system;
class Engine {
public:
OSystem *_system;
SoundMixer *_mixer;
Timer * _timer;
protected:
char *_gameDataPath;
public:
Engine(GameDetector *detector, OSystem *syst);
virtual ~Engine();
// Invoke the main engine loop using this method
virtual void go() = 0;
// Get the save game dir path
const char *getSavePath() const;
// Specific for each engine preparare of erroe string
virtual void errorString(const char *buf_input, char *buf_output) = 0;
};
extern Engine *g_engine;
#endif
Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gameDetector.cpp 17 Sep 2003 23:05:07 -0000 1.2
+++ gameDetector.cpp 18 Sep 2003 02:07:16 -0000 1.3
@@ -25,7 +25,7 @@
#include "base/gameDetector.h"
#include "base/plugins.h"
#include "common/config-file.h"
-#include "common/engine.h"
+#include "base/engine.h"
#include "common/scaler.h" // Only for gfx_modes
#include "sound/mididrv.h"
#include "sound/mixer.h"
Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/main.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- main.cpp 17 Sep 2003 22:40:55 -0000 1.1
+++ main.cpp 18 Sep 2003 02:07:16 -0000 1.2
@@ -29,10 +29,10 @@
*/
#include "stdafx.h"
+#include "base/engine.h"
#include "base/gameDetector.h"
#include "base/plugins.h"
#include "common/config-file.h"
-#include "common/engine.h"
#include "common/scaler.h" // For GFX_NORMAL
#include "gui/newgui.h"
#include "gui/launcher.h"
Index: module.mk
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/module.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- module.mk 17 Sep 2003 22:40:55 -0000 1.1
+++ module.mk 18 Sep 2003 02:07:16 -0000 1.2
@@ -1,6 +1,7 @@
MODULE := base
MODULE_OBJS := \
+ base/engine.o \
base/gameDetector.o \
base/main.o \
base/plugins.o
Index: plugins.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/plugins.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- plugins.cpp 17 Sep 2003 23:05:07 -0000 1.2
+++ plugins.cpp 18 Sep 2003 02:07:16 -0000 1.3
@@ -22,7 +22,7 @@
#include "base/gameDetector.h"
#include "base/plugins.h"
-#include "common/engine.h"
+#include "base/engine.h"
// Factory functions => no need to include the specific classes
More information about the Scummvm-git-logs
mailing list