diff options
author | Eugene Sandulenko | 2005-07-30 21:11:48 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2005-07-30 21:11:48 +0000 |
commit | 6b4484472b79dc7ea7d1ce545a28fba7d3b7696f (patch) | |
tree | c44c4e61f18ddd537f7082cb48869cf33d422fbd /base | |
parent | 86ab70b149e5cd00cf54f2e41896e2c4e16795e4 (diff) | |
download | scummvm-rg350-6b4484472b79dc7ea7d1ce545a28fba7d3b7696f.tar.gz scummvm-rg350-6b4484472b79dc7ea7d1ce545a28fba7d3b7696f.tar.bz2 scummvm-rg350-6b4484472b79dc7ea7d1ce545a28fba7d3b7696f.zip |
Remove trailing whitespaces.
svn-id: r18604
Diffstat (limited to 'base')
-rw-r--r-- | base/engine.cpp | 8 | ||||
-rw-r--r-- | base/engine.h | 4 | ||||
-rw-r--r-- | base/gameDetector.cpp | 16 | ||||
-rw-r--r-- | base/gameDetector.h | 2 | ||||
-rw-r--r-- | base/main.cpp | 54 | ||||
-rw-r--r-- | base/plugins.cpp | 8 | ||||
-rw-r--r-- | base/plugins.h | 8 |
7 files changed, 50 insertions, 50 deletions
diff --git a/base/engine.cpp b/base/engine.cpp index 9560f48b41..d84728a2e0 100644 --- a/base/engine.cpp +++ b/base/engine.cpp @@ -75,18 +75,18 @@ void Engine::initCommonGFX(GameDetector &detector) { _system->setGraphicsMode(ConfMan.get("gfx_mode").c_str()); } } - + // (De)activate aspect-ratio correction as determined by the config settings if (ConfMan.hasKey("aspect_ratio", detector._targetName)) _system->setFeatureState(OSystem::kFeatureAspectRatioCorrection, ConfMan.getBool("aspect_ratio")); - - // (De)activate fullscreen mode as determined by the config settings + + // (De)activate fullscreen mode as determined by the config settings if (ConfMan.hasKey("fullscreen", detector._targetName)) _system->setFeatureState(OSystem::kFeatureFullscreenMode, ConfMan.getBool("fullscreen")); } void Engine::checkCD() { -#if defined (WIN32) && !defined(_WIN32_WCE) +#if defined (WIN32) && !defined(_WIN32_WCE) // 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. diff --git a/base/engine.h b/base/engine.h index 9cdcfe4914..c1b2101374 100644 --- a/base/engine.h +++ b/base/engine.h @@ -47,7 +47,7 @@ protected: public: Engine(OSystem *syst); virtual ~Engine(); - + /** * Init the engine. * @return 0 for success, else an error code. @@ -57,7 +57,7 @@ public: /** * 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. + * wants to return to the launch or to fully quit ScummVM. * @return a result code */ virtual int go() = 0; diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp index f01926ad90..57e99bad80 100644 --- a/base/gameDetector.cpp +++ b/base/gameDetector.cpp @@ -51,7 +51,7 @@ #if defined(__PALM_OS__) || defined(__SYMBIAN32__) static const char USAGE_STRING[] = "NoUsageString"; // save more data segment space #else -static const char USAGE_STRING[] = +static const char USAGE_STRING[] = "ScummVM - Graphical Adventure Game Interpreter\n" "Usage: scummvm [OPTIONS]... [GAME]\n" " -v, --version Display ScummVM version information and exit\n" @@ -170,12 +170,12 @@ GameDetector::GameDetector() { ConfMan.registerDefault("alsa_port", "65:0"); #endif -#ifdef DEFAULT_SAVE_PATH +#ifdef DEFAULT_SAVE_PATH char savePath[MAXPATHLEN]; #ifdef UNIX struct stat sb; if (getenv("HOME") != NULL) { - snprintf(savePath, MAXPATHLEN, "%s/%s", getenv("HOME"), DEFAULT_SAVE_PATH); + snprintf(savePath, MAXPATHLEN, "%s/%s", getenv("HOME"), DEFAULT_SAVE_PATH); if (stat(savePath, &sb) == -1) { /* create the dir if it does not exist */ if (errno == ENOENT) { @@ -323,7 +323,7 @@ void GameDetector::parseCommandLine(int argc, char **argv) { char *current_option = NULL; char shortCmdLower; bool isLongCmd, boolValue; - + // We store all command line settings in a string map, instead of // immediately putting it into the config manager. We do that to // make a potential future change to the config manager easier: In @@ -336,7 +336,7 @@ void GameDetector::parseCommandLine(int argc, char **argv) { Common::StringMap settings; - // The user can override the savepath with the SCUMMVM_SAVEPATH + // The user can override the savepath with the SCUMMVM_SAVEPATH // environment variable. This is weaker than a --savepath on the // command line, but overrides the default savepath, hence it is // handled here, just before the command line gets parsed. @@ -379,12 +379,12 @@ void GameDetector::parseCommandLine(int argc, char **argv) { DO_OPTION_INT('b', "boot-param") settings["boot_param"] = option; END_OPTION - + DO_OPTION_OPT('d', "debuglevel") gDebugLevel = option ? (int)strtol(option, 0, 10) : 0; printf("Debuglevel (from command line): %d\n", gDebugLevel); END_OPTION - + DO_OPTION('e', "music-driver") // TODO: Instead of just showing the generic help text, // maybe print a message like: @@ -536,7 +536,7 @@ void GameDetector::parseCommandLine(int argc, char **argv) { #ifndef DISABLE_SCUMM DO_LONG_OPTION("tempo") - // Use the special value '0' for the base in (int)strtol. + // Use the special value '0' for the base in (int)strtol. // Doing that makes it possible to enter hex values // as "0x1234", but also decimal values ("123"). int value = (int)strtol(option, 0, 0); diff --git a/base/gameDetector.h b/base/gameDetector.h index 90eb57675e..3d39385fc7 100644 --- a/base/gameDetector.h +++ b/base/gameDetector.h @@ -58,7 +58,7 @@ public: String _targetName; GameSettings _game; // TODO: Eventually get rid of this?! const Plugin *_plugin; - + bool _dumpScripts; bool _force1xOverlay; diff --git a/base/main.cpp b/base/main.cpp index 30b7e6e49f..edf970fe02 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -27,7 +27,7 @@ * Currently not much is actually properly documented, but at least you can get an overview * of almost all the classes, methods and variables, and how they interact. */ - + #include "common/stdafx.h" #include "base/engine.h" #include "base/gameDetector.h" @@ -43,7 +43,7 @@ #include "sound/mididrv.h" #ifdef _WIN32_WCE -#include "backends/wince/CELauncherDialog.h" +#include "backends/wince/CELauncherDialog.h" #endif #ifdef __DC__ @@ -146,7 +146,7 @@ const char* stackCookie = "$STACK: 655360\0"; extern "C" int main(int argc, char *argv[]); #endif -#if defined(MACOSX) || defined(QTOPIA) || defined(__SYMBIAN32__) +#if defined(MACOSX) || defined(QTOPIA) || defined(__SYMBIAN32__) #include <SDL.h> #elif !defined(__MORPHOS__) && !defined(__DC__) && !defined(__GP32__) #undef main @@ -218,22 +218,22 @@ static void setupDummyPalette(OSystem &system) { // 1) allow for 16 bit mouse cursors in overlay mode // 2) no need to backup & restore the mouse cursor before/after the overlay is shown const byte dummy_palette[] = { - 0, 0, 0, 0, - 0, 0, 171, 0, - 0, 171, 0, 0, - 0, 171, 171, 0, - 171, 0, 0, 0, - 171, 0, 171, 0, - 171, 87, 0, 0, - 171, 171, 171, 0, - 87, 87, 87, 0, - 87, 87, 255, 0, - 87, 255, 87, 0, - 87, 255, 255, 0, - 255, 87, 87, 0, - 255, 87, 255, 0, - 255, 255, 87, 0, - 255, 255, 255, 0, + 0, 0, 0, 0, + 0, 0, 171, 0, + 0, 171, 0, 0, + 0, 171, 171, 0, + 171, 0, 0, 0, + 171, 0, 171, 0, + 171, 87, 0, 0, + 171, 171, 171, 0, + 87, 87, 87, 0, + 87, 87, 255, 0, + 87, 255, 87, 0, + 87, 255, 255, 0, + 255, 87, 87, 0, + 255, 87, 255, 0, + 255, 255, 87, 0, + 255, 255, 255, 0, }; system.setPalette(dummy_palette, 0, 16); @@ -244,12 +244,12 @@ static bool launcherDialog(GameDetector &detector, OSystem &system) { system.beginGFXTransaction(); // Set the user specified graphics mode (if any). system.setGraphicsMode(ConfMan.get("gfx_mode").c_str()); - + // Make GUI 640 x 400 system.initSize(320, 200, (detector._force1xOverlay ? 1 : 2)); system.endGFXTransaction(); - + // Clear the main screen system.clearScreen(); @@ -283,12 +283,12 @@ static int runGame(GameDetector &detector, OSystem &system) { if (caption.isEmpty() && detector._game.description) caption = detector._game.description; - if (caption.isEmpty()) + if (caption.isEmpty()) caption = detector._targetName; if (!caption.isEmpty()) { system.setWindowCaption(caption.c_str()); } - + // Add extrapath (if any) to the directory search list if (ConfMan.hasKey("extrapath")) Common::File::addDefaultDirectory(ConfMan.get("extrapath")); @@ -311,7 +311,7 @@ static int runGame(GameDetector &detector, OSystem &system) { // Stop all sound processing now (this prevents some race conditions later on) system.clearSoundCallback(); - + return result; } @@ -412,7 +412,7 @@ extern "C" int main(int argc, char *argv[]) { GUI::Actions::init(detector); #endif - // Ensure the system object exists (it may have already been created + // Ensure the system object exists (it may have already been created // at an earlier point, though!) OSystem &system = OSystem::instance(); @@ -470,7 +470,7 @@ extern "C" int main(int argc, char *argv[]) { // ...and quit (the return 0 should never be reached) delete Common::g_timer; system.quit(); - + error("If you are seeing this, your OSystem backend is not working properly"); return 0; @@ -513,7 +513,7 @@ void CDECL debug(int level, const char *s, ...) { vsnprintf(buf, STRINGBUFLEN, s, va); #endif va_end(va); - + debugHelper(buf); } diff --git a/base/plugins.cpp b/base/plugins.cpp index 6fc6accceb..71f7c1edd2 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -256,7 +256,7 @@ PluginManager::~PluginManager() { void PluginManager::loadPlugins() { #ifdef DYNAMIC_MODULES // Load dynamic plugins - // TODO... this is right now just a nasty hack. + // TODO... this is right now just a nasty hack. // This should search one or multiple directories for all plugins it can // find (to this end, we maybe should use a special prefix/suffix; e.g. // instead of libscumm.so, use scumm.engine or scumm.plugin etc.). @@ -274,7 +274,7 @@ void PluginManager::loadPlugins() { // Scan for all plugins in this directory FilesystemNode dir(PLUGIN_DIRECTORY); FSList files(dir.listDir(FilesystemNode::kListFilesOnly)); - + for (FSList::const_iterator i = files.begin(); i != files.end(); ++i) { Common::String name(i->displayName()); if (name.hasPrefix(PLUGIN_PREFIX) && name.hasSuffix(PLUGIN_SUFFIX)) { @@ -291,7 +291,7 @@ void PluginManager::loadPlugins() { // "Loader" for the static plugins. // Iterate over all registered (static) plugins and load them. PluginRegistrator *plugin; - + #ifndef DISABLE_SCUMM LINK_PLUGIN(SCUMM) #endif @@ -367,6 +367,6 @@ DetectedGameList PluginManager::detectGames(const FSList &fslist) const { for (iter = _plugins.begin(); iter != _plugins.end(); ++iter) { candidates.push_back((*iter)->detectGames(fslist)); } - + return candidates; } diff --git a/base/plugins.h b/base/plugins.h index 11eb4a3e3f..d2b0cca4d3 100644 --- a/base/plugins.h +++ b/base/plugins.h @@ -68,7 +68,7 @@ public: virtual const char *getName() const = 0; virtual int getVersion() const { return 0; } // TODO! - + virtual GameList getSupportedGames() const = 0; virtual GameSettings findGame(const char *gameName) const; virtual DetectedGameList detectGames(const FSList &fslist) const = 0; @@ -137,9 +137,9 @@ class PluginManager; class PluginManager : public Common::Singleton<PluginManager> { private: PluginList _plugins; - + bool tryLoadPlugin(Plugin *plugin); - + friend class Common::Singleton<SingletonBaseType>; PluginManager(); @@ -149,7 +149,7 @@ public: void loadPlugins(); void unloadPlugins(); void unloadPluginsExcept(const Plugin *plugin); - + const PluginList &getPlugins() { return _plugins; } DetectedGameList detectGames(const FSList &fslist) const; |