[Scummvm-cvs-logs] SF.net SVN: scummvm:[44495] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Wed Sep 30 18:17:02 CEST 2009
Revision: 44495
http://scummvm.svn.sourceforge.net/scummvm/?rev=44495&view=rev
Author: fingolfin
Date: 2009-09-30 16:16:53 +0000 (Wed, 30 Sep 2009)
Log Message:
-----------
Fix code formatting (esp. 'if(' -> 'if (' etc., but also indention and other things)
Modified Paths:
--------------
scummvm/trunk/backends/fs/abstract-fs.cpp
scummvm/trunk/backends/fs/amigaos4/amigaos4-fs.cpp
scummvm/trunk/backends/fs/psp/psp-fs.cpp
scummvm/trunk/backends/fs/symbian/symbian-fs.cpp
scummvm/trunk/backends/fs/symbian/symbianstream.cpp
scummvm/trunk/backends/platform/PalmOS/Src/base_event.cpp
scummvm/trunk/backends/platform/PalmOS/Src/base_gfx.cpp
scummvm/trunk/backends/platform/gp2x/events.cpp
scummvm/trunk/backends/platform/gp2x/graphics.cpp
scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-events.cpp
scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-graphics.cpp
scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-hw.cpp
scummvm/trunk/backends/platform/iphone/iphone_video.m
scummvm/trunk/backends/platform/linuxmoto/linuxmoto-events.cpp
scummvm/trunk/backends/platform/linuxmoto/linuxmoto-graphics.cpp
scummvm/trunk/backends/platform/linuxmoto/linuxmoto-scaler.h
scummvm/trunk/backends/platform/ps2/savefilemgr.cpp
scummvm/trunk/backends/platform/psp/osys_psp.cpp
scummvm/trunk/backends/platform/psp/psp_main.cpp
scummvm/trunk/backends/platform/sdl/graphics.cpp
scummvm/trunk/backends/platform/symbian/src/ScummVMApp.cpp
scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
scummvm/trunk/backends/platform/wii/osystem_gfx.cpp
scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp
scummvm/trunk/backends/platform/wince/CEException.cpp
scummvm/trunk/backends/platform/wince/wince-sdl.cpp
scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp
scummvm/trunk/common/EventRecorder.cpp
scummvm/trunk/common/stream.cpp
scummvm/trunk/common/zlib.cpp
scummvm/trunk/engines/agi/preagi_common.cpp
scummvm/trunk/engines/agi/preagi_mickey.cpp
scummvm/trunk/engines/agi/preagi_troll.cpp
scummvm/trunk/engines/agi/preagi_winnie.cpp
scummvm/trunk/engines/agos/event.cpp
scummvm/trunk/engines/agos/string_pn.cpp
scummvm/trunk/engines/draci/game.cpp
scummvm/trunk/engines/draci/script.cpp
scummvm/trunk/engines/gob/draw_playtoons.cpp
scummvm/trunk/engines/gob/inter.h
scummvm/trunk/engines/gob/inter_v1.cpp
scummvm/trunk/engines/gob/sound/adlib.cpp
scummvm/trunk/engines/kyra/kyra_v1.cpp
scummvm/trunk/engines/kyra/scene_lol.cpp
scummvm/trunk/engines/kyra/sequences_lol.cpp
scummvm/trunk/engines/m4/converse.cpp
scummvm/trunk/engines/parallaction/parallaction.cpp
scummvm/trunk/engines/parallaction/parallaction_br.cpp
scummvm/trunk/engines/parallaction/parallaction_ns.cpp
scummvm/trunk/engines/saga/isomap.cpp
scummvm/trunk/engines/saga/saga.cpp
scummvm/trunk/engines/sci/engine/ksound.cpp
scummvm/trunk/engines/sci/engine/savegame.cpp
scummvm/trunk/engines/sci/engine/state.cpp
scummvm/trunk/engines/sci/engine/vm.cpp
scummvm/trunk/engines/sci/resource.cpp
scummvm/trunk/engines/sci/sfx/core.cpp
scummvm/trunk/engines/scumm/player_v2cms.cpp
scummvm/trunk/engines/sky/logic.cpp
scummvm/trunk/engines/sword1/control.cpp
scummvm/trunk/engines/sword1/logic.cpp
scummvm/trunk/engines/sword1/mouse.cpp
scummvm/trunk/engines/sword1/router.cpp
scummvm/trunk/engines/sword1/screen.cpp
scummvm/trunk/engines/sword1/text.cpp
scummvm/trunk/engines/sword2/maketext.cpp
scummvm/trunk/engines/sword2/palette.cpp
scummvm/trunk/engines/sword2/protocol.cpp
scummvm/trunk/engines/sword2/render.cpp
scummvm/trunk/engines/sword2/router.cpp
scummvm/trunk/engines/sword2/sprite.cpp
scummvm/trunk/engines/teenagent/callbacks.cpp
scummvm/trunk/engines/teenagent/inventory.cpp
scummvm/trunk/engines/teenagent/scene.cpp
scummvm/trunk/engines/teenagent/teenagent.cpp
scummvm/trunk/engines/tinsel/coroutine.h
scummvm/trunk/engines/tinsel/graphics.cpp
scummvm/trunk/graphics/VectorRenderer.cpp
scummvm/trunk/graphics/VectorRendererSpec.cpp
scummvm/trunk/graphics/video/coktelvideo/indeo3.cpp
scummvm/trunk/gui/ThemeParser.cpp
scummvm/trunk/gui/about.cpp
scummvm/trunk/sound/mods/infogrames.cpp
scummvm/trunk/sound/shorten.cpp
scummvm/trunk/sound/softsynth/mt32/synth.cpp
scummvm/trunk/sound/softsynth/mt32.cpp
scummvm/trunk/sound/softsynth/opl/mame.cpp
scummvm/trunk/sound/vag.cpp
scummvm/trunk/tools/create_lure/process_actions.cpp
scummvm/trunk/tools/qtable/qtable.cpp
Modified: scummvm/trunk/backends/fs/abstract-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/abstract-fs.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/fs/abstract-fs.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -26,7 +26,7 @@
const char *AbstractFSNode::lastPathComponent(const Common::String &str, const char sep) {
// TODO: Get rid of this eventually! Use Common::lastPathComponent instead
- if(str.empty())
+ if (str.empty())
return "";
const char *start = str.c_str();
Modified: scummvm/trunk/backends/fs/amigaos4/amigaos4-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/amigaos4/amigaos4-fs.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/fs/amigaos4/amigaos4-fs.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -179,8 +179,7 @@
const char c = _sPath.lastChar();
if (c != '/' && c != ':')
_sPath += '/';
- }
- else {
+ } else {
//_bIsDirectory = false;
_bIsValid = true;
}
@@ -231,15 +230,13 @@
const char c = _sPath.lastChar();
if (c != '/' && c != ':')
_sPath += '/';
- }
- else {
+ } else {
//_bIsDirectory = false;
_bIsValid = true;
}
IDOS->FreeDosObject(DOS_EXAMINEDATA, pExd);
- }
- else {
+ } else {
debug(6, "ExamineObject() returned NULL");
}
@@ -268,7 +265,7 @@
bool AmigaOSFilesystemNode::exists() const {
ENTER();
- if(_sPath.empty())
+ if (_sPath.empty())
return false;
bool nodeExists = false;
@@ -352,16 +349,16 @@
struct ExamineData * pExd = NULL; // NB: no need to free value after usage, all is dealt by the DirContext release
AmigaOSFilesystemNode *entry ;
- while( (pExd = IDOS->ExamineDir(context)) ) {
- if( (EXD_IS_FILE(pExd) && ( Common::FSNode::kListFilesOnly == mode ))
+ while ( (pExd = IDOS->ExamineDir(context)) ) {
+ if ( (EXD_IS_FILE(pExd) && ( Common::FSNode::kListFilesOnly == mode ))
|| (EXD_IS_DIRECTORY(pExd) && ( Common::FSNode::kListDirectoriesOnly == mode ))
|| Common::FSNode::kListAll == mode
)
{
BPTR pLock = IDOS->Lock( pExd->Name, SHARED_LOCK );
- if( pLock ) {
+ if (pLock) {
entry = new AmigaOSFilesystemNode( pLock, pExd->Name );
- if( entry ) {
+ if (entry) {
myList.push_back(entry);
}
@@ -369,18 +366,17 @@
}
}
}
- if( ERROR_NO_MORE_ENTRIES != IDOS->IoErr() ) {
+
+ if (ERROR_NO_MORE_ENTRIES != IDOS->IoErr() ) {
debug(6, "An error occured during ExamineDir");
ret = false;
- }
- else {
+ } else {
ret = true;
}
IDOS->ReleaseDirContext(context);
- }
- else {
+ } else {
debug(6, "Unable to ObtainDirContext");
ret = false;
}
@@ -411,8 +407,7 @@
if (parentDir) {
node = new AmigaOSFilesystemNode(parentDir);
IDOS->UnLock(parentDir);
- }
- else
+ } else
node = new AmigaOSFilesystemNode();
LEAVE();
Modified: scummvm/trunk/backends/fs/psp/psp-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/psp/psp-fs.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/fs/psp/psp-fs.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -96,7 +96,7 @@
if (verify) {
struct stat st;
- if(PowerMan.beginCriticalSection()==PowerManager::Blocked)
+ if (PowerMan.beginCriticalSection()==PowerManager::Blocked)
PSPDebugSuspend("Suspended in PSPFilesystemNode::PSPFilesystemNode\n");
_isValid = (0 == stat(_path.c_str(), &st));
PowerMan.endCriticalSection();
Modified: scummvm/trunk/backends/fs/symbian/symbian-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/symbian/symbian-fs.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/fs/symbian/symbian-fs.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -66,9 +66,9 @@
TPtrC8 ptr((const unsigned char*) _path.c_str(), _path.size());
fname.Copy(ptr);
TBool fileExists = BaflUtils::FileExists(static_cast<OSystem_SDL_Symbian*> (g_system)->FsSession(), fname);
- if(!fileExists) {
+ if (!fileExists) {
TParsePtrC parser(fname);
- if(parser.PathPresent() && parser.Path().Compare(_L("\\")) == KErrNone && !parser.NameOrExtPresent()) {
+ if (parser.PathPresent() && parser.Path().Compare(_L("\\")) == KErrNone && !parser.NameOrExtPresent()) {
fileExists = ETrue;
}
}
@@ -137,7 +137,7 @@
_isValid = ETrue;
_isDirectory = EFalse;
TParsePtrC parser(fname);
- if(parser.PathPresent() && parser.Path().Compare(_L("\\")) == KErrNone && !parser.NameOrExtPresent()) {
+ if (parser.PathPresent() && parser.Path().Compare(_L("\\")) == KErrNone && !parser.NameOrExtPresent()) {
_isDirectory = ETrue;
}
}
Modified: scummvm/trunk/backends/fs/symbian/symbianstream.cpp
===================================================================
--- scummvm/trunk/backends/fs/symbian/symbianstream.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/fs/symbian/symbianstream.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -71,7 +71,7 @@
fileMode = fileMode| EFileShareAny;
- switch(mode[0]) {
+ switch (mode[0]) {
case 'a':
if (fileEntry->_fileHandle.Open(static_cast<OSystem_SDL_Symbian*>(g_system)->FsSession(), tempFileName, fileMode) != KErrNone) {
if (fileEntry->_fileHandle.Create(static_cast<OSystem_SDL_Symbian*>(g_system)->FsSession(), tempFileName, fileMode) != KErrNone) {
@@ -160,7 +160,7 @@
}
}
- if((numItems * size) != pointer.Length() && entry->_lastError == KErrNone) {
+ if ((numItems * size) != pointer.Length() && entry->_lastError == KErrNone) {
entry->_eofReached = ETrue;
}
Modified: scummvm/trunk/backends/platform/PalmOS/Src/base_event.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/base_event.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/platform/PalmOS/Src/base_event.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -324,7 +324,7 @@
if (SysHandleEvent(&ev))
continue;
- switch(ev.eType) {
+ switch (ev.eType) {
case penMoveEvent:
get_coordinates(&ev, x, y);
Modified: scummvm/trunk/backends/platform/PalmOS/Src/base_gfx.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/base_gfx.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/platform/PalmOS/Src/base_gfx.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -53,7 +53,7 @@
}
bool OSystem_PalmBase::setGraphicsMode(int mode) {
- switch(mode) {
+ switch (mode) {
case GFX_NORMAL:
case GFX_WIDE:
_setMode = mode;
Modified: scummvm/trunk/backends/platform/gp2x/events.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp2x/events.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/platform/gp2x/events.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -282,7 +282,7 @@
while (SDL_PollEvent(&ev)) {
- switch(ev.type) {
+ switch (ev.type) {
case SDL_KEYDOWN:{
b = event.kbd.flags = SDLModToOSystemKeyFlags(SDL_GetModState());
Modified: scummvm/trunk/backends/platform/gp2x/graphics.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp2x/graphics.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/platform/gp2x/graphics.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -179,7 +179,7 @@
int newScaleFactor = 1;
- switch(mode) {
+ switch (mode) {
case GFX_NORMAL:
newScaleFactor = 1;
break;
Modified: scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-events.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-events.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-events.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -81,13 +81,13 @@
}
void OSystem_GP2XWIZ::fillMouseEvent(Common::Event &event, int x, int y) {
- if(_videoMode.mode == GFX_HALF && !_overlayVisible){
- event.mouse.x = x*2;
- event.mouse.y = y*2;
- } else {
- event.mouse.x = x;
- event.mouse.y = y;
- }
+ if (_videoMode.mode == GFX_HALF && !_overlayVisible){
+ event.mouse.x = x*2;
+ event.mouse.y = y*2;
+ } else {
+ event.mouse.x = x;
+ event.mouse.y = y;
+ }
// Update the "keyboard mouse" coords
_km.x = x;
@@ -216,7 +216,7 @@
while (SDL_PollEvent(&ev)) {
- switch(ev.type) {
+ switch (ev.type) {
case SDL_KEYDOWN:{
b = event.kbd.flags = SDLModToOSystemKeyFlags(SDL_GetModState());
Modified: scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-graphics.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-graphics.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-graphics.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -58,13 +58,13 @@
int newScaleFactor = 1;
- switch(mode) {
+ switch (mode) {
case GFX_NORMAL:
newScaleFactor = 1;
break;
- case GFX_HALF:
- newScaleFactor = 1;
- break;
+ case GFX_HALF:
+ newScaleFactor = 1;
+ break;
default:
warning("unknown gfx mode %d", mode);
return false;
@@ -90,9 +90,9 @@
case GFX_NORMAL:
newScalerProc = Normal1x;
break;
- case GFX_HALF:
- newScalerProc = HalfScale;
- break;
+ case GFX_HALF:
+ newScalerProc = HalfScale;
+ break;
default:
error("Unknown gfx mode %d", _videoMode.mode);
@@ -113,19 +113,19 @@
void OSystem_GP2XWIZ::initSize(uint w, uint h) {
- assert(_transactionMode == kTransactionActive);
+ assert(_transactionMode == kTransactionActive);
// Avoid redundant res changes
if ((int)w == _videoMode.screenWidth && (int)h == _videoMode.screenHeight)
return;
- _videoMode.screenWidth = w;
+ _videoMode.screenWidth = w;
_videoMode.screenHeight = h;
- if(w > 320 || h > 240){
- setGraphicsMode(GFX_HALF);
- setGraphicsModeIntern();
- toggleMouseGrab();
- }
+ if (w > 320 || h > 240){
+ setGraphicsMode(GFX_HALF);
+ setGraphicsModeIntern();
+ toggleMouseGrab();
+ }
_cksumNum = (w * h / (8 * 8));
@@ -157,13 +157,13 @@
int width, height;
int hotX, hotY;
- if(_videoMode.mode == GFX_HALF && !_overlayVisible){
- dst.x = _mouseCurState.x/2;
- dst.y = _mouseCurState.y/2;
- } else {
- dst.x = _mouseCurState.x;
- dst.y = _mouseCurState.y;
- }
+ if (_videoMode.mode == GFX_HALF && !_overlayVisible){
+ dst.x = _mouseCurState.x/2;
+ dst.y = _mouseCurState.y/2;
+ } else {
+ dst.x = _mouseCurState.x;
+ dst.y = _mouseCurState.y;
+ }
if (!_overlayVisible) {
scale = _videoMode.scaleFactor;
@@ -214,7 +214,7 @@
// The screen will be updated using real surface coordinates, i.e.
// they will not be scaled or aspect-ratio corrected.
- addDirtyRect(dst.x, dst.y, dst.w, dst.h, true);
+ addDirtyRect(dst.x, dst.y, dst.w, dst.h, true);
}
void OSystem_GP2XWIZ::undrawMouse() {
@@ -227,12 +227,12 @@
return;
if (_mouseBackup.w != 0 && _mouseBackup.h != 0){
- if(_videoMode.mode == GFX_HALF && !_overlayVisible){
- addDirtyRect(x*2, y*2, _mouseBackup.w*2, _mouseBackup.h*2);
- } else {
- addDirtyRect(x, y, _mouseBackup.w, _mouseBackup.h);
- }
- }
+ if (_videoMode.mode == GFX_HALF && !_overlayVisible){
+ addDirtyRect(x*2, y*2, _mouseBackup.w*2, _mouseBackup.h*2);
+ } else {
+ addDirtyRect(x, y, _mouseBackup.w, _mouseBackup.h);
+ }
+ }
}
void OSystem_GP2XWIZ::internUpdateScreen() {
@@ -348,11 +348,11 @@
for (r = _dirtyRectList; r != lastRect; ++r) {
register int dst_y = r->y + _currentShakePos;
register int dst_h = 0;
- register int dst_w = r->w;
+ register int dst_w = r->w;
register int orig_dst_y = 0;
register int dst_x = r->x;
- register int src_y;
- register int src_x;
+ register int src_y;
+ register int src_x;
if (dst_y < height) {
dst_h = r->h;
@@ -360,42 +360,42 @@
dst_h = height - dst_y;
orig_dst_y = dst_y;
- src_x = dst_x;
- src_y = dst_y;
+ src_x = dst_x;
+ src_y = dst_y;
if (_videoMode.aspectRatioCorrection && !_overlayVisible)
dst_y = real2Aspect(dst_y);
assert(scalerProc != NULL);
- if(_videoMode.mode == GFX_HALF && scalerProc == HalfScale){
- if(dst_x%2==1){
- dst_x--;
- dst_w++;
- }
- if(dst_y%2==1){
- dst_y--;
- dst_h++;
- }
- src_x = dst_x;
- src_y = dst_y;
- dst_x = dst_x / 2;
- dst_y = dst_y / 2;
- }
- scalerProc((byte *)srcSurf->pixels + (src_x * 2 + 2) + (src_y + 1) * srcPitch, srcPitch,
+ if (_videoMode.mode == GFX_HALF && scalerProc == HalfScale){
+ if (dst_x%2==1){
+ dst_x--;
+ dst_w++;
+ }
+ if (dst_y%2==1){
+ dst_y--;
+ dst_h++;
+ }
+ src_x = dst_x;
+ src_y = dst_y;
+ dst_x = dst_x / 2;
+ dst_y = dst_y / 2;
+ }
+ scalerProc((byte *)srcSurf->pixels + (src_x * 2 + 2) + (src_y + 1) * srcPitch, srcPitch,
(byte *)_hwscreen->pixels + dst_x * 2 + dst_y * dstPitch, dstPitch, dst_w, dst_h);
}
- if(_videoMode.mode == GFX_HALF && scalerProc == HalfScale){
- r->w = r->w / 2;
- r->h = dst_h / 2;
- } else {
- r->w = r->w;
- r->h = dst_h;
- }
+ if (_videoMode.mode == GFX_HALF && scalerProc == HalfScale){
+ r->w = r->w / 2;
+ r->h = dst_h / 2;
+ } else {
+ r->w = r->w;
+ r->h = dst_h;
+ }
- r->x = dst_x;
- r->y = dst_y;
+ r->x = dst_x;
+ r->y = dst_y;
#ifndef DISABLE_SCALERS
@@ -430,27 +430,27 @@
}
void OSystem_GP2XWIZ::showOverlay() {
- if(_videoMode.mode == GFX_HALF){
- _mouseCurState.x = _mouseCurState.x / 2;
- _mouseCurState.y = _mouseCurState.y / 2;
- }
+ if (_videoMode.mode == GFX_HALF){
+ _mouseCurState.x = _mouseCurState.x / 2;
+ _mouseCurState.y = _mouseCurState.y / 2;
+ }
OSystem_SDL::showOverlay();
}
void OSystem_GP2XWIZ::hideOverlay() {
- if(_videoMode.mode == GFX_HALF){
- _mouseCurState.x = _mouseCurState.x * 2;
- _mouseCurState.y = _mouseCurState.y * 2;
- }
+ if (_videoMode.mode == GFX_HALF){
+ _mouseCurState.x = _mouseCurState.x * 2;
+ _mouseCurState.y = _mouseCurState.y * 2;
+ }
OSystem_SDL::hideOverlay();
}
void OSystem_GP2XWIZ::warpMouse(int x, int y) {
if (_mouseCurState.x != x || _mouseCurState.y != y) {
- if(_videoMode.mode == GFX_HALF && !_overlayVisible){
- x = x / 2;
- y = y / 2;
- }
+ if (_videoMode.mode == GFX_HALF && !_overlayVisible){
+ x = x / 2;
+ y = y / 2;
+ }
}
OSystem_SDL::warpMouse(x, y);
}
Modified: scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-hw.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-hw.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-hw.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -65,8 +65,8 @@
if (direction == VOLUME_UP) volumeLevel += VOLUME_CHANGE_RATE/2;
if (direction == VOLUME_DOWN) volumeLevel -= VOLUME_CHANGE_RATE/2;
} else {
- if(direction == VOLUME_UP) volumeLevel += VOLUME_CHANGE_RATE;
- if(direction == VOLUME_DOWN) volumeLevel -= VOLUME_CHANGE_RATE;
+ if (direction == VOLUME_UP) volumeLevel += VOLUME_CHANGE_RATE;
+ if (direction == VOLUME_DOWN) volumeLevel -= VOLUME_CHANGE_RATE;
}
if (volumeLevel < VOLUME_MIN) volumeLevel = VOLUME_MIN;
@@ -74,7 +74,7 @@
unsigned long soundDev = open("/dev/mixer", O_RDWR);
- if(soundDev) {
+ if (soundDev) {
int vol = ((volumeLevel << 8) | volumeLevel);
ioctl(soundDev, SOUND_MIXER_WRITE_PCM, &vol);
close(soundDev);
Modified: scummvm/trunk/backends/platform/iphone/iphone_video.m
===================================================================
--- scummvm/trunk/backends/platform/iphone/iphone_video.m 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/platform/iphone/iphone_video.m 2009-09-30 16:16:53 UTC (rev 44495)
@@ -352,7 +352,7 @@
- (void)addEvent:(NSDictionary*)event {
- if(_events == nil)
+ if (_events == nil)
_events = [[NSMutableArray alloc] init];
[_events addObject: event];
Modified: scummvm/trunk/backends/platform/linuxmoto/linuxmoto-events.cpp
===================================================================
--- scummvm/trunk/backends/platform/linuxmoto/linuxmoto-events.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/platform/linuxmoto/linuxmoto-events.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -44,13 +44,13 @@
}
void OSystem_LINUXMOTO::fillMouseEvent(Common::Event &event, int x, int y) {
- if(_videoMode.mode == GFX_HALF && !_overlayVisible) {
- event.mouse.x = x*2;
- event.mouse.y = y*2;
- } else {
- event.mouse.x = x;
- event.mouse.y = y;
- }
+ if (_videoMode.mode == GFX_HALF && !_overlayVisible) {
+ event.mouse.x = x*2;
+ event.mouse.y = y*2;
+ } else {
+ event.mouse.x = x;
+ event.mouse.y = y;
+ }
// Update the "keyboard mouse" coords
_km.x = x;
@@ -82,7 +82,7 @@
ev.key.keysym.sym = SDLK_F5;
}
// VirtualKeyboard - Camera key
- else if (ev.key.keysym.sym == SDLK_PAUSE) {
+ else if (ev.key.keysym.sym == SDLK_PAUSE) {
ev.key.keysym.sym = SDLK_F7;
}
// Enter - mod+fire key
Modified: scummvm/trunk/backends/platform/linuxmoto/linuxmoto-graphics.cpp
===================================================================
--- scummvm/trunk/backends/platform/linuxmoto/linuxmoto-graphics.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/platform/linuxmoto/linuxmoto-graphics.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -58,13 +58,13 @@
int newScaleFactor = 1;
- switch(mode) {
+ switch (mode) {
case GFX_NORMAL:
- newScaleFactor = 1;
- break;
+ newScaleFactor = 1;
+ break;
case GFX_HALF:
- newScaleFactor = 1;
- break;
+ newScaleFactor = 1;
+ break;
default:
warning("unknown gfx mode %d", mode);
return false;
@@ -113,20 +113,20 @@
void OSystem_LINUXMOTO::initSize(uint w, uint h) {
- assert(_transactionMode == kTransactionActive);
+ assert(_transactionMode == kTransactionActive);
// Avoid redundant res changes
if ((int)w == _videoMode.screenWidth && (int)h == _videoMode.screenHeight)
return;
- _videoMode.screenWidth = w;
- _videoMode.screenHeight = h;
+ _videoMode.screenWidth = w;
+ _videoMode.screenHeight = h;
- if (w > 320 || h > 240) {
- setGraphicsMode(GFX_HALF);
- setGraphicsModeIntern();
- toggleMouseGrab();
- }
+ if (w > 320 || h > 240) {
+ setGraphicsMode(GFX_HALF);
+ setGraphicsModeIntern();
+ toggleMouseGrab();
+ }
_cksumNum = (w * h / (8 * 8));
@@ -137,30 +137,30 @@
}
bool OSystem_LINUXMOTO::loadGFXMode() {
- printf("Game ScreenMode = %d*%d\n",_videoMode.screenWidth, _videoMode.screenHeight);
- if (_videoMode.screenWidth > 320 || _videoMode.screenHeight > 240) {
- _videoMode.aspectRatioCorrection = false;
- setGraphicsMode(GFX_HALF);
- printf("GraphicsMode set to HALF\n");
+ printf("Game ScreenMode = %d*%d\n",_videoMode.screenWidth, _videoMode.screenHeight);
+ if (_videoMode.screenWidth > 320 || _videoMode.screenHeight > 240) {
+ _videoMode.aspectRatioCorrection = false;
+ setGraphicsMode(GFX_HALF);
+ printf("GraphicsMode set to HALF\n");
} else {
- setGraphicsMode(GFX_NORMAL);
- printf("GraphicsMode set to NORMAL\n");
- }
- if (_videoMode.mode == GFX_HALF && !_overlayVisible) {
- _videoMode.overlayWidth = 320;
- _videoMode.overlayHeight = 240;
- _videoMode.fullscreen = true;
- } else {
+ setGraphicsMode(GFX_NORMAL);
+ printf("GraphicsMode set to NORMAL\n");
+ }
+ if (_videoMode.mode == GFX_HALF && !_overlayVisible) {
+ _videoMode.overlayWidth = 320;
+ _videoMode.overlayHeight = 240;
+ _videoMode.fullscreen = true;
+ } else {
- _videoMode.overlayWidth = _videoMode.screenWidth * _videoMode.scaleFactor;
- _videoMode.overlayHeight = _videoMode.screenHeight * _videoMode.scaleFactor;
+ _videoMode.overlayWidth = _videoMode.screenWidth * _videoMode.scaleFactor;
+ _videoMode.overlayHeight = _videoMode.screenHeight * _videoMode.scaleFactor;
- if (_videoMode.aspectRatioCorrection)
- _videoMode.overlayHeight = real2Aspect(_videoMode.overlayHeight);
+ if (_videoMode.aspectRatioCorrection)
+ _videoMode.overlayHeight = real2Aspect(_videoMode.overlayHeight);
- _videoMode.hardwareWidth = _videoMode.screenWidth * _videoMode.scaleFactor;
- _videoMode.hardwareHeight = effectiveScreenHeight();
- }
+ _videoMode.hardwareWidth = _videoMode.screenWidth * _videoMode.scaleFactor;
+ _videoMode.hardwareHeight = effectiveScreenHeight();
+ }
return OSystem_SDL::loadGFXMode();
}
@@ -176,13 +176,13 @@
int width, height;
int hotX, hotY;
- if (_videoMode.mode == GFX_HALF && !_overlayVisible) {
- dst.x = _mouseCurState.x/2;
- dst.y = _mouseCurState.y/2;
- } else {
- dst.x = _mouseCurState.x;
- dst.y = _mouseCurState.y;
- }
+ if (_videoMode.mode == GFX_HALF && !_overlayVisible) {
+ dst.x = _mouseCurState.x/2;
+ dst.y = _mouseCurState.y/2;
+ } else {
+ dst.x = _mouseCurState.x;
+ dst.y = _mouseCurState.y;
+ }
if (!_overlayVisible) {
scale = _videoMode.scaleFactor;
@@ -192,7 +192,6 @@
dst.h = _mouseCurState.vH;
hotX = _mouseCurState.vHotX;
hotY = _mouseCurState.vHotY;
-
} else {
scale = 1;
width = _videoMode.overlayWidth;
@@ -201,7 +200,6 @@
dst.h = _mouseCurState.rH;
hotX = _mouseCurState.rHotX;
hotY = _mouseCurState.rHotY;
-
}
// The mouse is undrawn using virtual coordinates, i.e. they may be
@@ -235,7 +233,7 @@
// The screen will be updated using real surface coordinates, i.e.
// they will not be scaled or aspect-ratio corrected.
- addDirtyRect(dst.x, dst.y, dst.w, dst.h, true);
+ addDirtyRect(dst.x, dst.y, dst.w, dst.h, true);
}
void OSystem_LINUXMOTO::undrawMouse() {
@@ -247,13 +245,13 @@
if (!_overlayVisible && (x >= _videoMode.screenWidth || y >= _videoMode.screenHeight))
return;
- if (_mouseBackup.w != 0 && _mouseBackup.h != 0){
- if (_videoMode.mode == GFX_HALF && !_overlayVisible) {
- addDirtyRect(x*2, y*2, _mouseBackup.w*2, _mouseBackup.h*2);
- } else {
- addDirtyRect(x, y, _mouseBackup.w, _mouseBackup.h);
- }
- }
+ if (_mouseBackup.w != 0 && _mouseBackup.h != 0) {
+ if (_videoMode.mode == GFX_HALF && !_overlayVisible) {
+ addDirtyRect(x*2, y*2, _mouseBackup.w*2, _mouseBackup.h*2);
+ } else {
+ addDirtyRect(x, y, _mouseBackup.w, _mouseBackup.h);
+ }
+ }
}
void OSystem_LINUXMOTO::internUpdateScreen() {
@@ -388,44 +386,42 @@
assert(scalerProc != NULL);
- if (_videoMode.mode == GFX_HALF && scalerProc == HalfScale) {
+ if (_videoMode.mode == GFX_HALF && scalerProc == HalfScale) {
- if (dst_x%2==1) {
- dst_x--;
- dst_w++;
- }
- if (dst_y%2==1) {
- dst_y--;
- dst_h++;
- }
+ if (dst_x%2==1) {
+ dst_x--;
+ dst_w++;
+ }
+ if (dst_y%2==1) {
+ dst_y--;
+ dst_h++;
+ }
- if (dst_w&1)
- dst_w++;
- if (dst_h&1)
- dst_h++;
+ if (dst_w&1)
+ dst_w++;
+ if (dst_h&1)
+ dst_h++;
- src_x = dst_x;
- src_y = dst_y;
- dst_x = dst_x / 2;
- dst_y = dst_y / 2;
- }
- scalerProc((byte *)srcSurf->pixels + (src_x * 2 + 2) + (src_y + 1) * srcPitch, srcPitch,
+ src_x = dst_x;
+ src_y = dst_y;
+ dst_x = dst_x / 2;
+ dst_y = dst_y / 2;
+ }
+ scalerProc((byte *)srcSurf->pixels + (src_x * 2 + 2) + (src_y + 1) * srcPitch, srcPitch,
(byte *)_hwscreen->pixels + dst_x * 2 + dst_y * dstPitch, dstPitch, dst_w, dst_h);
}
- if (_videoMode.mode == GFX_HALF && scalerProc == HalfScale) {
+ if (_videoMode.mode == GFX_HALF && scalerProc == HalfScale) {
+ r->w = r->w / 2;
+ r->h = dst_h / 2;
+ } else {
+ r->w = r->w;
+ r->h = dst_h;
+ }
- r->w = r->w / 2;
- r->h = dst_h / 2;
- } else {
- r->w = r->w;
- r->h = dst_h;
- }
+ r->x = dst_x;
+ r->y = dst_y;
- r->x = dst_x;
- r->y = dst_y;
-
-
#ifndef DISABLE_SCALERS
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);
@@ -458,27 +454,27 @@
}
void OSystem_LINUXMOTO::showOverlay() {
- if (_videoMode.mode == GFX_HALF) {
- _mouseCurState.x = _mouseCurState.x / 2;
- _mouseCurState.y = _mouseCurState.y / 2;
- }
+ if (_videoMode.mode == GFX_HALF) {
+ _mouseCurState.x = _mouseCurState.x / 2;
+ _mouseCurState.y = _mouseCurState.y / 2;
+ }
OSystem_SDL::showOverlay();
}
void OSystem_LINUXMOTO::hideOverlay() {
- if (_videoMode.mode == GFX_HALF) {
- _mouseCurState.x = _mouseCurState.x * 2;
- _mouseCurState.y = _mouseCurState.y * 2;
- }
+ if (_videoMode.mode == GFX_HALF) {
+ _mouseCurState.x = _mouseCurState.x * 2;
+ _mouseCurState.y = _mouseCurState.y * 2;
+ }
OSystem_SDL::hideOverlay();
}
void OSystem_LINUXMOTO::warpMouse(int x, int y) {
if (_mouseCurState.x != x || _mouseCurState.y != y) {
- if (_videoMode.mode == GFX_HALF && !_overlayVisible) {
- x = x / 2;
- y = y / 2;
- }
+ if (_videoMode.mode == GFX_HALF && !_overlayVisible) {
+ x = x / 2;
+ y = y / 2;
+ }
}
OSystem_SDL::warpMouse(x, y);
}
Modified: scummvm/trunk/backends/platform/linuxmoto/linuxmoto-scaler.h
===================================================================
--- scummvm/trunk/backends/platform/linuxmoto/linuxmoto-scaler.h 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/platform/linuxmoto/linuxmoto-scaler.h 2009-09-30 16:16:53 UTC (rev 44495)
@@ -33,7 +33,7 @@
// FIXME: For now keep hacks in this header to save polluting the SDL backend.
enum {
- GFX_HALF = 12
+ GFX_HALF = 12
};
// TODO/FIXME: Move this platform specific scaler into /graphics/scaler and properly merge with the WinCE PocketPCHalf that it is based on.
Modified: scummvm/trunk/backends/platform/ps2/savefilemgr.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/savefilemgr.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/platform/ps2/savefilemgr.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -125,7 +125,7 @@
Common::FSNode file(path);
- if(!file.exists())
+ if (!file.exists())
return NULL;
sf = file.createReadStream();
@@ -133,7 +133,7 @@
} else {
Common::FSNode file = savePath.getChild(filename);
- if(!file.exists())
+ if (!file.exists())
return NULL;
sf = file.createReadStream();
Modified: scummvm/trunk/backends/platform/psp/osys_psp.cpp
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/platform/psp/osys_psp.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -617,19 +617,19 @@
sceGuDisable(GU_ALPHA_TEST);
sceGuEnable(GU_BLEND);
sceGuBlendFunc(GU_ADD, GU_SRC_ALPHA, GU_ONE_MINUS_SRC_ALPHA, 0, 0);
- switch(_keyboardMode) {
- case 0:
- sceGuTexImage(0, 512, 512, 480, keyboard_letters);
- break;
- case CAPS_LOCK:
- sceGuTexImage(0, 512, 512, 480, keyboard_letters_shift);
- break;
- case SYMBOLS:
- sceGuTexImage(0, 512, 512, 480, keyboard_symbols);
- break;
- case (CAPS_LOCK | SYMBOLS):
- sceGuTexImage(0, 512, 512, 480, keyboard_symbols_shift);
- break;
+ switch (_keyboardMode) {
+ case 0:
+ sceGuTexImage(0, 512, 512, 480, keyboard_letters);
+ break;
+ case CAPS_LOCK:
+ sceGuTexImage(0, 512, 512, 480, keyboard_letters_shift);
+ break;
+ case SYMBOLS:
+ sceGuTexImage(0, 512, 512, 480, keyboard_symbols);
+ break;
+ case (CAPS_LOCK | SYMBOLS):
+ sceGuTexImage(0, 512, 512, 480, keyboard_symbols_shift);
+ break;
}
sceGuTexFunc(GU_TFX_REPLACE, GU_TCC_RGBA);
@@ -1006,51 +1006,51 @@
event.type = (pad.Buttons & PSP_CTRL_CROSS) ? Common::EVENT_KEYDOWN : Common::EVENT_KEYUP;
if (_keySelected > 26) {
event.kbd.flags = 0;
- switch(_keySelected) {
- case 27:
- event.kbd.ascii = ' ';
- event.kbd.keycode = Common::KEYCODE_SPACE;
+ switch (_keySelected) {
+ case 27:
+ event.kbd.ascii = ' ';
+ event.kbd.keycode = Common::KEYCODE_SPACE;
+ break;
+ case 28:
+ event.kbd.ascii = 127;
+ event.kbd.keycode = Common::KEYCODE_DELETE;
+ break;
+ case 29:
+ event.kbd.ascii = 8;
+ event.kbd.keycode = Common::KEYCODE_BACKSPACE;
+ break;
+ case 30:
+ event.kbd.ascii = 13;
+ event.kbd.keycode = Common::KEYCODE_RETURN;
+ break;
+ }
+ } else {
+ switch ( _keyboardMode) {
+ case 0:
+ event.kbd.flags = 0;
+ event.kbd.ascii = 'a'+_keySelected-1;
+ event.kbd.keycode = (Common::KeyCode)(Common::KEYCODE_a + _keySelected-1);
break;
- case 28:
- event.kbd.ascii = 127;
- event.kbd.keycode = Common::KEYCODE_DELETE;
+ case CAPS_LOCK:
+ event.kbd.ascii = 'A'+_keySelected-1;
+ event.kbd.keycode = (Common::KeyCode)(Common::KEYCODE_a + _keySelected-1);
+ event.kbd.flags = Common::KBD_SHIFT;
break;
- case 29:
- event.kbd.ascii = 8;
- event.kbd.keycode = Common::KEYCODE_BACKSPACE;
+ case SYMBOLS:
+ if (_keySelected < 21) {
+ event.kbd.flags = 0;
+ event.kbd.ascii = kbd_ascii[_keySelected-1];
+ event.kbd.keycode = kbd_code[ _keySelected-1];
+ }
break;
- case 30:
- event.kbd.ascii = 13;
- event.kbd.keycode = Common::KEYCODE_RETURN;
+ case (SYMBOLS|CAPS_LOCK):
+ if (_keySelected < 21) {
+ event.kbd.flags = 0;
+ event.kbd.ascii = kbd_ascii_cl[_keySelected-1];
+ event.kbd.keycode = kbd_code_cl[ _keySelected-1];
+ }
break;
}
- } else {
- switch( _keyboardMode) {
- case 0:
- event.kbd.flags = 0;
- event.kbd.ascii = 'a'+_keySelected-1;
- event.kbd.keycode = (Common::KeyCode)(Common::KEYCODE_a + _keySelected-1);
- break;
- case CAPS_LOCK:
- event.kbd.ascii = 'A'+_keySelected-1;
- event.kbd.keycode = (Common::KeyCode)(Common::KEYCODE_a + _keySelected-1);
- event.kbd.flags = Common::KBD_SHIFT;
- break;
- case SYMBOLS:
- if (_keySelected < 21) {
- event.kbd.flags = 0;
- event.kbd.ascii = kbd_ascii[_keySelected-1];
- event.kbd.keycode = kbd_code[ _keySelected-1];
- }
- break;
- case (SYMBOLS|CAPS_LOCK):
- if (_keySelected < 21) {
- event.kbd.flags = 0;
- event.kbd.ascii = kbd_ascii_cl[_keySelected-1];
- event.kbd.keycode = kbd_code_cl[ _keySelected-1];
- }
- break;
- }
}
_prevButtons = pad.Buttons;
return true;
Modified: scummvm/trunk/backends/platform/psp/psp_main.cpp
===================================================================
--- scummvm/trunk/backends/platform/psp/psp_main.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/platform/psp/psp_main.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -23,7 +23,6 @@
*
*/
-
#define USERSPACE_ONLY //don't use kernel mode features
#ifndef USERSPACE_ONLY
@@ -118,7 +117,7 @@
cbid = sceKernelCreateCallback("Power Callback", (SceKernelCallbackFunction)power_callback, 0);
if (cbid >= 0) {
- if(scePowerRegisterCallback(-1, cbid) < 0) {
+ if (scePowerRegisterCallback(-1, cbid) < 0) {
PSPDebugTrace("SetupCallbacks(): Couldn't register callback for power_callback\n");
}
} else {
Modified: scummvm/trunk/backends/platform/sdl/graphics.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/graphics.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/platform/sdl/graphics.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -301,7 +301,7 @@
int newScaleFactor = 1;
- switch(mode) {
+ switch (mode) {
case GFX_NORMAL:
newScaleFactor = 1;
break;
Modified: scummvm/trunk/backends/platform/symbian/src/ScummVMApp.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/ScummVMApp.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/platform/symbian/src/ScummVMApp.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -151,7 +151,7 @@
}
void CScummVMUi::HandleCommandL(TInt aCommand) {
- switch(aCommand) {
+ switch (aCommand) {
case EEikCmdExit:
{
RThread thread;
Modified: scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -84,35 +84,35 @@
};
bool OSystem_SDL_Symbian::hasFeature(Feature f) {
- switch(f) {
- case kFeatureFullscreenMode:
- case kFeatureAspectRatioCorrection:
- case kFeatureAutoComputeDirtyRects:
- case kFeatureCursorHasPalette:
+ switch (f) {
+ case kFeatureFullscreenMode:
+ case kFeatureAspectRatioCorrection:
+ case kFeatureAutoComputeDirtyRects:
+ case kFeatureCursorHasPalette:
#ifdef USE_VIBRA_SE_PXXX
- case kFeatureVibration:
+ case kFeatureVibration:
#endif
- return true;
+ return true;
- default:
- return false;
+ default:
+ return false;
}
}
void OSystem_SDL_Symbian::setFeatureState(Feature f, bool enable) {
- switch(f) {
- case kFeatureVirtualKeyboard:
- if (enable) {
- }
- else {
+ switch (f) {
+ case kFeatureVirtualKeyboard:
+ if (enable) {
+ }
+ else {
- }
- break;
- case kFeatureDisableKeyFiltering:
- GUI::Actions::Instance()->beginMapping(enable);
- break;
- default:
- OSystem_SDL::setFeatureState(f, enable);
+ }
+ break;
+ case kFeatureDisableKeyFiltering:
+ GUI::Actions::Instance()->beginMapping(enable);
+ break;
+ default:
+ OSystem_SDL::setFeatureState(f, enable);
}
}
@@ -326,7 +326,7 @@
if (GUI::Actions::Instance()->getMapping(loop) == ev.key.keysym.sym &&
GUI::Actions::Instance()->isEnabled(loop)) {
// Create proper event instead
- switch(loop) {
+ switch (loop) {
case GUI::ACTION_UP:
if (ev.type == SDL_KEYDOWN) {
_km.y_vel = -1;
Modified: scummvm/trunk/backends/platform/wii/osystem_gfx.cpp
===================================================================
--- scummvm/trunk/backends/platform/wii/osystem_gfx.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/platform/wii/osystem_gfx.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -258,7 +258,7 @@
}
if (update) {
- if(_gamePixels)
+ if (_gamePixels)
free(_gamePixels);
tex_format = GFX_TF_PALETTE_RGB565;
Modified: scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -232,7 +232,7 @@
static bool keydialogrunning = false, quitdialog = false;
if (!pushed) {
- switch(action) {
+ switch (action) {
case POCKET_ACTION_RIGHTCLICK:
_CESystem->add_right_click(false);
return true;
@@ -251,78 +251,78 @@
}
switch (action) {
- case POCKET_ACTION_PAUSE:
- case POCKET_ACTION_SAVE:
- case POCKET_ACTION_SKIP:
- case POCKET_ACTION_MULTI:
- if (action == POCKET_ACTION_SAVE && ConfMan.get("gameid") == "parallaction") {
- // FIXME: This is a temporary solution. The engine should handle its own menus.
- // Note that the user can accomplish this via the virtual keyboard as well, this is just for convenience
- GUI::MessageDialog alert("Do you want to load or save the game?", "Load", "Save");
- if (alert.runModal() == GUI::kMessageOK)
- _key_action[action].setKey(SDLK_l);
- else
- _key_action[action].setKey(SDLK_s);
- }
- EventsBuffer::simulateKey(&_key_action[action], true);
- return true;
- case POCKET_ACTION_KEYBOARD:
- _CESystem->swap_panel();
- return true;
- case POCKET_ACTION_HIDE:
- _CESystem->swap_panel_visibility();
- return true;
- case POCKET_ACTION_SOUND:
- _CESystem->swap_sound_master();
- return true;
- case POCKET_ACTION_RIGHTCLICK:
- _CESystem->add_right_click(true);
- return true;
- case POCKET_ACTION_CURSOR:
- _CESystem->swap_mouse_visibility();
- return true;
- case POCKET_ACTION_FREELOOK:
- _CESystem->swap_freeLook();
- return true;
- case POCKET_ACTION_ZOOM_UP:
- _CESystem->swap_zoom_up();
- return true;
- case POCKET_ACTION_ZOOM_DOWN:
- _CESystem->swap_zoom_down();
- return true;
- case POCKET_ACTION_LEFTCLICK:
- _CESystem->add_left_click(true);
- return true;
- case POCKET_ACTION_UP:
- _CESystem->move_cursor_up();
- return true;
- case POCKET_ACTION_DOWN:
- _CESystem->move_cursor_down();
- return true;
- case POCKET_ACTION_LEFT:
- _CESystem->move_cursor_left();
- return true;
- case POCKET_ACTION_RIGHT:
- _CESystem->move_cursor_right();
- return true;
- case POCKET_ACTION_QUIT:
- if (!quitdialog) {
- quitdialog = true;
- GUI::MessageDialog alert(" Are you sure you want to quit ? ", "Yes", "No");
- if (alert.runModal() == GUI::kMessageOK)
- _mainSystem->quit();
- quitdialog = false;
- }
- return true;
- case POCKET_ACTION_BINDKEYS:
- if (!keydialogrunning) {
- keydialogrunning = true;
- GUI::KeysDialog *keysDialog = new GUI::KeysDialog();
- keysDialog->runModal();
- delete keysDialog;
- keydialogrunning = false;
- }
- return true;
+ case POCKET_ACTION_PAUSE:
+ case POCKET_ACTION_SAVE:
+ case POCKET_ACTION_SKIP:
+ case POCKET_ACTION_MULTI:
+ if (action == POCKET_ACTION_SAVE && ConfMan.get("gameid") == "parallaction") {
+ // FIXME: This is a temporary solution. The engine should handle its own menus.
+ // Note that the user can accomplish this via the virtual keyboard as well, this is just for convenience
+ GUI::MessageDialog alert("Do you want to load or save the game?", "Load", "Save");
+ if (alert.runModal() == GUI::kMessageOK)
+ _key_action[action].setKey(SDLK_l);
+ else
+ _key_action[action].setKey(SDLK_s);
+ }
+ EventsBuffer::simulateKey(&_key_action[action], true);
+ return true;
+ case POCKET_ACTION_KEYBOARD:
+ _CESystem->swap_panel();
+ return true;
+ case POCKET_ACTION_HIDE:
+ _CESystem->swap_panel_visibility();
+ return true;
+ case POCKET_ACTION_SOUND:
+ _CESystem->swap_sound_master();
+ return true;
+ case POCKET_ACTION_RIGHTCLICK:
+ _CESystem->add_right_click(true);
+ return true;
+ case POCKET_ACTION_CURSOR:
+ _CESystem->swap_mouse_visibility();
+ return true;
+ case POCKET_ACTION_FREELOOK:
+ _CESystem->swap_freeLook();
+ return true;
+ case POCKET_ACTION_ZOOM_UP:
+ _CESystem->swap_zoom_up();
+ return true;
+ case POCKET_ACTION_ZOOM_DOWN:
+ _CESystem->swap_zoom_down();
+ return true;
+ case POCKET_ACTION_LEFTCLICK:
+ _CESystem->add_left_click(true);
+ return true;
+ case POCKET_ACTION_UP:
+ _CESystem->move_cursor_up();
+ return true;
+ case POCKET_ACTION_DOWN:
+ _CESystem->move_cursor_down();
+ return true;
+ case POCKET_ACTION_LEFT:
+ _CESystem->move_cursor_left();
+ return true;
+ case POCKET_ACTION_RIGHT:
+ _CESystem->move_cursor_right();
+ return true;
+ case POCKET_ACTION_QUIT:
+ if (!quitdialog) {
+ quitdialog = true;
+ GUI::MessageDialog alert(" Are you sure you want to quit ? ", "Yes", "No");
+ if (alert.runModal() == GUI::kMessageOK)
+ _mainSystem->quit();
+ quitdialog = false;
+ }
+ return true;
+ case POCKET_ACTION_BINDKEYS:
+ if (!keydialogrunning) {
+ keydialogrunning = true;
+ GUI::KeysDialog *keysDialog = new GUI::KeysDialog();
+ keysDialog->runModal();
+ delete keysDialog;
+ keydialogrunning = false;
+ }
+ return true;
}
return false;
}
Modified: scummvm/trunk/backends/platform/wince/CEException.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEException.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/platform/wince/CEException.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -94,31 +94,31 @@
unsigned int i;
#if (_WIN32_WCE >= 300)
writeBreak(file);
- switch(exceptionRecord->ExceptionCode) {
- case EXCEPTION_ACCESS_VIOLATION :
- strcpy(exceptionName, "Access Violation");
- break;
- case EXCEPTION_ARRAY_BOUNDS_EXCEEDED :
- strcpy(exceptionName, "Array Bounds Exceeded");
- break;
- case EXCEPTION_DATATYPE_MISALIGNMENT :
- strcpy(exceptionName, "Datatype Misalignment");
- break;
- case EXCEPTION_IN_PAGE_ERROR :
- strcpy(exceptionName, "In Page Error");
- break;
- case EXCEPTION_INT_DIVIDE_BY_ZERO :
- strcpy(exceptionName, "Int Divide By Zero");
- break;
- case EXCEPTION_INT_OVERFLOW :
- strcpy(exceptionName, "Int Overflow");
- break;
- case EXCEPTION_STACK_OVERFLOW :
- strcpy(exceptionName, "Stack Overflow");
- break;
- default:
- sprintf(exceptionName, "%.8x", exceptionRecord->ExceptionCode);
- break;
+ switch (exceptionRecord->ExceptionCode) {
+ case EXCEPTION_ACCESS_VIOLATION :
+ strcpy(exceptionName, "Access Violation");
+ break;
+ case EXCEPTION_ARRAY_BOUNDS_EXCEEDED :
+ strcpy(exceptionName, "Array Bounds Exceeded");
+ break;
+ case EXCEPTION_DATATYPE_MISALIGNMENT :
+ strcpy(exceptionName, "Datatype Misalignment");
+ break;
+ case EXCEPTION_IN_PAGE_ERROR :
+ strcpy(exceptionName, "In Page Error");
+ break;
+ case EXCEPTION_INT_DIVIDE_BY_ZERO :
+ strcpy(exceptionName, "Int Divide By Zero");
+ break;
+ case EXCEPTION_INT_OVERFLOW :
+ strcpy(exceptionName, "Int Overflow");
+ break;
+ case EXCEPTION_STACK_OVERFLOW :
+ strcpy(exceptionName, "Stack Overflow");
+ break;
+ default:
+ sprintf(exceptionName, "%.8x", exceptionRecord->ExceptionCode);
+ break;
}
sprintf(tempo, "Exception %s Flags %.8x Address %.8x", exceptionName, exceptionRecord->ExceptionFlags,
exceptionRecord->ExceptionAddress);
Modified: scummvm/trunk/backends/platform/wince/wince-sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -935,46 +935,46 @@
}
void OSystem_WINCE3::setFeatureState(Feature f, bool enable) {
- switch(f) {
- case kFeatureFullscreenMode:
+ switch (f) {
+ case kFeatureFullscreenMode:
+ return;
+
+ case kFeatureVirtualKeyboard:
+ if (_hasSmartphoneResolution)
return;
-
- case kFeatureVirtualKeyboard:
- if (_hasSmartphoneResolution)
- return;
- _toolbarHighDrawn = false;
- if (enable) {
- _panelStateForced = true;
- if (!_toolbarHandler.visible()) swap_panel_visibility();
- //_saveToolbarState = _toolbarHandler.visible();
- _saveActiveToolbar = _toolbarHandler.activeName();
- _toolbarHandler.setActive(NAME_PANEL_KEYBOARD);
- _toolbarHandler.setVisible(true);
+ _toolbarHighDrawn = false;
+ if (enable) {
+ _panelStateForced = true;
+ if (!_toolbarHandler.visible()) swap_panel_visibility();
+ //_saveToolbarState = _toolbarHandler.visible();
+ _saveActiveToolbar = _toolbarHandler.activeName();
+ _toolbarHandler.setActive(NAME_PANEL_KEYBOARD);
+ _toolbarHandler.setVisible(true);
+ }
+ else
+ if (_panelStateForced) {
+ _panelStateForced = false;
+ _toolbarHandler.setActive(_saveActiveToolbar);
+ //_toolbarHandler.setVisible(_saveToolbarState);
}
- else
- if (_panelStateForced) {
- _panelStateForced = false;
- _toolbarHandler.setActive(_saveActiveToolbar);
- //_toolbarHandler.setVisible(_saveToolbarState);
- }
- return;
+ return;
- case kFeatureDisableKeyFiltering:
- if (_hasSmartphoneResolution)
- _unfilteredkeys = enable;
- return;
+ case kFeatureDisableKeyFiltering:
+ if (_hasSmartphoneResolution)
+ _unfilteredkeys = enable;
+ return;
- default:
- OSystem_SDL::setFeatureState(f, enable);
+ default:
+ OSystem_SDL::setFeatureState(f, enable);
}
}
bool OSystem_WINCE3::getFeatureState(Feature f) {
- switch(f) {
- case kFeatureFullscreenMode:
- return false;
- case kFeatureVirtualKeyboard:
- return (_panelStateForced);
+ switch (f) {
+ case kFeatureFullscreenMode:
+ return false;
+ case kFeatureVirtualKeyboard:
+ return (_panelStateForced);
}
return OSystem_SDL::getFeatureState(f);
}
@@ -1277,7 +1277,7 @@
if (_scaleFactorXm < 0) {
/* Standard scalers, from the SDL backend */
- switch(_videoMode.mode) {
+ switch (_videoMode.mode) {
case GFX_NORMAL:
_videoMode.scaleFactor = 1;
_scalerProc = Normal1x;
@@ -2308,7 +2308,7 @@
currentTime = GetTickCount();
while (SDL_PollEvent(&ev)) {
- switch(ev.type) {
+ switch (ev.type) {
case SDL_KEYDOWN:
debug(1, "Key down %X %s", ev.key.keysym.sym, SDL_GetKeyName((SDLKey)ev.key.keysym.sym));
// KMOD_RESERVED is used if the key has been injected by an external buffer
Modified: scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp
===================================================================
--- scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -337,7 +337,7 @@
List<VirtualKeyPress>::iterator it = _keyPos;
it--;
_strPos -= it->strLen;
- while((it->strLen)-- > 0)
+ while ((it->strLen)-- > 0)
_keysStr.deleteChar(_strPos);
_keys.erase(it);
_strChanged = true;
Modified: scummvm/trunk/common/EventRecorder.cpp
===================================================================
--- scummvm/trunk/common/EventRecorder.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/common/EventRecorder.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -39,7 +39,7 @@
event.type = (Common::EventType)inFile->readUint32LE();
- switch(event.type) {
+ switch (event.type) {
case Common::EVENT_KEYDOWN:
case Common::EVENT_KEYUP:
event.kbd.keycode = (Common::KeyCode)inFile->readSint32LE();
@@ -66,7 +66,7 @@
outFile->writeUint32LE((uint32)event.type);
- switch(event.type) {
+ switch (event.type) {
case Common::EVENT_KEYDOWN:
case Common::EVENT_KEYUP:
outFile->writeSint32LE(event.kbd.keycode);
@@ -340,7 +340,7 @@
if (_hasPlaybackEvent) {
if (_playbackDiff <= (_eventCount - _lastEventCount)) {
- switch(_playbackEvent.type) {
+ switch (_playbackEvent.type) {
case Common::EVENT_MOUSEMOVE:
case Common::EVENT_LBUTTONDOWN:
case Common::EVENT_LBUTTONUP:
Modified: scummvm/trunk/common/stream.cpp
===================================================================
--- scummvm/trunk/common/stream.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/common/stream.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -202,7 +202,7 @@
assert(_pos >= _begin);
assert(_pos <= _end);
- switch(whence) {
+ switch (whence) {
case SEEK_END:
offset = size() + offset;
// fallthrough
Modified: scummvm/trunk/common/zlib.cpp
===================================================================
--- scummvm/trunk/common/zlib.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/common/zlib.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -154,7 +154,7 @@
bool seek(int32 offset, int whence = SEEK_SET) {
int32 newPos = 0;
assert(whence != SEEK_END); // SEEK_END not supported
- switch(whence) {
+ switch (whence) {
case SEEK_SET:
newPos = offset;
break;
Modified: scummvm/trunk/engines/agi/preagi_common.cpp
===================================================================
--- scummvm/trunk/engines/agi/preagi_common.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/agi/preagi_common.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -124,7 +124,7 @@
while (!shouldQuit()) {
while (_eventMan->pollEvent(event)) {
- switch(event.type) {
+ switch (event.type) {
case Common::EVENT_RTL:
case Common::EVENT_QUIT:
return 0;
Modified: scummvm/trunk/engines/agi/preagi_mickey.cpp
===================================================================
--- scummvm/trunk/engines/agi/preagi_mickey.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/agi/preagi_mickey.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -295,7 +295,7 @@
int iWord;
int *sel = 0;
- switch(iRow) {
+ switch (iRow) {
case 0:
if (y != IDI_MSA_ROW_MENU_0) return;
sel = sel0;
@@ -323,7 +323,7 @@
int x, y;
int goIndex = -1, northIndex = -1, southIndex = -1, eastIndex = -1, westIndex = -1;
- switch(iRow) {
+ switch (iRow) {
case 0:
sel = sel0;
break;
@@ -361,7 +361,7 @@
while (!_vm->shouldQuit()) {
while (_vm->_system->getEventManager()->pollEvent(event)) {
- switch(event.type) {
+ switch (event.type) {
case Common::EVENT_RTL:
case Common::EVENT_QUIT:
return 0;
@@ -679,7 +679,7 @@
uint8 *buffer = new uint8[1024];
int pBuf = 1;
- switch(iSound) {
+ switch (iSound) {
case IDI_MSA_SND_XL30:
for (int iNote = 0; iNote < 6; iNote++) {
note.counter = _vm->rnd(59600) + 59;
@@ -701,7 +701,7 @@
if (iSound == IDI_MSA_SND_THEME) {
while (_vm->_system->getEventManager()->pollEvent(event)) {
- switch(event.type) {
+ switch (event.type) {
case Common::EVENT_RTL:
case Common::EVENT_QUIT:
case Common::EVENT_LBUTTONUP:
@@ -769,7 +769,7 @@
0xF0, 1, 0xF9, 2, 43, 45, 0xFF
};
- switch(_game.iRoom) {
+ switch (_game.iRoom) {
case IDI_MSA_PIC_EARTH_SHIP:
case IDI_MSA_PIC_VENUS_SHIP:
case IDI_MSA_PIC_NEPTUNE_SHIP:
@@ -835,7 +835,7 @@
// draw crystal
if (_game.iRoom == IDI_MSA_XTAL_ROOM_XY[_game.iPlanet][0]) {
if (!_game.fHasXtal) {
- switch(_game.iPlanet) {
+ switch (_game.iPlanet) {
case IDI_MSA_PLANET_VENUS:
if (_game.iRmMenu[_game.iRoom] != 2)
break;
@@ -1488,7 +1488,7 @@
}
bool Mickey::parse(int cmd, int arg) {
- switch(cmd) {
+ switch (cmd) {
// BASIC
@@ -2211,7 +2211,7 @@
while (!_vm->shouldQuit()) {
while (_vm->_system->getEventManager()->pollEvent(event)) {
- switch(event.type) {
+ switch (event.type) {
case Common::EVENT_RTL:
case Common::EVENT_QUIT:
case Common::EVENT_KEYDOWN:
Modified: scummvm/trunk/engines/agi/preagi_troll.cpp
===================================================================
--- scummvm/trunk/engines/agi/preagi_troll.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/agi/preagi_troll.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -60,7 +60,7 @@
while (!_vm->shouldQuit()) {
while (_vm->_system->getEventManager()->pollEvent(event)) {
- switch(event.type) {
+ switch (event.type) {
case Common::EVENT_RTL:
case Common::EVENT_QUIT:
return 0;
@@ -207,7 +207,7 @@
while (!_vm->shouldQuit()) {
while (_vm->_system->getEventManager()->pollEvent(event)) {
- switch(event.type) {
+ switch (event.type) {
case Common::EVENT_RTL:
case Common::EVENT_QUIT:
case Common::EVENT_LBUTTONUP:
@@ -285,7 +285,7 @@
while (!done && !_vm->shouldQuit()) {
getMenuSel(IDS_TRO_TUTORIAL_1, &iSel, IDI_TRO_MAX_OPTION);
- switch(iSel) {
+ switch (iSel) {
case IDI_TRO_SEL_OPTION_1:
_vm->clearScreen(0x22, false);
_vm->_gfx->doUpdate();
@@ -579,7 +579,7 @@
roomParam = _roomDescs[_roomPicture - 1].roomDescIndex[currentOption];
- switch(_roomDescs[_roomPicture - 1].optionTypes[currentOption]) {
+ switch (_roomDescs[_roomPicture - 1].optionTypes[currentOption]) {
case OT_FLASHLIGHT:
if (!haveFlashlight) {
printUserMessage(13);
Modified: scummvm/trunk/engines/agi/preagi_winnie.cpp
===================================================================
--- scummvm/trunk/engines/agi/preagi_winnie.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/agi/preagi_winnie.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -266,7 +266,7 @@
// extract text from block
opcode = *(buffer + pc);
- switch(opcode) {
+ switch (opcode) {
case 0:
case IDO_WTP_OPTION_0:
case IDO_WTP_OPTION_1:
@@ -331,9 +331,9 @@
}
// process selection
- switch(iSel) {
+ switch (iSel) {
case IDI_WTP_SEL_HOME:
- switch(_room) {
+ switch (_room) {
case IDI_WTP_ROOM_HOME:
case IDI_WTP_ROOM_MIST:
case IDI_WTP_ROOM_TIGGER:
@@ -384,7 +384,7 @@
// process script
do {
opcode = *(buffer + pc++);
- switch(opcode) {
+ switch (opcode) {
case IDO_WTP_GOTO_ROOM:
opcode = *(buffer + pc++);
iNewRoom = opcode;
@@ -726,7 +726,7 @@
if (fCanSel[IDI_WTP_SEL_DROP])
_vm->drawStr(IDI_WTP_ROW_OPTION_4, IDI_WTP_COL_DROP, IDA_DEFAULT, IDS_WTP_DROP);
- switch(iSel) {
+ switch (iSel) {
case IDI_WTP_SEL_OPT_1:
case IDI_WTP_SEL_OPT_2:
case IDI_WTP_SEL_OPT_3:
@@ -778,7 +778,7 @@
}
void Winnie::getMenuMouseSel(int *iSel, int fCanSel[], int x, int y) {
- switch(y) {
+ switch (y) {
case IDI_WTP_ROW_OPTION_1:
case IDI_WTP_ROW_OPTION_2:
case IDI_WTP_ROW_OPTION_3:
@@ -816,7 +816,7 @@
while (!_vm->shouldQuit()) {
while (_vm->_system->getEventManager()->pollEvent(event)) {
- switch(event.type) {
+ switch (event.type) {
case Common::EVENT_RTL:
case Common::EVENT_QUIT:
return;
@@ -865,7 +865,7 @@
_vm->_gfx->setCursorPalette(false);
}
- switch(*iSel) {
+ switch (*iSel) {
case IDI_WTP_SEL_OPT_1:
case IDI_WTP_SEL_OPT_2:
case IDI_WTP_SEL_OPT_3:
@@ -970,7 +970,7 @@
makeSel();
break;
case Common::KEYCODE_RETURN:
- switch(*iSel) {
+ switch (*iSel) {
case IDI_WTP_SEL_OPT_1:
case IDI_WTP_SEL_OPT_2:
case IDI_WTP_SEL_OPT_3:
@@ -1036,7 +1036,7 @@
while (!_vm->shouldQuit()) {
for (iBlock = 0; iBlock < IDI_WTP_MAX_BLOCK; iBlock++) {
- switch(parser(hdr.ofsBlock[iBlock] - _roomOffset, iBlock, roomdata)) {
+ switch (parser(hdr.ofsBlock[iBlock] - _roomOffset, iBlock, roomdata)) {
case IDI_WTP_PAR_GOTO:
goto phase0;
break;
Modified: scummvm/trunk/engines/agos/event.cpp
===================================================================
--- scummvm/trunk/engines/agos/event.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/agos/event.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -695,7 +695,7 @@
if (_variableArray[110] > 2)
break;
n = _rnd.getRandomNumber(6);
- switch(n) {
+ switch (n) {
case(0): loadSoundFile("And01.wav");break;
case(1): loadSoundFile("And02.wav");break;
case(2): loadSoundFile("And03.wav");break;
@@ -710,7 +710,7 @@
if (_variableArray[111] > 2)
break;
n = _rnd.getRandomNumber(6);
- switch(n) {
+ switch (n) {
case(0): loadSoundFile("And08.wav");break;
case(1): loadSoundFile("And09.wav");break;
case(2): loadSoundFile("And0a.wav");break;
@@ -725,7 +725,7 @@
if (_variableArray[112] > 2)
break;
n = _rnd.getRandomNumber(4);
- switch(n) {
+ switch (n) {
case(0): loadSoundFile("And0f.wav");break;
case(1): loadSoundFile("And0g.wav");break;
case(2): loadSoundFile("And0h.wav");break;
Modified: scummvm/trunk/engines/agos/string_pn.cpp
===================================================================
--- scummvm/trunk/engines/agos/string_pn.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/agos/string_pn.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -23,8 +23,6 @@
*
*/
-
-
#include "agos/agos.h"
#include "agos/intern.h"
@@ -34,7 +32,7 @@
uint32 b = base;
int ct = n;
while (ct) {
- while(_textBase[b++])
+ while (_textBase[b++])
;
ct--;
}
Modified: scummvm/trunk/engines/draci/game.cpp
===================================================================
--- scummvm/trunk/engines/draci/game.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/draci/game.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -299,7 +299,7 @@
}
}
- if(_vm->_mouse->isCursorOn()) {
+ if (_vm->_mouse->isCursorOn()) {
// Fetch the dedicated objects' title animation / current frame
Animation *titleAnim = _vm->_anims->getAnimation(kTitleText);
Text *title = reinterpret_cast<Text *>(titleAnim->getFrame());
@@ -787,7 +787,7 @@
_dialogueBegin = false;
oldLines = _dialogueLinesNum;
- } while(!_dialogueExit);
+ } while (!_dialogueExit);
dialogueDone();
_currentDialogue = kNoDialogue;
@@ -1562,7 +1562,7 @@
// such resizing step, it checks some select points on the ellipse for walkability.
// It also does the same check for the ellipse perpendicular to it (rotated by 90 degrees).
- while(1) {
+ while (1) {
// The default major radius
radius += _deltaX;
Modified: scummvm/trunk/engines/draci/script.cpp
===================================================================
--- scummvm/trunk/engines/draci/script.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/draci/script.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -369,7 +369,7 @@
GameObject *obj = _vm->_game->getObject(objID);
// If the animation is already loaded, return
- for(i = 0; i < obj->_anims.size(); ++i) {
+ for (i = 0; i < obj->_anims.size(); ++i) {
if (obj->_anims[i] == animID) {
return;
}
@@ -384,7 +384,7 @@
// Care must be taken to store them sorted (increasing order) as some things
// depend on this.
- for(i = 0; i < obj->_anims.size(); ++i) {
+ for (i = 0; i < obj->_anims.size(); ++i) {
if (obj->_anims[i] > animID) {
break;
}
Modified: scummvm/trunk/engines/gob/draw_playtoons.cpp
===================================================================
--- scummvm/trunk/engines/gob/draw_playtoons.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/gob/draw_playtoons.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -151,7 +151,7 @@
break;
case DRAW_PUTPIXEL:
- switch(_pattern & 0xFF) {
+ switch (_pattern & 0xFF) {
case -1:
warning("oPlaytoons_spriteOperation: operation DRAW_PUTPIXEL, pattern -1");
break;
@@ -180,7 +180,7 @@
_destSpriteY + (_pattern + 1) / 2);
break;
case DRAW_FILLRECT:
- switch(_pattern & 0xFF) {
+ switch (_pattern & 0xFF) {
case 1:
case 2:
case 3:
@@ -217,7 +217,7 @@
_destSpriteX + 1, _destSpriteY + 1,
_spriteRight + 1, _spriteBottom + 1, _frontColor);
} else {
- switch(_pattern & 0xFF) {
+ switch (_pattern & 0xFF) {
case 0:
_vm->_video->drawLine(*_spritesArray[_destSurface],
_destSpriteX, _destSpriteY,
Modified: scummvm/trunk/engines/gob/inter.h
===================================================================
--- scummvm/trunk/engines/gob/inter.h 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/gob/inter.h 2009-09-30 16:16:53 UTC (rev 44495)
@@ -199,7 +199,7 @@
bool o1_callSub(OpFuncParams ¶ms);
bool o1_printTotText(OpFuncParams ¶ms);
bool o1_loadCursor(OpFuncParams ¶ms);
- bool o1_switch(OpFuncParams ¶ms);
+ bool o1_switch (OpFuncParams ¶ms);
bool o1_repeatUntil(OpFuncParams ¶ms);
bool o1_whileDo(OpFuncParams ¶ms);
bool o1_if(OpFuncParams ¶ms);
Modified: scummvm/trunk/engines/gob/inter_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v1.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/gob/inter_v1.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -722,7 +722,7 @@
return false;
}
-bool Inter_v1::o1_switch(OpFuncParams ¶ms) {
+bool Inter_v1::o1_switch (OpFuncParams ¶ms) {
uint32 offset;
checkSwitchTable(offset);
Modified: scummvm/trunk/engines/gob/sound/adlib.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/adlib.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/gob/sound/adlib.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -610,7 +610,7 @@
do {
instr = *_playPos;
// printf("instr 0x%X\n", instr);
- switch(instr) {
+ switch (instr) {
case 0xF8:
_wait = *(_playPos++);
break;
@@ -640,7 +640,7 @@
}
channel = (int)(instr & 0x0f);
- switch(instr & 0xf0) {
+ switch (instr & 0xf0) {
case 0x90:
note = *(_playPos++);
volume = *(_playPos++);
Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -279,7 +279,7 @@
quitGame();
}
} else {
- switch(event.kbd.keycode) {
+ switch (event.kbd.keycode) {
case Common::KEYCODE_SPACE:
keys = 61;
break;
Modified: scummvm/trunk/engines/kyra/scene_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_lol.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/kyra/scene_lol.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -1405,7 +1405,7 @@
}
int LoLEngine::smoothScrollDrawSpecialGuiShape(int pageNum) {
- if(!_specialGuiShape)
+ if (!_specialGuiShape)
return 0;
_screen->clearGuiShapeMemory(pageNum);
Modified: scummvm/trunk/engines/kyra/sequences_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_lol.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/kyra/sequences_lol.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -714,7 +714,7 @@
if (!(shouldQuit() || inputFlag)) {
_sound->voicePlay("star2", &_speechHandle);
- while(_sound->voiceIsPlaying(&_speechHandle) && !(shouldQuit() || inputFlag)) {
+ while (_sound->voiceIsPlaying(&_speechHandle) && !(shouldQuit() || inputFlag)) {
inputFlag = checkInput(0) & 0xff;
delay(_tickLength);
}
Modified: scummvm/trunk/engines/m4/converse.cpp
===================================================================
--- scummvm/trunk/engines/m4/converse.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/m4/converse.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -235,7 +235,7 @@
}
void ConversationView::updateState() {
- switch(_conversationState) {
+ switch (_conversationState) {
case kConversationOptionsShown:
return;
case kEntryIsActive:
@@ -412,7 +412,7 @@
if (convS->eos()) break;
if (debugFlag) printf("***** Pos: %i -> ", chunkPos);
- switch(chunk) {
+ switch (chunk) {
case CHUNK_DECL: // Declare
if (debugFlag) printf("DECL chunk\n");
data = convS->readUint32LE();
Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -572,7 +572,7 @@
uint16 actionType = ACTIONTYPE(z);
debugC(3, kDebugExec, "actionType = %x, itemType = %x", actionType, ITEMTYPE(z));
- switch(actionType) {
+ switch (actionType) {
case kZoneExamine:
enterCommentMode(z);
Modified: scummvm/trunk/engines/parallaction/parallaction_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_br.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/parallaction/parallaction_br.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -134,7 +134,7 @@
bool c = true;
_input->stopHovering();
- switch(event) {
+ switch (event) {
case kEvIngameMenu:
startIngameMenu();
c = false;
Modified: scummvm/trunk/engines/parallaction/parallaction_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_ns.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/parallaction/parallaction_ns.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -256,7 +256,7 @@
bool c = true;
_input->stopHovering();
- switch(event) {
+ switch (event) {
case kEvSaveGame:
_saveLoad->saveGame();
break;
Modified: scummvm/trunk/engines/saga/isomap.cpp
===================================================================
--- scummvm/trunk/engines/saga/isomap.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/saga/isomap.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -1067,7 +1067,7 @@
memset(terraComp, 0, 8 * sizeof(uint16));
#define FILL_MASK(index, testMask) \
- if ( mask & testMask) { \
+ if (mask & testMask) { \
terraComp[index] |= fgdMask; \
} \
if (~mask & testMask) { \
@@ -1370,7 +1370,7 @@
tile = getTile(u1, v1, _platformHeight );
if (tile != NULL) {
mask = tile->terrainMask;
- if ( ((mask != 0) && (tile->GetFGDAttr() >= kTerrBlock)) ||
+ if (((mask != 0) && (tile->GetFGDAttr() >= kTerrBlock)) ||
((mask != 0xFFFF) && (tile->GetBGDAttr() >= kTerrBlock)) ) {
pcell->visited = 1;
}
Modified: scummvm/trunk/engines/saga/saga.cpp
===================================================================
--- scummvm/trunk/engines/saga/saga.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/saga/saga.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -169,7 +169,7 @@
if (_readingSpeed > 3)
_readingSpeed = 0;
- switch(getGameId()) {
+ switch (getGameId()) {
case GID_ITE:
_resource = new Resource_RSC(this);
break;
Modified: scummvm/trunk/engines/sci/engine/ksound.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/ksound.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/sci/engine/ksound.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -1003,7 +1003,7 @@
* Used for synthesized music playback
*/
reg_t kDoSound(EngineState *s, int argc, reg_t *argv) {
- switch(s->detectDoSoundType()) {
+ switch (s->detectDoSoundType()) {
case SCI_VERSION_0_EARLY:
return kDoSoundSci0(s, argc, argv);
case SCI_VERSION_1_EARLY:
Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -545,7 +545,7 @@
int seeker_size = READ_LE_UINT16(buf + 2);
assert(seeker_size > 0);
buf += seeker_size;
- } while(1);
+ } while (1);
return NULL;
}
Modified: scummvm/trunk/engines/sci/engine/state.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/state.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/sci/engine/state.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -271,7 +271,7 @@
if (!parse_reg_t(this, "?Sound", &soundClass)) {
int sum = methodChecksum(soundClass, _kernel->_selectorCache.play, -6, 6);
- switch(sum) {
+ switch (sum) {
case 0x1B2: // SCI0
case 0x1AE: // SCI01
_doSoundType = SCI_VERSION_0_EARLY;
Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/sci/engine/vm.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -403,7 +403,7 @@
sendCalls.push(call);
break;
- } // switch(lookup_selector())
+ } // switch (lookup_selector())
framesize -= (2 + argc);
argp += argc + 1;
@@ -1410,7 +1410,7 @@
default:
error("run_vm(): illegal opcode %x", opnumber);
- } // switch(opcode >> 1)
+ } // switch (opcode >> 1)
if (s->_executionStackPosChanged) // Force initialization
scriptState.xs = xs_new;
Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/sci/resource.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -1532,7 +1532,7 @@
Resource *res = findResource(ResourceId(kResourceTypeView, i), 0);
if (res) {
- switch(res->data[1]) {
+ switch (res->data[1]) {
case 128:
// If the 2nd byte is 128, it's a VGA game
return kViewVga;
Modified: scummvm/trunk/engines/sci/sfx/core.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/core.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/sci/sfx/core.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -226,7 +226,7 @@
Common::Error SfxPlayer::init(ResourceManager *resMan, int expected_latency) {
MidiDriverType musicDriver = MidiDriver::detectMusicDriver(MDT_PCSPK | MDT_ADLIB);
- switch(musicDriver) {
+ switch (musicDriver) {
case MD_ADLIB:
_mididrv = new MidiPlayer_Adlib();
break;
Modified: scummvm/trunk/engines/scumm/player_v2cms.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_v2cms.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/scumm/player_v2cms.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -320,7 +320,7 @@
saa->noise[ch].counter -= saa->noise[ch].freq;
while (saa->noise[ch].counter < 0) {
saa->noise[ch].counter += _sampleRate;
- if( ((saa->noise[ch].level & 0x4000) == 0) == ((saa->noise[ch].level & 0x0040) == 0) )
+ if (((saa->noise[ch].level & 0x4000) == 0) == ((saa->noise[ch].level & 0x0040) == 0) )
saa->noise[ch].level = (saa->noise[ch].level << 1) | 1;
else
saa->noise[ch].level <<= 1;
Modified: scummvm/trunk/engines/sky/logic.cpp
===================================================================
--- scummvm/trunk/engines/sky/logic.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/sky/logic.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -23,7 +23,6 @@
*
*/
-
#include "common/endian.h"
#include "common/rect.h"
#include "common/events.h"
@@ -1918,7 +1917,7 @@
uint32 menuLength = 0;
for (i = firstObject; i < firstObject + ARRAYSIZE(_objectList); i++) {
- if ( _scriptVariables[i] )
+ if (_scriptVariables[i])
_objectList[menuLength++] = _scriptVariables[i];
}
_scriptVariables[MENU_LENGTH] = menuLength;
Modified: scummvm/trunk/engines/sword1/control.cpp
===================================================================
--- scummvm/trunk/engines/sword1/control.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/sword1/control.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -1032,7 +1032,7 @@
dst[cntx] = sprData[cntx];
}
- if(SwordEngine::isPsx()) { //On PSX version we need to double horizontal lines
+ if (SwordEngine::isPsx()) { //On PSX version we need to double horizontal lines
dst += SCREEN_WIDTH;
for (uint16 cntx = 0; cntx < _resMan->getUint16(chSpr->width); cntx++)
if (sprData[cntx])
@@ -1074,7 +1074,7 @@
for (uint16 cnty = 0; cnty < barHeight; cnty++) {
memcpy(destMem, srcMem, _resMan->getUint16(frHead->width));
- if(SwordEngine::isPsx()) { //linedoubling
+ if (SwordEngine::isPsx()) { //linedoubling
destMem += SCREEN_WIDTH;
memcpy(destMem, srcMem, _resMan->getUint16(frHead->width));
}
Modified: scummvm/trunk/engines/sword1/logic.cpp
===================================================================
--- scummvm/trunk/engines/sword1/logic.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/sword1/logic.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -23,7 +23,6 @@
*
*/
-
#include "common/endian.h"
#include "common/util.h"
#include "common/system.h"
@@ -114,7 +113,7 @@
}
// work around, at screen 69 in psx version TOP menu gets stuck at disabled, fix it at next screen (71)
- if( (screen == 71) && (SwordEngine::isPsx()))
+ if ((screen == 71) && (SwordEngine::isPsx()))
_scriptVars[TOP_MENU_DISABLED] = 0;
if (SwordEngine::_systemVars.justRestoredGame) { // if we've just restored a game - we want George to be exactly as saved
Modified: scummvm/trunk/engines/sword1/mouse.cpp
===================================================================
--- scummvm/trunk/engines/sword1/mouse.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/sword1/mouse.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -23,7 +23,6 @@
*
*/
-
#include "common/system.h"
#include "graphics/cursorman.h"
@@ -245,7 +244,7 @@
if (luggSrc[cntx])
dstData[cntx] = luggSrc[cntx];
- if(SwordEngine::isPsx()) {
+ if (SwordEngine::isPsx()) {
dstData += resSizeX;
for (uint32 cntx = 0; cntx < luggSizeX; cntx++)
if (luggSrc[cntx])
@@ -267,7 +266,7 @@
if (srcData[cntx])
dstData[cntx] = srcData[cntx];
- if(SwordEngine::isPsx()) {
+ if (SwordEngine::isPsx()) {
dstData +=resSizeX;
for (uint32 cntx = 0; cntx < ptrSizeX; cntx++)
if (srcData[cntx])
Modified: scummvm/trunk/engines/sword1/router.cpp
===================================================================
--- scummvm/trunk/engines/sword1/router.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/sword1/router.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -705,7 +705,7 @@
if (lastDir != currentDir) {
// get the direction to turn
turnDir = currentDir - lastDir;
- if ( turnDir < 0)
+ if (turnDir < 0)
turnDir += NO_DIRECTIONS;
if (turnDir > 4)
@@ -716,7 +716,7 @@
// rotate to new walk direction
// for george and nico put in a head turn at the start
if ((megaId == GEORGE) || (megaId == NICO)) {
- if ( turnDir < 0) { // new frames for turn frames 29oct95jps
+ if (turnDir < 0) { // new frames for turn frames 29oct95jps
module = turnFramesLeft + lastDir;
} else {
module = turnFramesRight + lastDir;
@@ -732,12 +732,12 @@
// rotate till were facing new dir then go back 45 degrees
while (lastDir != currentDir) {
lastDir += turnDir;
- if ( turnDir < 0) { // new frames for turn frames 29oct95jps
- if ( lastDir < 0)
+ if (turnDir < 0) { // new frames for turn frames 29oct95jps
+ if (lastDir < 0)
lastDir += NO_DIRECTIONS;
module = turnFramesLeft + lastDir;
} else {
- if ( lastDir > 7)
+ if (lastDir > 7)
lastDir -= NO_DIRECTIONS;
module = turnFramesRight + lastDir;
}
@@ -926,7 +926,7 @@
} else if (_targetDir != lastRealDir) { // rotate to _targetDir
// rotate to target direction
turnDir = _targetDir - lastRealDir;
- if ( turnDir < 0)
+ if (turnDir < 0)
turnDir += NO_DIRECTIONS;
if (turnDir > 4)
@@ -937,7 +937,7 @@
// rotate to target direction
// for george and nico put in a head turn at the start
if ((megaId == GEORGE) || (megaId == NICO)) {
- if ( turnDir < 0) { // new frames for turn frames 29oct95jps
+ if (turnDir < 0) { // new frames for turn frames 29oct95jps
module = turnFramesLeft + lastDir;
} else {
module = turnFramesRight + lastDir;
@@ -953,12 +953,12 @@
// rotate if we need to
while (lastRealDir != _targetDir) {
lastRealDir += turnDir;
- if ( turnDir < 0) { // new frames for turn frames 29oct95jps
- if ( lastRealDir < 0)
+ if (turnDir < 0) { // new frames for turn frames 29oct95jps
+ if (lastRealDir < 0)
lastRealDir += NO_DIRECTIONS;
module = turnFramesLeft + lastRealDir;
} else {
- if ( lastRealDir > 7)
+ if (lastRealDir > 7)
lastRealDir -= NO_DIRECTIONS;
module = turnFramesRight + lastRealDir;
}
@@ -1123,7 +1123,7 @@
if (lastDir != currentDir) {
// get the direction to turn
turnDir = currentDir - lastDir;
- if ( turnDir < 0)
+ if (turnDir < 0)
turnDir += NO_DIRECTIONS;
if (turnDir > 4)
@@ -1134,7 +1134,7 @@
// rotate to new walk direction
// for george and nico put in a head turn at the start
if ((megaId == GEORGE) || (megaId == NICO)) {
- if ( turnDir < 0) { // new frames for turn frames 29oct95jps
+ if (turnDir < 0) { // new frames for turn frames 29oct95jps
module = turnFramesLeft + lastDir;
} else {
module = turnFramesRight + lastDir;
@@ -1150,12 +1150,12 @@
// rotate till were facing new dir then go back 45 degrees
while (lastDir != currentDir) {
lastDir += turnDir;
- if ( turnDir < 0) { // new frames for turn frames 29oct95jps
- if ( lastDir < 0)
+ if (turnDir < 0) { // new frames for turn frames 29oct95jps
+ if (lastDir < 0)
lastDir += NO_DIRECTIONS;
module = turnFramesLeft + lastDir;
} else {
- if ( lastDir > 7)
+ if (lastDir > 7)
lastDir -= NO_DIRECTIONS;
module = turnFramesRight + lastDir;
}
@@ -2125,9 +2125,9 @@
int signY = (deltaY > 0);
int slope;
- if ( (ABS(deltaY) * DIAGONALX ) < (ABS(deltaX) * DIAGONALY / 2))
+ if ((ABS(deltaY) * DIAGONALX ) < (ABS(deltaX) * DIAGONALY / 2))
slope = 0;// its flat
- else if ( (ABS(deltaY) * DIAGONALX / 2) > (ABS(deltaX) * DIAGONALY ) )
+ else if ((ABS(deltaY) * DIAGONALX / 2) > (ABS(deltaX) * DIAGONALY ) )
slope = 2;// its vertical
else
slope = 1;// its diagonal
Modified: scummvm/trunk/engines/sword1/screen.cpp
===================================================================
--- scummvm/trunk/engines/sword1/screen.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/sword1/screen.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -373,7 +373,7 @@
uint8 *src = _layerBlocks[0];
uint8 *dest = _screenBuf;
- if(SwordEngine::isPsx()) {
+ if (SwordEngine::isPsx()) {
if (!_psxCache.decodedBackground)
_psxCache.decodedBackground = psxShrinkedBackgroundToIndexed(_layerBlocks[0], _scrnSizeX, _scrnSizeY);
memcpy(_screenBuf, _psxCache.decodedBackground, _scrnSizeX * _scrnSizeY);
@@ -398,7 +398,7 @@
} else if (!(SwordEngine::isPsx())) {
memcpy(_screenBuf, _layerBlocks[0], _scrnSizeX * _scrnSizeY);
} else { //We are using PSX version
- if(_currentScreen == 45 || _currentScreen == 55 ||
+ if (_currentScreen == 45 || _currentScreen == 55 ||
_currentScreen == 57 || _currentScreen == 63 || _currentScreen == 71) { // Width shrinked backgrounds
if (!_psxCache.decodedBackground)
_psxCache.decodedBackground = psxShrinkedBackgroundToIndexed(_layerBlocks[0], _scrnSizeX, _scrnSizeY);
@@ -426,7 +426,7 @@
renderParallax(_parallax[1]);
// PSX version has parallax layer for this room in an external file (TRAIN.PLX)
- if(SwordEngine::isPsx() && _currentScreen == 63) {
+ if (SwordEngine::isPsx() && _currentScreen == 63) {
// FIXME: this should be handled in a cleaner way...
if (!_psxCache.extPlxCache) {
Common::File parallax;
@@ -493,7 +493,7 @@
uint16 sprSizeX, sprSizeY;
if (compact->o_status & STAT_SHRINK) {
memset(_shrinkBuffer, 0, SHRINK_BUFFER_SIZE); //Clean shrink buffer to avoid corruption
- if( SwordEngine::isPsx() && (compact->o_resource != GEORGE_MEGA)) { //PSX Height shrinked sprites
+ if (SwordEngine::isPsx() && (compact->o_resource != GEORGE_MEGA)) { //PSX Height shrinked sprites
sprSizeX = (scale * _resMan->readUint16(&frameHead->width)) / 256;
sprSizeY = (scale * (_resMan->readUint16(&frameHead->height))) / 256 / 2;
fastShrink(sprData, _resMan->readUint16(&frameHead->width), (_resMan->readUint16(&frameHead->height)) / 2, scale, _shrinkBuffer);
@@ -509,7 +509,7 @@
sprData = _shrinkBuffer;
} else {
sprSizeX = _resMan->readUint16(&frameHead->width);
- if(SwordEngine::isPsx()) { //PSX sprites are half height
+ if (SwordEngine::isPsx()) { //PSX sprites are half height
sprSizeY = _resMan->readUint16(&frameHead->height) / 2;
} else
sprSizeY = (_resMan->readUint16(&frameHead->height));
@@ -537,7 +537,7 @@
spriteClipAndSet(&spriteX, &spriteY, &sprSizeX, &sprSizeY, &incr);
if ((sprSizeX > 0) && (sprSizeY > 0)) {
- if( (!(SwordEngine::isPsx()) || (compact->o_type == TYPE_TEXT)
+ if ((!(SwordEngine::isPsx()) || (compact->o_type == TYPE_TEXT)
|| (compact->o_resource == LVSFLY) || (!(compact->o_resource == GEORGE_MEGA) && (sprSizeX < 260))))
drawSprite(sprData + incr, spriteX, spriteY, sprSizeX, sprSizeY, sprPitch);
else if (((sprSizeX >= 260) && (sprSizeX < 450)) || ((compact->o_resource == GMWRITH) && (sprSizeX < 515)) // a psx shrinked sprite (1/2 width)
@@ -666,7 +666,7 @@
} else
paraScrlY = 0;
- if(SwordEngine::isPsx())
+ if (SwordEngine::isPsx())
drawPsxParallax(data, paraScrlX, scrnScrlX, scrnWidth);
else
for (uint16 cnty = 0; cnty < scrnHeight; cnty++) {
@@ -867,7 +867,7 @@
for (uint32 currentTile = 0; currentTile < totTiles; currentTile++) {
uint32 tileOffset = READ_LE_UINT32(psxBackground + 4 * currentTile);
- if(isCompressed)
+ if (isCompressed)
decompressHIF(psxBackground + tileOffset - 4, decomp_tile); //Decompress the tile into decomp_tile
else
memcpy(decomp_tile, psxBackground + tileOffset - 4, 16*16);
@@ -911,7 +911,7 @@
for (currentTile = 0; currentTile < totTiles; currentTile++) {
uint32 tileOffset = READ_LE_UINT32(psxBackground + 4 * currentTile);
- if(isCompressed)
+ if (isCompressed)
decompressHIF(psxBackground + tileOffset - 4, decomp_tile); //Decompress the tile into decomp_tile
else
memcpy(decomp_tile, psxBackground + tileOffset - 4, 16 * 16);
@@ -949,7 +949,7 @@
for (; currentTile < totTiles + remainingTiles; currentTile++) {
uint32 tileOffset = READ_LE_UINT32(psxBackground + 4 * currentTile);
- if(isCompressed)
+ if (isCompressed)
decompressHIF(psxBackground + tileOffset - 4, decomp_tile); //Decompress the tile into decomp_tile
else
memcpy(decomp_tile, psxBackground + tileOffset - 4, 256);
@@ -1101,7 +1101,7 @@
if (info_word == 0xFFFF) return; //Got 0xFFFF code, finished.
int32 repeat_count = (info_word >> 12) + 2; //How many time data needs to be refetched
- while(repeat_count >= 0) {
+ while (repeat_count >= 0) {
uint8 *old_data_src = dest - ((info_word & 0xFFF) + 1);
*dest++ = *old_data_src;
repeat_count--;
@@ -1187,7 +1187,7 @@
uint16 gridH = (*pSprHeight + (sprY & (SCRNGRID_Y - 1)) + (SCRNGRID_Y - 1)) / SCRNGRID_Y;
uint16 gridW = (*pSprWidth + (sprX & (SCRNGRID_X - 1)) + (SCRNGRID_X - 1)) / SCRNGRID_X;
- if(SwordEngine::isPsx()) {
+ if (SwordEngine::isPsx()) {
gridH *= 2; // This will correct the PSX sprite being cut at half height
gridW *= 2; // and masking problems when sprites are stretched in width
@@ -1225,7 +1225,7 @@
uint8 frame[40 * 40];
int i, j;
- if(SwordEngine::isPsx())
+ if (SwordEngine::isPsx())
memset(frame, 0, sizeof(frame)); // PSX top menu is black
else
memset(frame, 199, sizeof(frame)); // Dark gray background
Modified: scummvm/trunk/engines/sword1/text.cpp
===================================================================
--- scummvm/trunk/engines/sword1/text.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/sword1/text.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -106,7 +106,7 @@
for (uint16 pos = 0; pos < lines[lineCnt].length; pos++)
sprPtr += copyChar(*text++, sprPtr, sprWidth, pen) - OVERLAP;
text++; // skip space at the end of the line
- if(SwordEngine::isPsx()) //Chars are half height in psx version
+ if (SwordEngine::isPsx()) //Chars are half height in psx version
linePtr += (_charHeight / 2) * sprWidth;
else
linePtr += _charHeight * sprWidth;
@@ -136,7 +136,7 @@
text++;
wordWidth += OVERLAP; // no overlap on final letter of word!
- if ( firstWord ) { // first word on first line, so no separating SPACE needed
+ if (firstWord) { // first word on first line, so no separating SPACE needed
line[0].width = wordWidth;
line[0].length = wordLength;
firstWord = false;
@@ -167,9 +167,9 @@
uint8 *decChr;
uint16 frameHeight = 0;
- if(SwordEngine::isPsx()) {
+ if (SwordEngine::isPsx()) {
frameHeight = _resMan->getUint16(chFrame->height)/2;
- if(_fontId == CZECH_GAME_FONT) { //Czech game fonts are compressed
+ if (_fontId == CZECH_GAME_FONT) { //Czech game fonts are compressed
decBuf = (uint8*) malloc((_resMan->getUint16(chFrame->width))*(_resMan->getUint16(chFrame->height)/2));
Screen::decompressHIF(chData, decBuf);
decChr = decBuf;
Modified: scummvm/trunk/engines/sword2/maketext.cpp
===================================================================
--- scummvm/trunk/engines/sword2/maketext.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/sword2/maketext.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -325,7 +325,7 @@
frame_head.read(charBuf);
- if(Sword2Engine::isPsx())
+ if (Sword2Engine::isPsx())
free(charBuf);
_vm->_resman->closeResource(fontRes);
@@ -353,7 +353,7 @@
frame_head.read(charbuf);
- if(Sword2Engine::isPsx())
+ if (Sword2Engine::isPsx())
free(charbuf);
_vm->_resman->closeResource(fontRes);
Modified: scummvm/trunk/engines/sword2/palette.cpp
===================================================================
--- scummvm/trunk/engines/sword2/palette.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/sword2/palette.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -50,7 +50,7 @@
// Don't fetch palette match table while using PSX version,
// because it is not present.
- if(!Sword2Engine::isPsx())
+ if (!Sword2Engine::isPsx())
memcpy(_paletteMatch, _vm->fetchPaletteMatchTable(screenFile), PALTABLESIZE);
setPalette(0, 256, _vm->fetchPalette(screenFile), RDPAL_FADE);
Modified: scummvm/trunk/engines/sword2/protocol.cpp
===================================================================
--- scummvm/trunk/engines/sword2/protocol.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/sword2/protocol.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -43,7 +43,7 @@
byte *Sword2Engine::fetchPalette(byte *screenFile) {
byte *palette;
- if(isPsx()) { // PSX version doesn't have a "MultiScreenHeader", instead there's a ScreenHeader and a tag
+ if (isPsx()) { // PSX version doesn't have a "MultiScreenHeader", instead there's a ScreenHeader and a tag
palette = screenFile + ResHeader::size() + ScreenHeader::size() + 2;
} else {
MultiScreenHeader mscreenHeader;
Modified: scummvm/trunk/engines/sword2/render.cpp
===================================================================
--- scummvm/trunk/engines/sword2/render.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/sword2/render.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -618,7 +618,7 @@
if (!(remLines && posY == _yBlocks[_layer] - 1))
remLines = 32;
- for(j = 0; j < remLines; j++) {
+ for (j = 0; j < remLines; j++) {
memcpy(tileChunk + j * BLOCKWIDTH * 2, parallax + stripeOffset + j * BLOCKWIDTH, BLOCKWIDTH);
memcpy(tileChunk + j * BLOCKWIDTH * 2 + BLOCKWIDTH, parallax + stripeOffset + j * BLOCKWIDTH, BLOCKWIDTH);
}
@@ -728,7 +728,7 @@
block_has_data = true;
// If one of the two grouped blocks is without data, then we also have transparency
- if(!firstTilePresent || !secondTilePresent)
+ if (!firstTilePresent || !secondTilePresent)
block_is_transparent = true;
}
@@ -737,7 +737,7 @@
byte *block = data;
if (firstTilePresent) {
for (k = 0; k < 0x400; k++) {
- if ( *(block + k) == 0) {
+ if (*(block + k) == 0) {
block_is_transparent = true;
break;
}
@@ -749,7 +749,7 @@
// a second tile, check it
if (secondTilePresent && !block_is_transparent) {
for (k = 0; k < 0x400; k++) {
- if ( *(block + k) == 0) {
+ if (*(block + k) == 0) {
block_is_transparent = true;
break;
}
Modified: scummvm/trunk/engines/sword2/router.cpp
===================================================================
--- scummvm/trunk/engines/sword2/router.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/sword2/router.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -945,11 +945,11 @@
// new frames for turn frames 29oct95jps
if (turnDir < 0) {
- if ( lastDir < 0)
+ if (lastDir < 0)
lastDir += NO_DIRECTIONS;
module = _firstStandingTurnLeftFrame + lastDir;
} else {
- if ( lastDir > 7)
+ if (lastDir > 7)
lastDir -= NO_DIRECTIONS;
module = _firstStandingTurnRightFrame + lastDir;
}
@@ -1208,7 +1208,7 @@
} else if (_targetDir != lastRealDir) {
// rotate to target direction
turnDir = _targetDir - lastRealDir;
- if ( turnDir < 0)
+ if (turnDir < 0)
turnDir += NO_DIRECTIONS;
if (turnDir > 4)
Modified: scummvm/trunk/engines/sword2/sprite.cpp
===================================================================
--- scummvm/trunk/engines/sword2/sprite.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/sword2/sprite.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -279,7 +279,7 @@
}
int32 repeat_count = (info_word >> 12) + 2; // How many time data needs to be refetched
- while(repeat_count >= 0) {
+ while (repeat_count >= 0) {
uint16 refetchData = (info_word & 0xFFF) + 1;
if (refetchData > decompSize) return 0; // We have a problem here...
uint8 *old_data_src = dst - refetchData;
@@ -498,7 +498,7 @@
// Decompression and mirroring
// -----------------------------------------------------------------
if (s->type & RDSPR_NOCOMPRESSION) {
- if(Sword2Engine::isPsx()) { // PSX Uncompressed sprites
+ if (Sword2Engine::isPsx()) { // PSX Uncompressed sprites
if (s->w > 254 && !s->isText) { // We need to recompose these frames
recomposePsxSprite(s);
}
@@ -528,7 +528,7 @@
decompData = decompressHIF(s->data, tempBuf);
// Check that we correctly decompressed data
- if(!decompData)
+ if (!decompData)
return RDERR_DECOMPRESSION;
s->w = (decompData / (s->h / 2)) * 2;
@@ -568,7 +568,7 @@
uint32 decompData = decompressHIF(s->data, tempBuf);
// Check that we correctly decompressed data
- if(!decompData)
+ if (!decompData)
return RDERR_DECOMPRESSION;
s->w = (decompData / (s->h / 2));
Modified: scummvm/trunk/engines/teenagent/callbacks.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/callbacks.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/teenagent/callbacks.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -186,7 +186,7 @@
displayMessage(0x57b2);
return true;
} else {
- for(byte i = 11; i <= 27; i += 4)
+ for (byte i = 11; i <= 27; i += 4)
playSound(76, i);
playSound(56, 35);
Modified: scummvm/trunk/engines/teenagent/inventory.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/inventory.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/teenagent/inventory.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -50,7 +50,7 @@
offset[i] = items->readUint16LE();
}
- for(byte i = 0; i < 92; ++i) {
+ for (byte i = 0; i < 92; ++i) {
InventoryObject io;
uint16 obj_addr = res->dseg.get_word(0xc4a4 + i * 2);
if (obj_addr != 0)
Modified: scummvm/trunk/engines/teenagent/scene.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/scene.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/teenagent/scene.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -116,7 +116,7 @@
objects.resize(42);
walkboxes.resize(42);
- for(byte i = 0; i < 42; ++i) {
+ for (byte i = 0; i < 42; ++i) {
Common::Array<Object> &scene_objects = objects[i];
scene_objects.clear();
@@ -151,7 +151,7 @@
Common::Array<Object> &scene_objects = objects[_id - 1];
- for(uint i = 0; i < scene_objects.size(); ++i) {
+ for (uint i = 0; i < scene_objects.size(); ++i) {
Object &obj = scene_objects[i];
if (obj.enabled != 0 && obj.rect.in(point))
return &obj;
Modified: scummvm/trunk/engines/teenagent/teenagent.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/teenagent.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/teenagent/teenagent.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -134,10 +134,10 @@
Resources * res = Resources::instance();
use_hotspots.resize(42);
byte *scene_hotspots = res->dseg.ptr(0xbb87);
- for(byte i = 0; i < 42; ++i) {
+ for (byte i = 0; i < 42; ++i) {
Common::Array<UseHotspot> & hotspots = use_hotspots[i];
byte * hotspots_ptr = res->dseg.ptr(READ_LE_UINT16(scene_hotspots + i * 2));
- while(*hotspots_ptr) {
+ while (*hotspots_ptr) {
UseHotspot h;
h.load(hotspots_ptr);
hotspots_ptr += 9;
Modified: scummvm/trunk/engines/tinsel/coroutine.h
===================================================================
--- scummvm/trunk/engines/tinsel/coroutine.h 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/tinsel/coroutine.h 2009-09-30 16:16:53 UTC (rev 44495)
@@ -145,7 +145,7 @@
if (&coroParam == &nullContext) assert(!nullContext);\
if (!x) {coroParam = x = new CoroContextTag();}\
CoroContextHolder tmpHolder(coroParam);\
- switch(coroParam->_line) { case 0:;
+ switch (coroParam->_line) { case 0:;
/**
* End the code section of a coroutine.
Modified: scummvm/trunk/engines/tinsel/graphics.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/graphics.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/engines/tinsel/graphics.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -286,7 +286,7 @@
p += boxBounds.top * (fourBitClut ? sizeof(uint16) : sizeof(uint32));
for (int yp = boxBounds.top; yp <= boxBounds.bottom; ++yp, p += (fourBitClut ? sizeof(uint16) : sizeof(uint32))) {
- if(!fourBitClut) {
+ if (!fourBitClut) {
if (!transparency)
Common::copy(p + boxBounds.left, p + boxBounds.right + 1, tempDest + (SCREEN_WIDTH * (yp - boxBounds.top)));
else
Modified: scummvm/trunk/graphics/VectorRenderer.cpp
===================================================================
--- scummvm/trunk/graphics/VectorRenderer.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/graphics/VectorRenderer.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -84,26 +84,26 @@
if (!step.autoWidth) {
in_w = step.w == -1 ? area.height() : step.w;
- switch(step.xAlign) {
- case Graphics::DrawStep::kVectorAlignManual:
- if (step.x >= 0) in_x = area.left + step.x;
- else in_x = area.left + area.width() + step.x; // value relative to the opposite corner.
- break;
+ switch (step.xAlign) {
+ case Graphics::DrawStep::kVectorAlignManual:
+ if (step.x >= 0) in_x = area.left + step.x;
+ else in_x = area.left + area.width() + step.x; // value relative to the opposite corner.
+ break;
- case Graphics::DrawStep::kVectorAlignCenter:
- in_x = area.left + (area.width() / 2) - (in_w / 2);
- break;
+ case Graphics::DrawStep::kVectorAlignCenter:
+ in_x = area.left + (area.width() / 2) - (in_w / 2);
+ break;
- case Graphics::DrawStep::kVectorAlignLeft:
- in_x = area.left;
- break;
+ case Graphics::DrawStep::kVectorAlignLeft:
+ in_x = area.left;
+ break;
- case Graphics::DrawStep::kVectorAlignRight:
- in_x = area.left + area.width() - in_w;
- break;
+ case Graphics::DrawStep::kVectorAlignRight:
+ in_x = area.left + area.width() - in_w;
+ break;
- default:
- error("Vertical alignment in horizontal data.");
+ default:
+ error("Vertical alignment in horizontal data.");
}
} else {
in_x = area.left;
@@ -113,26 +113,26 @@
if (!step.autoHeight) {
in_h = step.h == -1 ? area.width() : step.h;
- switch(step.yAlign) {
- case Graphics::DrawStep::kVectorAlignManual:
- if (step.y >= 0) in_y = area.top + step.y;
- else in_y = area.top + area.height() + step.y; // relative
- break;
+ switch (step.yAlign) {
+ case Graphics::DrawStep::kVectorAlignManual:
+ if (step.y >= 0) in_y = area.top + step.y;
+ else in_y = area.top + area.height() + step.y; // relative
+ break;
- case Graphics::DrawStep::kVectorAlignCenter:
- in_y = area.top + (area.height() / 2) - (in_h / 2);
- break;
+ case Graphics::DrawStep::kVectorAlignCenter:
+ in_y = area.top + (area.height() / 2) - (in_h / 2);
+ break;
- case Graphics::DrawStep::kVectorAlignTop:
- in_y = area.top;
- break;
+ case Graphics::DrawStep::kVectorAlignTop:
+ in_y = area.top;
+ break;
- case Graphics::DrawStep::kVectorAlignBottom:
- in_y = area.top + area.height() - in_h;
- break;
+ case Graphics::DrawStep::kVectorAlignBottom:
+ in_y = area.top + area.height() - in_h;
+ break;
- default:
- error("Horizontal alignment in vertical data.");
+ default:
+ error("Horizontal alignment in vertical data.");
}
} else {
in_y = area.top;
Modified: scummvm/trunk/graphics/VectorRendererSpec.cpp
===================================================================
--- scummvm/trunk/graphics/VectorRendererSpec.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/graphics/VectorRendererSpec.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -700,7 +700,7 @@
int newW = w / 2;
if (newW % 2) newW++;
- switch(orient) {
+ switch (orient) {
case kTriangleUp:
case kTriangleDown:
drawTriangleFast(x + (newW / 2), y + (h / 2) - (newW / 2), newW, (orient == kTriangleDown), color, Base::_fillMode);
@@ -1028,7 +1028,7 @@
int dysub = ddy - (dx * 2);
int error_term = ddy - dx;
- switch(fill_m) {
+ switch (fill_m) {
case kFillDisabled:
while (dx--) {
__TRIANGLE_MAINX();
@@ -1060,7 +1060,7 @@
int dxsub = ddx - (dy * 2);
int error_term = ddx - dy;
- switch(fill_m) {
+ switch (fill_m) {
case kFillDisabled:
while (dy--) {
__TRIANGLE_MAINY();
Modified: scummvm/trunk/graphics/video/coktelvideo/indeo3.cpp
===================================================================
--- scummvm/trunk/graphics/video/coktelvideo/indeo3.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/graphics/video/coktelvideo/indeo3.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -96,7 +96,7 @@
_dither = dither;
- switch(dither) {
+ switch (dither) {
case kDitherSierraLight:
_ditherSL = new Graphics::SierraLight(_width, _palLUT);
break;
@@ -538,7 +538,7 @@
correction_lp[0] = correction_lp[1] = correction + (lv << 8);
}
- switch(k) {
+ switch (k) {
case 1:
case 0: /********** CASE 0 **********/
for ( ; blks_height > 0; blks_height -= 4) {
@@ -548,7 +548,7 @@
cur_lp = ((uint32 *)cur_frm_pos) + width_tbl[lp2];
ref_lp = ((uint32 *)ref_frm_pos) + width_tbl[lp2];
- switch(correction_type_sp[0][k]) {
+ switch (correction_type_sp[0][k]) {
case 0:
*cur_lp = FROM_LE_32(((FROM_LE_32(*ref_lp) >> 1) + correction_lp[lp2 & 0x01][k]) << 1);
lp2++;
@@ -651,7 +651,7 @@
cur_lp = ((uint32 *)cur_frm_pos) + width_tbl[lp2 * 2];
ref_lp = ((uint32 *)cur_frm_pos) + width_tbl[(lp2 * 2) - 1];
- switch(correction_type_sp[lp2 & 0x01][k]) {
+ switch (correction_type_sp[lp2 & 0x01][k]) {
case 0:
cur_lp[width_tbl[1]] = FROM_LE_32(((FROM_LE_32(*ref_lp) >> 1) + correction_lp[lp2 & 0x01][k]) << 1);
if (lp2 > 0 || flag1 == 0 || strip->ypos != 0)
@@ -780,7 +780,7 @@
#endif
}
- switch(correction_type_sp[lp2 & 0x01][k]) {
+ switch (correction_type_sp[lp2 & 0x01][k]) {
case 0:
cur_lp[width_tbl[1]] = FROM_LE_32(((FROM_LE_32(lv1) >> 1) + correctionloworder_lp[lp2 & 0x01][k]) << 1);
cur_lp[width_tbl[1]+1] = FROM_LE_32(((FROM_LE_32(lv2) >> 1) + correctionhighorder_lp[lp2 & 0x01][k]) << 1);
@@ -935,7 +935,7 @@
cur_lp = ((uint32 *)cur_frm_pos) + width_tbl[lp2 * 2];
ref_lp = ((uint32 *)ref_frm_pos) + width_tbl[lp2 * 2];
- switch(correction_type_sp[lp2 & 0x01][k]) {
+ switch (correction_type_sp[lp2 & 0x01][k]) {
case 0:
lv1 = correctionloworder_lp[lp2 & 0x01][k];
lv2 = correctionhighorder_lp[lp2 & 0x01][k];
@@ -1038,7 +1038,7 @@
cur_lp = ((uint32 *)cur_frm_pos) + width_tbl[lp2 * 2];
ref_lp = ((uint32 *)ref_frm_pos) + width_tbl[lp2 * 2];
- switch(correction_type_sp[lp2 & 0x01][k]) {
+ switch (correction_type_sp[lp2 & 0x01][k]) {
case 0:
cur_lp[0] = FROM_LE_32(((FROM_LE_32(*ref_lp) >> 1) + correction_lp[lp2 & 0x01][k]) << 1);
cur_lp[width_tbl[1]] = FROM_LE_32(((FROM_LE_32(ref_lp[width_tbl[1]]) >> 1) + correction_lp[lp2 & 0x01][k]) << 1);
Modified: scummvm/trunk/gui/ThemeParser.cpp
===================================================================
--- scummvm/trunk/gui/ThemeParser.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/gui/ThemeParser.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -459,7 +459,7 @@
if (stepNode->values.contains("orientation")) {
val = stepNode->values["orientation"];
- if ( val == "top")
+ if (val == "top")
drawstep->extraData = Graphics::VectorRenderer::kTriangleUp;
else if (val == "bottom")
drawstep->extraData = Graphics::VectorRenderer::kTriangleDown;
@@ -622,7 +622,7 @@
Graphics::TextAlign alignH = Graphics::kTextAlignLeft;
if (node->values.contains("textalign")) {
- if((alignH = parseTextHAlign(node->values["textalign"])) == Graphics::kTextAlignInvalid)
+ if ((alignH = parseTextHAlign(node->values["textalign"])) == Graphics::kTextAlignInvalid)
return parserError("Invalid value for text alignment.");
}
@@ -847,7 +847,7 @@
if (node->values.contains("textalign")) {
Graphics::TextAlign alignH = Graphics::kTextAlignLeft;
- if((alignH = parseTextHAlign(node->values["textalign"])) == Graphics::kTextAlignInvalid)
+ if ((alignH = parseTextHAlign(node->values["textalign"])) == Graphics::kTextAlignInvalid)
return parserError("Invalid value for text alignment.");
_theme->getEvaluator()->setVar(var + "Align", alignH);
Modified: scummvm/trunk/gui/about.cpp
===================================================================
--- scummvm/trunk/gui/about.cpp 2009-09-30 16:06:04 UTC (rev 44494)
+++ scummvm/trunk/gui/about.cpp 2009-09-30 16:16:53 UTC (rev 44495)
@@ -100,7 +100,7 @@
_w = 0;
for (i = 0; i < ARRAYSIZE(credits); i++) {
int tmp = g_gui.getStringWidth(credits[i] + 5);
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list