thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix code formatting (esp. 'if(' -> 'if (' etc., but also indention and other things)

Browse source 
svn-id: r44495
This commit is contained in:
Max Horn 2009-09-30 16:16:53 +00:00
parent 25dde91c7c
commit 8ba75fc522
90 changed files with 694 additions and 709 deletions
Download patch file Download diff file Expand all files Collapse all files

19
backends/fs/amigaos4/amigaos4-fs.cpp
View file

@ -179,8 +179,7 @@ AmigaOSFilesystemNode::AmigaOSFilesystemNode(const Common::String &p) {
const char c = _sPath.lastChar(); const char c = _sPath.lastChar();
if (c != '/' && c != ':') if (c != '/' && c != ':')
_sPath += '/'; _sPath += '/';
} } else {
else {
//_bIsDirectory = false; //_bIsDirectory = false;
_bIsValid = true; _bIsValid = true;
} }
@ -231,15 +230,13 @@ AmigaOSFilesystemNode::AmigaOSFilesystemNode(BPTR pLock, const char *pDisplayNam
const char c = _sPath.lastChar(); const char c = _sPath.lastChar();
if (c != '/' && c != ':') if (c != '/' && c != ':')
_sPath += '/'; _sPath += '/';
} } else {
else {
//_bIsDirectory = false; //_bIsDirectory = false;
_bIsValid = true; _bIsValid = true;
} }
IDOS->FreeDosObject(DOS_EXAMINEDATA, pExd); IDOS->FreeDosObject(DOS_EXAMINEDATA, pExd);
} } else {
else {
debug(6, "ExamineObject() returned NULL"); debug(6, "ExamineObject() returned NULL");
} }
@ -369,18 +366,17 @@ bool AmigaOSFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b
} }
} }
} }
if (ERROR_NO_MORE_ENTRIES != IDOS->IoErr() ) { if (ERROR_NO_MORE_ENTRIES != IDOS->IoErr() ) {
debug(6, "An error occured during ExamineDir"); debug(6, "An error occured during ExamineDir");
ret = false; ret = false;
} } else {
else {
ret = true; ret = true;
} }
IDOS->ReleaseDirContext(context); IDOS->ReleaseDirContext(context);
} } else {
else {
debug(6, "Unable to ObtainDirContext"); debug(6, "Unable to ObtainDirContext");
ret = false; ret = false;
} }
@ -411,8 +407,7 @@ AbstractFSNode *AmigaOSFilesystemNode::getParent() const {
if (parentDir) { if (parentDir) {
node = new AmigaOSFilesystemNode(parentDir); node = new AmigaOSFilesystemNode(parentDir);
IDOS->UnLock(parentDir); IDOS->UnLock(parentDir);
} } else
else
node = new AmigaOSFilesystemNode(); node = new AmigaOSFilesystemNode();
LEAVE(); LEAVE();

4
backends/platform/linuxmoto/linuxmoto-graphics.cpp
View file

@ -192,7 +192,6 @@ void OSystem_LINUXMOTO::drawMouse() {
dst.h = _mouseCurState.vH; dst.h = _mouseCurState.vH;
hotX = _mouseCurState.vHotX; hotX = _mouseCurState.vHotX;
hotY = _mouseCurState.vHotY; hotY = _mouseCurState.vHotY;
} else { } else {
scale = 1; scale = 1;
width = _videoMode.overlayWidth; width = _videoMode.overlayWidth;
@ -201,7 +200,6 @@ void OSystem_LINUXMOTO::drawMouse() {
dst.h = _mouseCurState.rH; dst.h = _mouseCurState.rH;
hotX = _mouseCurState.rHotX; hotX = _mouseCurState.rHotX;
hotY = _mouseCurState.rHotY; hotY = _mouseCurState.rHotY;
} }
// The mouse is undrawn using virtual coordinates, i.e. they may be // The mouse is undrawn using virtual coordinates, i.e. they may be
@ -414,7 +412,6 @@ void OSystem_LINUXMOTO::internUpdateScreen() {
} }
if (_videoMode.mode == GFX_HALF && scalerProc == HalfScale) { if (_videoMode.mode == GFX_HALF && scalerProc == HalfScale) {
r->w = r->w / 2; r->w = r->w / 2;
r->h = dst_h / 2; r->h = dst_h / 2;
} else { } else {
@ -425,7 +422,6 @@ void OSystem_LINUXMOTO::internUpdateScreen() {
r->x = dst_x; r->x = dst_x;
r->y = dst_y; r->y = dst_y;
#ifndef DISABLE_SCALERS #ifndef DISABLE_SCALERS
if (_videoMode.aspectRatioCorrection && orig_dst_y < height && !_overlayVisible) if (_videoMode.aspectRatioCorrection && orig_dst_y < height && !_overlayVisible)
r->h = stretch200To240((uint8 *) _hwscreen->pixels, dstPitch, r->w, r->h, r->x, r->y, orig_dst_y * scale1); r->h = stretch200To240((uint8 *) _hwscreen->pixels, dstPitch, r->w, r->h, r->x, r->y, orig_dst_y * scale1);

1
backends/platform/psp/psp_main.cpp
View file

@ -23,7 +23,6 @@
* *
*/ */
#define USERSPACE_ONLY //don't use kernel mode features #define USERSPACE_ONLY //don't use kernel mode features
#ifndef USERSPACE_ONLY #ifndef USERSPACE_ONLY

2
engines/agos/string_pn.cpp
View file

@ -23,8 +23,6 @@
* *
*/ */
#include "agos/agos.h" #include "agos/agos.h"
#include "agos/intern.h" #include "agos/intern.h"

1
engines/sky/logic.cpp
View file

@ -23,7 +23,6 @@
* *
*/ */
#include "common/endian.h" #include "common/endian.h"
#include "common/rect.h" #include "common/rect.h"
#include "common/events.h" #include "common/events.h"

1
engines/sword1/logic.cpp
View file

@ -23,7 +23,6 @@
* *
*/ */
#include "common/endian.h" #include "common/endian.h"
#include "common/util.h" #include "common/util.h"
#include "common/system.h" #include "common/system.h"

1
engines/sword1/mouse.cpp
View file

@ -23,7 +23,6 @@
* *
*/ */
#include "common/system.h" #include "common/system.h"
#include "graphics/cursorman.h" #include "graphics/cursorman.h"