diff options
| author | Matthew Hoops | 2011-05-18 18:23:37 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-05-18 18:23:37 -0400 |
| commit | d4c92983920cfe3b25a22d91e12c750e591b917e (patch) | |
| tree | c0b63318b9ba0e67528337cfaa21515def1c3962 /base | |
| parent | 7e2edf16b3e2bf1d2b31999979a60802514df6cb (diff) | |
| parent | cf107e24be28c7e6db65b5c7ffed120af4a7994b (diff) | |
| download | scummvm-rg350-d4c92983920cfe3b25a22d91e12c750e591b917e.tar.gz scummvm-rg350-d4c92983920cfe3b25a22d91e12c750e591b917e.tar.bz2 scummvm-rg350-d4c92983920cfe3b25a22d91e12c750e591b917e.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'base')
| -rw-r--r-- | base/commandLine.cpp | 3 | ||||
| -rw-r--r-- | base/commandLine.h | 3 | ||||
| -rw-r--r-- | base/main.cpp | 6 | ||||
| -rw-r--r-- | base/main.h | 3 | ||||
| -rw-r--r-- | base/plugins.cpp | 4 | ||||
| -rw-r--r-- | base/plugins.h | 3 | ||||
| -rw-r--r-- | base/version.cpp | 3 | ||||
| -rw-r--r-- | base/version.h | 3 |
8 files changed, 3 insertions, 25 deletions
diff --git a/base/commandLine.cpp b/base/commandLine.cpp index 05e1d2c131..1ca4a642c8 100644 --- a/base/commandLine.cpp +++ b/base/commandLine.cpp @@ -18,9 +18,6 @@ * 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$ - * */ // FIXME: Avoid using printf diff --git a/base/commandLine.h b/base/commandLine.h index 6205c914e0..4e611d97bf 100644 --- a/base/commandLine.h +++ b/base/commandLine.h @@ -18,9 +18,6 @@ * 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 COMMON_COMMAND_LINE_H diff --git a/base/main.cpp b/base/main.cpp index fc4523b895..4ed70a5587 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -18,9 +18,6 @@ * 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$ - * */ /*! \mainpage %ScummVM Source Reference @@ -354,7 +351,8 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) { // TODO: deal with settings that require plugins to be loaded res = Base::processSettings(command, settings); if (res.getCode() != Common::kArgumentNotProcessed) { - warning("%s", res.getDesc().c_str()); + if (res.getCode() != Common::kNoError) + warning("%s", res.getDesc().c_str()); return res.getCode(); } diff --git a/base/main.h b/base/main.h index 93e73f55e6..3d75931454 100644 --- a/base/main.h +++ b/base/main.h @@ -18,9 +18,6 @@ * 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_MAIN_H diff --git a/base/plugins.cpp b/base/plugins.cpp index 36faa87cda..de135da946 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -18,9 +18,6 @@ * 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 "base/plugins.h" @@ -231,6 +228,7 @@ public: LINK_PLUGIN(AMIGA) LINK_PLUGIN(APPLEIIGS) LINK_PLUGIN(TOWNS) + LINK_PLUGIN(PC98) #if defined(USE_TIMIDITY) LINK_PLUGIN(TIMIDITY) #endif diff --git a/base/plugins.h b/base/plugins.h index d8f1cb96ee..247564171d 100644 --- a/base/plugins.h +++ b/base/plugins.h @@ -18,9 +18,6 @@ * 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_PLUGINS_H diff --git a/base/version.cpp b/base/version.cpp index 6967263f5c..6a670c1a40 100644 --- a/base/version.cpp +++ b/base/version.cpp @@ -18,9 +18,6 @@ * 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/scummsys.h" diff --git a/base/version.h b/base/version.h index 1ad6d48b8b..a5c25c03f4 100644 --- a/base/version.h +++ b/base/version.h @@ -17,9 +17,6 @@ * 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_VERSION_H |