[Scummvm-cvs-logs] CVS: scummvm/base main.cpp,1.21,1.22
Torbj?rn Andersson
eriktorbjorn at users.sourceforge.net
Fri Nov 7 05:18:16 CET 2003
Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1:/tmp/cvs-serv25291
Modified Files:
main.cpp
Log Message:
Removed some unnecessary whitespace
Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/main.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- main.cpp 5 Nov 2003 12:26:39 -0000 1.21
+++ main.cpp 7 Nov 2003 13:17:37 -0000 1.22
@@ -204,23 +204,23 @@
/* Redirect standard input and standard output */
FILE *newfp = freopen(STDOUT_FILE, "w", stdout);
- if ( newfp == NULL ) { /* This happens on NT */
+ if (newfp == NULL) { /* This happens on NT */
#if !defined(stdout)
stdout = fopen(STDOUT_FILE, "w");
#else
newfp = fopen(STDOUT_FILE, "w");
- if ( newfp ) {
+ if (newfp) {
*stdout = *newfp;
}
#endif
}
newfp = freopen(STDERR_FILE, "w", stderr);
- if ( newfp == NULL ) { /* This happens on NT */
+ if (newfp == NULL) { /* This happens on NT */
#if !defined(stderr)
stderr = fopen(STDERR_FILE, "w");
#else
newfp = fopen(STDERR_FILE, "w");
- if ( newfp ) {
+ if (newfp) {
*stderr = *newfp;
}
#endif
@@ -238,7 +238,7 @@
// Parse the command line information
GameDetector detector;
- detector.parseCommandLine(argc, argv);
+ detector.parseCommandLine(argc, argv);
// Create the system object
OSystem *system = OSystem::instance();
@@ -259,11 +259,11 @@
// Set the window caption to the game name
prop.caption = ConfMan.get("description", detector._targetName).c_str();
- if (prop.caption == NULL)
+ if (prop.caption == NULL)
prop.caption = detector._game.description;
- if (prop.caption == NULL)
+ if (prop.caption == NULL)
prop.caption = detector._targetName.c_str();
- if (prop.caption != NULL)
+ if (prop.caption != NULL)
system->property(OSystem::PROP_SET_WINDOW_CAPTION, &prop);
// FIXME: It seem not logical that we first might set the gfx mode to
@@ -275,7 +275,7 @@
(detector._game.features & GF_DEFAULT_TO_1X_SCALER)) {
prop.gfx_mode = GFX_NORMAL;
system->property(OSystem::PROP_SET_GFX_MODE, &prop);
- } else
+ } else
// Override global scaler with any game-specific define
if (ConfMan.hasKey("gfx_mode")) {
prop.gfx_mode = detector.parseGraphicsMode(ConfMan.get("gfx_mode"));
More information about the Scummvm-git-logs
mailing list