diff options
author | Jordi Vilalta Prat | 2008-01-28 00:14:17 +0000 |
---|---|---|
committer | Jordi Vilalta Prat | 2008-01-28 00:14:17 +0000 |
commit | d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd (patch) | |
tree | e6e98f266610f6428c248aed6abc75e637e45231 /backends/platform/PalmOS/Src | |
parent | 66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985 (diff) | |
download | scummvm-rg350-d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd.tar.gz scummvm-rg350-d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd.tar.bz2 scummvm-rg350-d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd.zip |
Fixed the spaces before tabs.
svn-id: r30667
Diffstat (limited to 'backends/platform/PalmOS/Src')
-rw-r--r-- | backends/platform/PalmOS/Src/cd_aeroplayer.h | 6 | ||||
-rw-r--r-- | backends/platform/PalmOS/Src/cd_default.h | 18 | ||||
-rw-r--r-- | backends/platform/PalmOS/Src/cd_msa.h | 24 | ||||
-rw-r--r-- | backends/platform/PalmOS/Src/cd_pockettunes.h | 40 | ||||
-rw-r--r-- | backends/platform/PalmOS/Src/globals.h | 2 | ||||
-rw-r--r-- | backends/platform/PalmOS/Src/init_palmos.h | 4 | ||||
-rw-r--r-- | backends/platform/PalmOS/Src/init_sony.cpp | 4 | ||||
-rw-r--r-- | backends/platform/PalmOS/Src/init_stuffs.cpp | 10 | ||||
-rw-r--r-- | backends/platform/PalmOS/Src/launcher/app.cpp | 6 | ||||
-rw-r--r-- | backends/platform/PalmOS/Src/launcher/forms/formmain.cpp | 6 | ||||
-rw-r--r-- | backends/platform/PalmOS/Src/launcher/forms/formtabs.h | 6 | ||||
-rw-r--r-- | backends/platform/PalmOS/Src/launcher/games.cpp | 4 | ||||
-rw-r--r-- | backends/platform/PalmOS/Src/launcher/games.h | 24 | ||||
-rw-r--r-- | backends/platform/PalmOS/Src/launcher/skin.cpp | 2 | ||||
-rw-r--r-- | backends/platform/PalmOS/Src/native/pace.h | 4 | ||||
-rw-r--r-- | backends/platform/PalmOS/Src/os5_renderer.cpp | 4 |
16 files changed, 82 insertions, 82 deletions
diff --git a/backends/platform/PalmOS/Src/cd_aeroplayer.h b/backends/platform/PalmOS/Src/cd_aeroplayer.h index e54bc1d5ff..e661e06d52 100644 --- a/backends/platform/PalmOS/Src/cd_aeroplayer.h +++ b/backends/platform/PalmOS/Src/cd_aeroplayer.h @@ -41,7 +41,7 @@ public: void play(int track, int num_loops, int start_frame, int duration); void stop(); - void setVolume(int volume); + void setVolume(int volume); private: OSystem *_sys; @@ -53,9 +53,9 @@ private: UInt32 getPosition(); void forceStop(); - UInt16 _volumeLimit; + UInt16 _volumeLimit; - Boolean _isPlaying; + Boolean _isPlaying; // cdrom UInt16 _pckLoops, _pckTrack; UInt32 _pckTrackStartFrame, _pckTrackEndFrame; diff --git a/backends/platform/PalmOS/Src/cd_default.h b/backends/platform/PalmOS/Src/cd_default.h index 491937f38d..69d909b1e7 100644 --- a/backends/platform/PalmOS/Src/cd_default.h +++ b/backends/platform/PalmOS/Src/cd_default.h @@ -30,20 +30,20 @@ class DefaultCDPlayer : public CDAudio { public: - DefaultCDPlayer(OSystem *sys); + DefaultCDPlayer(OSystem *sys); - bool init(); - void release(); + bool init(); + void release(); - bool poll(); - void update(); - void play(int track, int num_loops, int start_frame, int duration); - void stop(); + bool poll(); + void update(); + void play(int track, int num_loops, int start_frame, int duration); + void stop(); private: - OSystem *_sys; + OSystem *_sys; - // cdrom + // cdrom UInt16 _defLoops; UInt32 _defStopTime, _defTrackEndFrame, _defTrackLength; }; diff --git a/backends/platform/PalmOS/Src/cd_msa.h b/backends/platform/PalmOS/Src/cd_msa.h index 93ab279c8c..223bc0efcf 100644 --- a/backends/platform/PalmOS/Src/cd_msa.h +++ b/backends/platform/PalmOS/Src/cd_msa.h @@ -30,28 +30,28 @@ class MsaCDPlayer : public CDAudio { public: - MsaCDPlayer(OSystem *sys); + MsaCDPlayer(OSystem *sys); - bool init(); - void release(); + bool init(); + void release(); - bool poll(); - void update(); - void play(int track, int num_loops, int start_frame, int duration); - void stop(); + bool poll(); + void update(); + void play(int track, int num_loops, int start_frame, int duration); + void stop(); - void setVolume(int volume); + void setVolume(int volume); private: - void initInternal(); + void initInternal(); - OSystem *_sys; - UInt16 _msaRefNum; + OSystem *_sys; + UInt16 _msaRefNum; UInt32 _volumeLLimit; UInt32 _volumeRLimit; - // cdrom + // cdrom AlbumInfoType _msaAlbum; UInt16 _msaLoops; diff --git a/backends/platform/PalmOS/Src/cd_pockettunes.h b/backends/platform/PalmOS/Src/cd_pockettunes.h index 4a8d797158..77938d846a 100644 --- a/backends/platform/PalmOS/Src/cd_pockettunes.h +++ b/backends/platform/PalmOS/Src/cd_pockettunes.h @@ -31,35 +31,35 @@ class PckTunesCDPlayer : public CDAudio { public: - PckTunesCDPlayer(OSystem *sys); + PckTunesCDPlayer(OSystem *sys); - bool init(); - void release(); + bool init(); + void release(); - bool poll(); - void update(); - void play(int track, int num_loops, int start_frame, int duration); - void stop(); + bool poll(); + void update(); + void play(int track, int num_loops, int start_frame, int duration); + void stop(); - void setVolume(int volume); + void setVolume(int volume); private: - OSystem *_sys; - Char gameP[15]; + OSystem *_sys; + Char gameP[15]; - PocketTunesAction *_pAction; // prevent memory fragmentation - EventType _eAction; + PocketTunesAction *_pAction; // prevent memory fragmentation + EventType _eAction; - UInt32 getStatus(); - void setPosition(UInt32 value); - UInt32 getDuration(); - UInt32 getPosition(UInt32 deft); + UInt32 getStatus(); + void setPosition(UInt32 value); + UInt32 getDuration(); + UInt32 getPosition(UInt32 deft); - UInt32 _volumeLimit; - UInt32 getVolumeLimit(); + UInt32 _volumeLimit; + UInt32 getVolumeLimit(); - Boolean _isPlaying; - // cdrom + Boolean _isPlaying; + // cdrom UInt16 _pckLoops, _pckTrack; UInt32 _pckTrackStartFrame, _pckTrackEndFrame; UInt32 _pckStopTime, _pckTrackDuration; diff --git a/backends/platform/PalmOS/Src/globals.h b/backends/platform/PalmOS/Src/globals.h index 05e9fe70b6..796832df82 100644 --- a/backends/platform/PalmOS/Src/globals.h +++ b/backends/platform/PalmOS/Src/globals.h @@ -94,7 +94,7 @@ extern GlobalsDataPtr gVars; #define DO_VARS(z, t, o) \ { Int8 *tmp = (Int8 *)gVars + o + 8; \ for (Int8 cnt = 0; cnt < gVars->z; cnt++) \ - { UInt##t val = *((UInt##t *)tmp); \ + { UInt##t val = *((UInt##t *)tmp); \ val = ByteSwap##t(val); \ *((UInt##t *)tmp) = val; \ tmp += (t / 8); \ diff --git a/backends/platform/PalmOS/Src/init_palmos.h b/backends/platform/PalmOS/Src/init_palmos.h index 34b8ca1451..d4691dd15b 100644 --- a/backends/platform/PalmOS/Src/init_palmos.h +++ b/backends/platform/PalmOS/Src/init_palmos.h @@ -26,7 +26,7 @@ #ifndef INIT_PALMOS_H #define INIT_PALMOS_H -#define PALM_PORTRAIT 1 +#define PALM_PORTRAIT 1 #define PALM_LANDSCAPE 2 void PalmInit(UInt8 init); @@ -39,4 +39,4 @@ void PalmHRRelease(); UInt8 PalmScreenSize(Coord *stdw, Coord *stdh, Coord *fullw, Coord *fullh); void PalmGetMemory(UInt32* storageMemoryP, UInt32* dynamicMemoryP, UInt32 *storageFreeP, UInt32 *dynamicFreeP); -#endif
\ No newline at end of file +#endif diff --git a/backends/platform/PalmOS/Src/init_sony.cpp b/backends/platform/PalmOS/Src/init_sony.cpp index ede7ae997a..f6728d08b3 100644 --- a/backends/platform/PalmOS/Src/init_sony.cpp +++ b/backends/platform/PalmOS/Src/init_sony.cpp @@ -45,13 +45,13 @@ UInt16 SilkInit(UInt32 *retVersion) { e = FtrGet(sonySysFtrCreator, sonySysFtrNumVskVersion, &version); if (e) { // v1 = NR - e = SilkLibOpen(slkRefNum); + e = SilkLibOpen(slkRefNum); if (!e) version = vskVersionNum1; } else { // v2 = NX/NZ // v3 = UX... - e = VskOpen(slkRefNum); + e = VskOpen(slkRefNum); } } } else diff --git a/backends/platform/PalmOS/Src/init_stuffs.cpp b/backends/platform/PalmOS/Src/init_stuffs.cpp index 753d2ae548..51bfe755eb 100644 --- a/backends/platform/PalmOS/Src/init_stuffs.cpp +++ b/backends/platform/PalmOS/Src/init_stuffs.cpp @@ -80,11 +80,11 @@ void StuffsGetFeatures() { OPTIONS_SET(kOptDeviceOS5); // ARM ? - if (!FtrGet(sysFileCSystem, sysFtrNumProcessorID, &ulProcessorType)) - if (sysFtrNumProcessorIsARM(ulProcessorType)) - OPTIONS_SET(kOptDeviceARM); - else if (ulProcessorType == sysFtrNumProcessorx86) - OPTIONS_SET(kOptDeviceProcX86); + if (!FtrGet(sysFileCSystem, sysFtrNumProcessorID, &ulProcessorType)) + if (sysFtrNumProcessorIsARM(ulProcessorType)) + OPTIONS_SET(kOptDeviceARM); + else if (ulProcessorType == sysFtrNumProcessorx86) + OPTIONS_SET(kOptDeviceProcX86); // 5Way Navigator if (!FtrGet(hsFtrCreator, hsFtrIDNavigationSupported, &version)) { diff --git a/backends/platform/PalmOS/Src/launcher/app.cpp b/backends/platform/PalmOS/Src/launcher/app.cpp index 31c94da5b6..9bb1c1479b 100644 --- a/backends/platform/PalmOS/Src/launcher/app.cpp +++ b/backends/platform/PalmOS/Src/launcher/app.cpp @@ -202,7 +202,7 @@ static void AppStartCheckScreenSize() { #define max(id,value) gVars->memory[id] = (gVars->memory[id] < value ? value : gVars->memory[id]) #define min(id,value) gVars->memory[id] = (gVars->memory[id] > value ? value : gVars->memory[id]) -#define threshold 700 +#define threshold 700 static void AppStartSetMemory() { UInt32 mem, def; @@ -221,7 +221,7 @@ Err AppStart(void) { #ifndef _DEBUG_ENGINE // delete old databases - ModDelete(); + ModDelete(); #endif // allocate global variables space @@ -295,7 +295,7 @@ Err AppStart(void) { GamImportDatabase(); AppStartCheckScreenSize(); - AppStartCheckNotify(); // not fatal error if not avalaible + AppStartCheckNotify(); // not fatal error if not avalaible return error; } diff --git a/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp b/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp index 9970e608c9..ca2e18ee6d 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp +++ b/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp @@ -121,8 +121,8 @@ static Boolean MainFormDoCommand(UInt16 command) break; case MainOptionsAbout: - FrmPopupForm(InfoForm); - handled = true; + FrmPopupForm(InfoForm); + handled = true; break; case MainGamesMusicSound: @@ -252,7 +252,7 @@ Boolean MainFormHandleEvent(EventPtr eventP) break; case MainAboutButton: - FrmPopupForm(InfoForm); + FrmPopupForm(InfoForm); break; // case MainListTypeSelTrigger: diff --git a/backends/platform/PalmOS/Src/launcher/forms/formtabs.h b/backends/platform/PalmOS/Src/launcher/forms/formtabs.h index 5371485bf1..f14c2ff4e4 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formtabs.h +++ b/backends/platform/PalmOS/Src/launcher/forms/formtabs.h @@ -17,8 +17,8 @@ typedef struct { } TabType, *TabPtr; TabType *TabNewTabs (UInt16 cnt); -void TabDeleteTabs (TabType *tabP); -Err TabAddContent (FormType **frmP, TabType *tabP, const Char *nameP, UInt16 rscID, TabProc *drawFunc = 0); -void TabSetActive (FormType *frmP, TabType *tabP, UInt16 num); +void TabDeleteTabs (TabType *tabP); +Err TabAddContent (FormType **frmP, TabType *tabP, const Char *nameP, UInt16 rscID, TabProc *drawFunc = 0); +void TabSetActive (FormType *frmP, TabType *tabP, UInt16 num); void TabMoveUpObject (FormType *frmP, UInt16 objID, Coord amount); #endif diff --git a/backends/platform/PalmOS/Src/launcher/games.cpp b/backends/platform/PalmOS/Src/launcher/games.cpp index b223897fd5..c3f7ef3e4a 100644 --- a/backends/platform/PalmOS/Src/launcher/games.cpp +++ b/backends/platform/PalmOS/Src/launcher/games.cpp @@ -414,8 +414,8 @@ void GamImportDatabase() { return; } - // get current db info and rename it - DmOpenDatabaseInfo(gameDB, &oDbID, 0, 0, &oCardNo, 0); + // get current db info and rename it + DmOpenDatabaseInfo(gameDB, &oDbID, 0, 0, &oCardNo, 0); GamCloseDatabase(true); e = DmDeleteDatabase(oCardNo, oDbID); diff --git a/backends/platform/PalmOS/Src/launcher/games.h b/backends/platform/PalmOS/Src/launcher/games.h index 4b53503d60..0572504dc8 100644 --- a/backends/platform/PalmOS/Src/launcher/games.h +++ b/backends/platform/PalmOS/Src/launcher/games.h @@ -53,9 +53,9 @@ typedef struct { UInt16 icnID; // icon to display on the list Boolean selected; - Char nameP[50]; // game name to display in list - Char pathP[150]; // path to the game files - Char gameP[10]; // scumm name of the game + Char nameP[50]; // game name to display in list + Char pathP[150]; // path to the game files + Char gameP[10]; // scumm name of the game UInt16 gfxMode; Boolean autoLoad; @@ -75,9 +75,9 @@ typedef struct { UInt16 icnID; // icon to display on the list Boolean selected; - Char nameP[50]; // game name to display in list - Char pathP[150]; // path to the game files - Char gameP[10]; // scumm name of the game + Char nameP[50]; // game name to display in list + Char pathP[150]; // path to the game files + Char gameP[10]; // scumm name of the game UInt16 gfxMode; Boolean autoLoad; @@ -127,9 +127,9 @@ typedef struct { UInt16 icnID; // icon to display on the list Boolean selected; - Char nameP[50]; // game name to display in list - Char pathP[150]; // path to the game files - Char gameP[15]; // scumm name of the game + Char nameP[50]; // game name to display in list + Char pathP[150]; // path to the game files + Char gameP[15]; // scumm name of the game UInt16 gfxMode; Boolean autoLoad; @@ -142,13 +142,13 @@ typedef struct { UInt16 bootValue; UInt16 talkValue; UInt8 platform; - UInt8 language; // |- v2.5 + UInt8 language; // |- v2.5 - Boolean filter; // v2.6 + Boolean filter; // v2.6 Boolean fullscreen; // | Boolean aspectRatio; // |- v2.7 - MusicInfoType musicInfo;// v3.0 + MusicInfoType musicInfo;// v3.0 UInt8 engine; // |- v3.1 UInt8 renderMode; // |- v3.2 diff --git a/backends/platform/PalmOS/Src/launcher/skin.cpp b/backends/platform/PalmOS/Src/launcher/skin.cpp index 3e8b0f0b96..4c3f722aa1 100644 --- a/backends/platform/PalmOS/Src/launcher/skin.cpp +++ b/backends/platform/PalmOS/Src/launcher/skin.cpp @@ -134,7 +134,7 @@ static void SknCopyBits(DmOpenRef skinDBP, DmResID bitmapID, const RectangleType WinDrawBitmap(bmpTemp, 0, 0); WinSetDrawWindow(old); - bmp2P = BmpCreateBitmapV3(WinGetBitmap(win), kDensityDouble, BmpGetBits(WinGetBitmap(win)), NULL); + bmp2P = BmpCreateBitmapV3(WinGetBitmap(win), kDensityDouble, BmpGetBits(WinGetBitmap(win)), NULL); copy.topLeft.x = destX / 2; copy.topLeft.y = destY / 2; diff --git a/backends/platform/PalmOS/Src/native/pace.h b/backends/platform/PalmOS/Src/native/pace.h index b3e2d14593..37b903b2c3 100644 --- a/backends/platform/PalmOS/Src/native/pace.h +++ b/backends/platform/PalmOS/Src/native/pace.h @@ -89,14 +89,14 @@ extern GlobalsType global; PACE_EMULSTATE->regData[2] = pinTrap; \ return ((returnType)((PACE_CALLBACK_PTR)( \ static_cast<void *>(PACE_EMULSTATE), \ - PceNativeTrapNo(sysTrapPinsDispatch), \ + PceNativeTrapNo(sysTrapPinsDispatch), \ NULL, 0))); #define PACE_PIN_EXEC(pinTrap, returnType) \ PACE_EMULSTATE->regData[2] = pinTrap; \ return ((returnType)((PACE_CALLBACK_PTR)( \ static_cast<void *>(PACE_EMULSTATE), \ - PceNativeTrapNo(sysTrapPinsDispatch), \ + PceNativeTrapNo(sysTrapPinsDispatch), \ ¶ms, \ sizeof(params)))); diff --git a/backends/platform/PalmOS/Src/os5_renderer.cpp b/backends/platform/PalmOS/Src/os5_renderer.cpp index 4580db4d53..2c1c122a7d 100644 --- a/backends/platform/PalmOS/Src/os5_renderer.cpp +++ b/backends/platform/PalmOS/Src/os5_renderer.cpp @@ -79,10 +79,10 @@ void OSystem_PalmOS5::render_landscapeAny(RectangleType &r, PointType &p) { void OSystem_PalmOS5::render_landscape15x(RectangleType &r, PointType &p) { Coord x, y, o = 0; - int16 *dst = _workScreenP; + int16 *dst = _workScreenP; if (_overlayVisible) { - int16 *src = _overlayP; + int16 *src = _overlayP; for (y = 0; y < 100; y++) { // draw 2 lines |