diff options
Diffstat (limited to 'backends/platform')
-rw-r--r-- | backends/platform/ds/arm9/source/dsmain.cpp | 12 | ||||
-rw-r--r-- | backends/platform/ds/arm9/source/dsoptions.cpp | 2 | ||||
-rw-r--r-- | backends/platform/ds/arm9/source/osystem_ds.cpp | 4 | ||||
-rw-r--r-- | backends/platform/ds/arm9/source/zipreader.cpp | 2 | ||||
-rw-r--r-- | backends/platform/iphone/blit.cpp | 8 | ||||
-rw-r--r-- | backends/platform/iphone/iphone_common.h | 2 | ||||
-rw-r--r-- | backends/platform/iphone/iphone_video.h | 2 | ||||
-rw-r--r-- | backends/platform/iphone/osys_iphone.cpp | 64 | ||||
-rw-r--r-- | backends/platform/iphone/osys_iphone.h | 12 | ||||
-rw-r--r-- | backends/platform/ps2/Gs2dScreen.cpp | 10 | ||||
-rw-r--r-- | backends/platform/ps2/Gs2dScreen.h | 2 | ||||
-rw-r--r-- | backends/platform/ps2/fileio.cpp | 2 | ||||
-rw-r--r-- | backends/platform/ps2/fileio.h | 2 | ||||
-rw-r--r-- | backends/platform/ps2/icon.h | 2 | ||||
-rw-r--r-- | backends/platform/ps2/irxboot.cpp | 6 | ||||
-rw-r--r-- | backends/platform/ps2/systemps2.cpp | 16 | ||||
-rw-r--r-- | backends/platform/ps2/systemps2.h | 2 | ||||
-rw-r--r-- | backends/platform/symbian/src/SymbianActions.cpp | 2 | ||||
-rw-r--r-- | backends/platform/wince/wince-sdl.cpp | 4 |
19 files changed, 78 insertions, 78 deletions
diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp index 621a2af082..ca2d2cb855 100644 --- a/backends/platform/ds/arm9/source/dsmain.cpp +++ b/backends/platform/ds/arm9/source/dsmain.cpp @@ -647,7 +647,7 @@ void displayMode8Bit() { // ConsoleInit destroys the hardware palette :-( OSystem_DS::instance()->restoreHardwarePalette(); - + // BG_PALETTE_SUB[255] = RGB15(31,31,31);//by default font will be rendered with color 255 // Do text stuff @@ -893,7 +893,7 @@ void displayMode16Bit() { BG3_XDX = isCpuScalerEnabled() ? 256 : (int) (1.25f * 256); BG3_XDY = 0; - BG3_YDX = 0; + BG3_YDX = 0; BG3_YDY = (int) ((200.0f / 192.0f) * 256); #ifdef HEAVY_LOGGING @@ -1571,7 +1571,7 @@ void addEventsToQueue() { } - static int selectHoldCount = 0; + static int selectHoldCount = 0; static const int SELECT_HOLD_TIME = 60; if ((getKeysHeld() & KEY_SELECT)) { @@ -1585,8 +1585,8 @@ void addEventsToQueue() { selectHoldCount = 0; } - - + + if (getKeysReleased() & KEY_SELECT) { if (selectHoldCount < SELECT_HOLD_TIME) { // Just pressed select - show DS options screen @@ -1838,7 +1838,7 @@ void soundBufferEmptyHandler() { } currentTimeMillis++; // TIMER0 end - + soundHiPart = !soundHiPart; } diff --git a/backends/platform/ds/arm9/source/dsoptions.cpp b/backends/platform/ds/arm9/source/dsoptions.cpp index 52027f3a15..90f371e0a8 100644 --- a/backends/platform/ds/arm9/source/dsoptions.cpp +++ b/backends/platform/ds/arm9/source/dsoptions.cpp @@ -335,7 +335,7 @@ void DSOptionsDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint close(); } - + if ((!guard) && (cmd == 0x40000000)) { close(); g_engine->openMainMenuDialog(); diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp index 057e107bb6..e35e5edea0 100644 --- a/backends/platform/ds/arm9/source/osystem_ds.cpp +++ b/backends/platform/ds/arm9/source/osystem_ds.cpp @@ -425,12 +425,12 @@ void OSystem_DS::grabOverlay(OverlayColor* buf, int pitch) { for (int y = 0; y < 200; y++) { u16* src = start + (y * 320); u16* dest = ((u16 *) (buf)) + (y * pitch); - + for (int x = 0; x < 320; x++) { *dest++ = *src++; } } - + } void OSystem_DS::copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h) { diff --git a/backends/platform/ds/arm9/source/zipreader.cpp b/backends/platform/ds/arm9/source/zipreader.cpp index fa9a229348..fd6da4e9b9 100644 --- a/backends/platform/ds/arm9/source/zipreader.cpp +++ b/backends/platform/ds/arm9/source/zipreader.cpp @@ -171,7 +171,7 @@ bool ZipFile::findFile(const char *search) { char searchName[128]; strcpy(searchName, search); char *tmp = searchName; - + // Change slashes to backslashes for (; *tmp; ++tmp) { if (*tmp == '/') diff --git a/backends/platform/iphone/blit.cpp b/backends/platform/iphone/blit.cpp index 1a3352945d..c28f931983 100644 --- a/backends/platform/iphone/blit.cpp +++ b/backends/platform/iphone/blit.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -27,7 +27,7 @@ #include "blit_arm.h" void blitLandscapeScreenRect16bpp(uint16 *dst, uint16 *src, int width, int height, int screenWidth, int screenHeight) -{ +{ for (int x = width; x > 0; x--) { for (int y = height; y > 0; y--) { *(dst++) = *src; @@ -47,5 +47,5 @@ void blitLandscapeScreenRect8bpp(uint16 *dst, byte *src, int width, int height, } dst -= screenHeight + height; src += 1 - height * screenWidth; - } + } } diff --git a/backends/platform/iphone/iphone_common.h b/backends/platform/iphone/iphone_common.h index 57dc991e9d..90d9a50aad 100644 --- a/backends/platform/iphone/iphone_common.h +++ b/backends/platform/iphone/iphone_common.h @@ -66,7 +66,7 @@ void iPhone_updateScreenRect(unsigned short* screen, int x1, int y1, int x2, int void iPhone_initSurface(int width, int height); bool iPhone_fetchEvent(int *outEvent, float *outX, float *outY); const char* iPhone_getDocumentsDir(); - + #ifdef __cplusplus } #endif diff --git a/backends/platform/iphone/iphone_video.h b/backends/platform/iphone/iphone_video.h index 3d5715bb95..daa5e1d18e 100644 --- a/backends/platform/iphone/iphone_video.h +++ b/backends/platform/iphone/iphone_video.h @@ -47,7 +47,7 @@ int _fullHeight; int _widthOffset; int _heightOffset; - + EAGLContext* _context; GLuint _viewRenderbuffer; GLuint _viewFramebuffer; diff --git a/backends/platform/iphone/osys_iphone.cpp b/backends/platform/iphone/osys_iphone.cpp index 192ea096ae..b72e8b65d5 100644 --- a/backends/platform/iphone/osys_iphone.cpp +++ b/backends/platform/iphone/osys_iphone.cpp @@ -88,7 +88,7 @@ int OSystem_IPHONE::timerHandler(int t) { void OSystem_IPHONE::initBackend() { #ifdef IPHONE_OFFICIAL - _savefile = new DefaultSaveFileManager(iPhone_getDocumentsDir()); + _savefile = new DefaultSaveFileManager(iPhone_getDocumentsDir()); #else _savefile = new DefaultSaveFileManager(SCUMMVM_SAVE_PATH); #endif @@ -159,7 +159,7 @@ void OSystem_IPHONE::initSize(uint width, uint height) { bzero(_fullscreen, fullSize); iPhone_initSurface(width, height); - + _fullScreenIsDirty = false; dirtyFullScreen(); _mouseVisible = false; @@ -300,9 +300,9 @@ void OSystem_IPHONE::internUpdateScreen() { Common::Rect dirtyRect = _dirtyRects.remove_at(_dirtyRects.size() - 1); //printf("Drawing: (%i, %i) -> (%i, %i)\n", dirtyRect.left, dirtyRect.top, dirtyRect.right, dirtyRect.bottom); - + drawDirtyRect(dirtyRect); - + if (_overlayVisible) drawDirtyOverlayRect(dirtyRect); @@ -315,7 +315,7 @@ void OSystem_IPHONE::internUpdateScreen() { Common::Rect dirtyRect = _dirtyOverlayRects.remove_at(_dirtyOverlayRects.size() - 1); //printf("Drawing: (%i, %i) -> (%i, %i)\n", dirtyRect.left, dirtyRect.top, dirtyRect.right, dirtyRect.bottom); - + drawDirtyOverlayRect(dirtyRect); drawMouseCursorOnRectUpdate(dirtyRect, mouseRect); updateHardwareSurfaceForRect(dirtyRect); @@ -332,7 +332,7 @@ void OSystem_IPHONE::drawDirtyRect(const Common::Rect& dirtyRect) { for (int y = h; y > 0; y--) { for (int x = w; x > 0; x--) *dst++ = _palette[*src++]; - + dst += _screenWidth - w; src += _screenWidth - w; } @@ -392,7 +392,7 @@ void OSystem_IPHONE::drawMouseCursorOnRectUpdate(const Common::Rect& updatedRect } void OSystem_IPHONE::updateHardwareSurfaceForRect(const Common::Rect& updatedRect) { - iPhone_updateScreenRect(_fullscreen, updatedRect.left, updatedRect.top, updatedRect.right, updatedRect.bottom ); + iPhone_updateScreenRect(_fullscreen, updatedRect.left, updatedRect.top, updatedRect.right, updatedRect.bottom ); } Graphics::Surface *OSystem_IPHONE::lockScreen() { @@ -610,7 +610,7 @@ bool OSystem_IPHONE::pollEvent(Common::Event &event) { case kInputMouseDragged: if (!handleEvent_mouseDragged(event, x, y)) return false; - break; + break; case kInputMouseSecondDragged: if (!handleEvent_mouseSecondDragged(event, x, y)) return false; @@ -618,13 +618,13 @@ bool OSystem_IPHONE::pollEvent(Common::Event &event) { case kInputMouseSecondDown: _secondaryTapped = true; if (!handleEvent_secondMouseDown(event, x, y)) - return false; + return false; break; case kInputMouseSecondUp: _secondaryTapped = false; if (!handleEvent_secondMouseUp(event, x, y)) - return false; - break; + return false; + break; case kInputOrientationChanged: handleEvent_orientationChanged((int)xUnit); return false; @@ -781,30 +781,30 @@ bool OSystem_IPHONE::handleEvent_mouseDragged(Common::Event &event, int x, int y int deltaY = _lastPadY - y; _lastPadX = x; _lastPadY = y; - + mouseNewPosX = (int)(_mouseX - deltaX / 0.5f); mouseNewPosY = (int)(_mouseY - deltaY / 0.5f); - + if (mouseNewPosX < 0) mouseNewPosX = 0; else if (mouseNewPosX > _screenWidth) mouseNewPosX = _screenWidth; - + if (mouseNewPosY < 0) mouseNewPosY = 0; else if (mouseNewPosY > _screenHeight) mouseNewPosY = _screenHeight; - + } else { mouseNewPosX = x; mouseNewPosY = y; } - + event.type = Common::EVENT_MOUSEMOVE; event.mouse.x = mouseNewPosX; event.mouse.y = mouseNewPosY; warpMouse(mouseNewPosX, mouseNewPosY); - + return true; } @@ -812,27 +812,27 @@ bool OSystem_IPHONE::handleEvent_mouseSecondDragged(Common::Event &event, int x, if (_gestureStartX == -1 || _gestureStartY == -1) { return false; } - + int vecX = (x - _gestureStartX); int vecY = (y - _gestureStartY); int lengthSq = vecX * vecX + vecY * vecY; //printf("Lengthsq: %u\n", lengthSq); - + if (lengthSq > 15000) { // Long enough gesture to react upon. _gestureStartX = -1; _gestureStartY = -1; - + float vecLength = sqrt(lengthSq); float vecXNorm = vecX / vecLength; float vecYNorm = vecY / vecLength; - + //printf("Swipe vector: (%.2f, %.2f)\n", vecXNorm, vecYNorm); - + if (vecXNorm > -0.50 && vecXNorm < 0.50 && vecYNorm > 0.75) { // Swipe down event.type = Common::EVENT_KEYDOWN; _queuedInputEvent.type = Common::EVENT_KEYUP; - + event.kbd.flags = _queuedInputEvent.kbd.flags = 0; event.kbd.keycode = _queuedInputEvent.kbd.keycode = Common::KEYCODE_F5; event.kbd.ascii = _queuedInputEvent.kbd.ascii = Common::ASCII_F5; @@ -849,7 +849,7 @@ bool OSystem_IPHONE::handleEvent_mouseSecondDragged(Common::Event &event, int x, GUI::TimedMessageDialog dialog(dialogMsg, 1500); dialog.runModal(); return false; - + } else if (vecXNorm > 0.75 && vecYNorm > -0.5 && vecYNorm < 0.5) { // Swipe right _touchpadModeEnabled = !_touchpadModeEnabled; @@ -861,12 +861,12 @@ bool OSystem_IPHONE::handleEvent_mouseSecondDragged(Common::Event &event, int x, GUI::TimedMessageDialog dialog(dialogMsg, 1500); dialog.runModal(); return false; - + } else if (vecXNorm < -0.75 && vecYNorm > -0.5 && vecYNorm < 0.5) { // Swipe left return false; } - } + } return false; } @@ -893,7 +893,7 @@ void OSystem_IPHONE::handleEvent_orientationChanged(int orientation) { if (_screenOrientation != newOrientation) { _screenOrientation = newOrientation; iPhone_initSurface(_screenWidth, _screenHeight); - + dirtyFullScreen(); if (_overlayVisible) dirtyFullOverlayScreen(); @@ -1231,7 +1231,7 @@ Common::SeekableReadStream *OSystem_IPHONE::createConfigReadStream() { strncat(buf, "/Preferences", 256 - strlen(buf) ); Common::FSNode file(buf); #else - Common::FSNode file(SCUMMVM_PREFS_PATH); + Common::FSNode file(SCUMMVM_PREFS_PATH); #endif return file.createReadStream(); } @@ -1241,10 +1241,10 @@ Common::WriteStream *OSystem_IPHONE::createConfigWriteStream() { char buf[256]; strncpy(buf, iPhone_getDocumentsDir(), 256); strncat(buf, "/Preferences", 256 - strlen(buf) ); - Common::FSNode file(buf); + Common::FSNode file(buf); #else - Common::FSNode file(SCUMMVM_PREFS_PATH); -#endif + Common::FSNode file(SCUMMVM_PREFS_PATH); +#endif return file.createWriteStream(); } @@ -1288,7 +1288,7 @@ void iphone_main(int argc, char *argv[]) { chdir("/var/mobile/"); #endif - + g_system = OSystem_IPHONE_create(); assert(g_system); diff --git a/backends/platform/iphone/osys_iphone.h b/backends/platform/iphone/osys_iphone.h index 140133fb90..ceb2102a5f 100644 --- a/backends/platform/iphone/osys_iphone.h +++ b/backends/platform/iphone/osys_iphone.h @@ -104,7 +104,7 @@ protected: TimerProc _timerCallback; Common::Array<Common::Rect> _dirtyRects; - Common::Array<Common::Rect> _dirtyOverlayRects; + Common::Array<Common::Rect> _dirtyOverlayRects; ScreenOrientation _screenOrientation; bool _fullScreenIsDirty; bool _fullScreenOverlayIsDirty; @@ -168,7 +168,7 @@ public: virtual void quit(); FilesystemFactory *getFilesystemFactory() { return _fsFactory; } - virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0); + virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0); virtual void getTimeAndDate(struct tm &t) const; virtual void setWindowCaption(const char *caption); @@ -186,13 +186,13 @@ public: protected: void internUpdateScreen(); void dirtyFullScreen(); - void dirtyFullOverlayScreen(); + void dirtyFullOverlayScreen(); void clipRectToScreen(int16 &x, int16 &y, int16 &w, int16 &h); void suspendLoop(); void drawDirtyRect(const Common::Rect& dirtyRect); - void drawDirtyOverlayRect(const Common::Rect& dirtyRect); + void drawDirtyOverlayRect(const Common::Rect& dirtyRect); void drawMouseCursorOnRectUpdate(const Common::Rect& updatedRect, const Common::Rect& mouseRect); - void updateHardwareSurfaceForRect(const Common::Rect& updatedRect); + void updateHardwareSurfaceForRect(const Common::Rect& updatedRect); static void AQBufferCallback(void *in, AudioQueueRef inQ, AudioQueueBufferRef outQB); static int timerHandler(int t); @@ -207,5 +207,5 @@ protected: bool handleEvent_secondMouseUp(Common::Event &event, int x, int y); bool handleEvent_mouseDragged(Common::Event &event, int x, int y); - bool handleEvent_mouseSecondDragged(Common::Event &event, int x, int y); + bool handleEvent_mouseSecondDragged(Common::Event &event, int x, int y); }; diff --git a/backends/platform/ps2/Gs2dScreen.cpp b/backends/platform/ps2/Gs2dScreen.cpp index 380e28952f..e9a846f659 100644 --- a/backends/platform/ps2/Gs2dScreen.cpp +++ b/backends/platform/ps2/Gs2dScreen.cpp @@ -162,7 +162,7 @@ Gs2dScreen::Gs2dScreen(uint16 width, uint16 height, TVMode tvMode) { // _tvMode = TV_NTSC; printf("Setting up %s mode\n", (_tvMode == TV_PAL) ? "PAL" : "NTSC"); - + // set screen size, 640x512 for pal, 640x448 for ntsc _tvWidth = 640; _tvHeight = ((_tvMode == TV_PAL) ? 512 /*544*/ : 448); @@ -188,7 +188,7 @@ Gs2dScreen::Gs2dScreen(uint16 width, uint16 height, TVMode tvMode) { _clutPtrs[TEXT] = _clutPtrs[SCREEN] + 0x2000; _texPtrs[SCREEN] = _clutPtrs[SCREEN] + 0x3000; _texPtrs[TEXT] = 0; // these buffers are stored in the alpha gaps of the frame buffers - _texPtrs[MOUSE] = 128 * 256 * 4; + _texPtrs[MOUSE] = 128 * 256 * 4; _texPtrs[PRINTF] = _texPtrs[MOUSE] + M_SIZE * M_SIZE * 4; _showOverlay = false; @@ -249,7 +249,7 @@ Gs2dScreen::Gs2dScreen(uint16 width, uint16 height, TVMode tvMode) { updateScreen(); createAnimTextures(); - + // create anim thread ee_thread_t animThread, thisThread; ReferThreadStatus(GetThreadId(), &thisThread); @@ -683,7 +683,7 @@ void Gs2dScreen::animThread(void) { do { WaitSema(g_AnimSema); } while ((!_systemQuit) && (!g_RunAnim)); - + if (_systemQuit) break; @@ -808,7 +808,7 @@ const uint32 Gs2dScreen::_binaryClut[16] __attribute__((aligned(64))) = { GS_RGBA( 0, 0, 0, 0x20), // scrPrintf: semitransparent GS_RGBA(0xC0, 0xC0, 0xC0, 0), // scrPrintf: red GS_RGBA(0x16, 0x16, 0xF0, 0), // scrPrintf: blue - + GS_RGBA(0xFF, 0xFF, 0xFF, 0x80), GS_RGBA(0xFF, 0xFF, 0xFF, 0x80), // unused GS_RGBA(0xFF, 0xFF, 0xFF, 0x80), GS_RGBA(0xFF, 0xFF, 0xFF, 0x80), GS_RGBA(0xFF, 0xFF, 0xFF, 0x80), GS_RGBA(0xFF, 0xFF, 0xFF, 0x80), diff --git a/backends/platform/ps2/Gs2dScreen.h b/backends/platform/ps2/Gs2dScreen.h index 1c4de6ef5a..91dfc9d327 100644 --- a/backends/platform/ps2/Gs2dScreen.h +++ b/backends/platform/ps2/Gs2dScreen.h @@ -77,7 +77,7 @@ public: void showOverlay(void); void hideOverlay(void); Graphics::PixelFormat getOverlayFormat(void); - int16 getOverlayWidth(void); + int16 getOverlayWidth(void); int16 getOverlayHeight(void); //- mouse routines diff --git a/backends/platform/ps2/fileio.cpp b/backends/platform/ps2/fileio.cpp index d2186b6475..fc35306907 100644 --- a/backends/platform/ps2/fileio.cpp +++ b/backends/platform/ps2/fileio.cpp @@ -267,7 +267,7 @@ void Ps2File::cacheReadSync(void) { } } -uint32 Ps2File::read(void *dest, uint32 len) { +uint32 Ps2File::read(void *dest, uint32 len) { // uint32 r=0, d=0, ds=0, sz=0; #ifdef __PS2_FILE_SEMA__ WaitSema(_sema); diff --git a/backends/platform/ps2/fileio.h b/backends/platform/ps2/fileio.h index 6c2b9402a3..e793c29d4b 100644 --- a/backends/platform/ps2/fileio.h +++ b/backends/platform/ps2/fileio.h @@ -56,7 +56,7 @@ public: virtual bool getErr(void); virtual void setErr(bool); - + private: void cacheReadAhead(void); void cacheReadSync(void); diff --git a/backends/platform/ps2/icon.h b/backends/platform/ps2/icon.h index 0e7d096c45..bc614bf70b 100644 --- a/backends/platform/ps2/icon.h +++ b/backends/platform/ps2/icon.h @@ -23,7 +23,7 @@ class PS2Icon { public: PS2Icon() {}; - + ~PS2Icon() {}; uint16 decompressData(uint16 **data); diff --git a/backends/platform/ps2/irxboot.cpp b/backends/platform/ps2/irxboot.cpp index fa3e047bf6..daa592522a 100644 --- a/backends/platform/ps2/irxboot.cpp +++ b/backends/platform/ps2/irxboot.cpp @@ -41,7 +41,7 @@ static const char netArg[] = "192.168.0.10" "\0" "255.255.255.0" "\0" "192.168.0 IrxFile irxFiles[] = { { "SIO2MAN", BIOS, NOTHING, NULL, 0 }, - { "MCMAN", BIOS, NOTHING, NULL, 0 }, + { "MCMAN", BIOS, NOTHING, NULL, 0 }, { "MCSERV", BIOS, NOTHING, NULL, 0 }, { "PADMAN", BIOS, NOTHING, NULL, 0 }, { "LIBSD", BIOS, NOTHING, NULL, 0 }, @@ -73,7 +73,7 @@ PS2Device detectBootPath(const char *elfPath, char *bootPath) { PS2Device device = _getDev(elfPath); printf("elf path: %s, device %d\n", elfPath, device); - + strcpy(bootPath, elfPath); char *pathPos = bootPath; @@ -115,7 +115,7 @@ PS2Device detectBootPath(const char *elfPath, char *bootPath) { return device; } -int loadIrxModules(int device, const char *irxPath, IrxReference **modules) { +int loadIrxModules(int device, const char *irxPath, IrxReference **modules) { IrxReference *resModules = (IrxReference *)malloc(numIrxFiles * sizeof(IrxReference)); IrxReference *curModule = resModules; diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp index 1a69e5377a..f29caf2279 100644 --- a/backends/platform/ps2/systemps2.cpp +++ b/backends/platform/ps2/systemps2.cpp @@ -209,7 +209,7 @@ void OSystem_PS2::startIrxModules(int numModules, IrxReference *modules) { } } else sioprintf("Module \"%s\" wasn't found: %d\n", modules[i].path, modules[i].errorCode); - + if ((modules[i].errorCode < 0) || (res < 0) || (rv < 0)) { if (!(modules[i].fileRef->flags & OPTIONAL)) { if (modules[i].errorCode < 0) @@ -220,7 +220,7 @@ void OSystem_PS2::startIrxModules(int numModules, IrxReference *modules) { quit(); } } - + if (modules[i].buffer) free(modules[i].buffer); } else { @@ -723,7 +723,7 @@ void OSystem_PS2::msgPrintf(int millis, char *format, ...) { while ((*lnEnd) && (*lnEnd != '\n')) lnEnd++; *lnEnd = '\0'; - + Common::String str(lnSta); int width = Graphics::g_sysfont.getStringWidth(str); if (width > maxWidth) @@ -821,17 +821,17 @@ void OSystem_PS2::quit(void) { // ("", 0, NULL); /* back to PS2 Browser */ -/* +/* __asm__ __volatile__( " li $3, 0x04;" " syscall;" " nop;" ); */ - + /* SifIopReset("rom0:UNDL ", 0); - while (!SifIopSync()) ; + while (!SifIopSync()) ; // SifIopReboot(...); */ #else @@ -959,7 +959,7 @@ void OSystem_PS2::makeConfigPath() { sprintf(path, "mc0:ScummVM/ScummVM.ini"); else ps2_fclose(src); - + _configFile = strdup(path); } @@ -967,7 +967,7 @@ Common::SeekableReadStream *OSystem_PS2::createConfigReadStream() { Common::FSNode file(_configFile); return file.createReadStream(); } - + Common::WriteStream *OSystem_PS2::createConfigWriteStream() { Common::FSNode file(_configFile); return file.createWriteStream(); diff --git a/backends/platform/ps2/systemps2.h b/backends/platform/ps2/systemps2.h index 67f3078f59..29747c0943 100644 --- a/backends/platform/ps2/systemps2.h +++ b/backends/platform/ps2/systemps2.h @@ -84,7 +84,7 @@ public: virtual void copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h); virtual int16 getOverlayWidth(void); virtual int16 getOverlayHeight(void); - + virtual bool showMouse(bool visible); virtual void warpMouse(int x, int y); diff --git a/backends/platform/symbian/src/SymbianActions.cpp b/backends/platform/symbian/src/SymbianActions.cpp index 9bbbec399d..c45cef32bd 100644 --- a/backends/platform/symbian/src/SymbianActions.cpp +++ b/backends/platform/symbian/src/SymbianActions.cpp @@ -164,7 +164,7 @@ void SymbianActions::initInstanceGame() { // Pause if(is_cruise) { _key_action[ACTION_PAUSE].setKey('P'); - } + } else { _key_action[ACTION_PAUSE].setKey(' '); } diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp index 6d27b46813..344edd7143 100644 --- a/backends/platform/wince/wince-sdl.cpp +++ b/backends/platform/wince/wince-sdl.cpp @@ -1737,8 +1737,8 @@ void OSystem_WINCE3::internUpdateScreen() { toolbarScaler = Normal2x; else if (_videoMode.scaleFactor == 3) toolbarScaler = Normal3x; - toolbarScaler((byte *)toolbarSurface->pixels, srcPitch, - (byte *)_hwscreen->pixels + (_toolbarHandler.getOffset() * _scaleFactorYm / _scaleFactorYd * dstPitch), + toolbarScaler((byte *)toolbarSurface->pixels, srcPitch, + (byte *)_hwscreen->pixels + (_toolbarHandler.getOffset() * _scaleFactorYm / _scaleFactorYd * dstPitch), dstPitch, toolbar_rect[0].w, toolbar_rect[0].h); SDL_UnlockSurface(toolbarSurface); SDL_UnlockSurface(_hwscreen); |