diff options
author | Jordi Vilalta Prat | 2008-01-27 19:47:41 +0000 |
---|---|---|
committer | Jordi Vilalta Prat | 2008-01-27 19:47:41 +0000 |
commit | 66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985 (patch) | |
tree | e27aadabecd8dd910884280e6559ff9c94c3d73c /backends/platform/PalmOS/Src/launcher | |
parent | 278857698dc7b1623096fe1ad12511dc4c886c7e (diff) | |
download | scummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.tar.gz scummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.tar.bz2 scummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.zip |
Removed trailing spaces.
svn-id: r30664
Diffstat (limited to 'backends/platform/PalmOS/Src/launcher')
14 files changed, 106 insertions, 106 deletions
diff --git a/backends/platform/PalmOS/Src/launcher/app.cpp b/backends/platform/PalmOS/Src/launcher/app.cpp index bcaff049ff..31c94da5b6 100644 --- a/backends/platform/PalmOS/Src/launcher/app.cpp +++ b/backends/platform/PalmOS/Src/launcher/app.cpp @@ -86,7 +86,7 @@ static Err AppStartCheckNotify() { UInt32 romVersion; Err err; - err = FtrGet(sysFtrCreator, sysFtrNumNotifyMgrVersion, &romVersion); + err = FtrGet(sysFtrCreator, sysFtrNumNotifyMgrVersion, &romVersion); if (!err) { UInt16 cardNo; LocalID dbID; @@ -128,7 +128,7 @@ static Err AppStartLoadSkin() { if (type != 'skin' || creator != appFileCreator) err = dmErrInvalidParam; } - + if (!found || err) MemSet(&(gPrefs->skin),sizeof(SkinInfoType),0); } @@ -141,13 +141,13 @@ static Err AppStartLoadSkin() { if (!err) err = DmDatabaseInfo (gPrefs->skin.cardNo, gPrefs->skin.dbID, gPrefs->skin.nameP, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); } - + return err; } static Err AppStartCheckMathLib() { Err e = MathlibInit(); - + switch (e) { case errNone: break; @@ -158,7 +158,7 @@ static Err AppStartCheckMathLib() { FrmCustomAlert(FrmErrorAlert,"Can't open MathLib !",0,0); break; } - + return e; } @@ -262,7 +262,7 @@ Err AppStart(void) { gPrefs->exitLauncher = true; gPrefs->stdPalette = OPTIONS_TST(kOptDeviceOS5); gPrefs->stylusClick = true; - + } else { PrefGetAppPreferences(appFileCreator, appPrefID, gPrefs, &dataSize, true); } @@ -274,7 +274,7 @@ Err AppStart(void) { error = AppStartCheckHRmode(); if (error) return (error); - + bDirectMode = (AppStartLoadSkin() != errNone); // if volref previously defined, check if it's a valid one @@ -318,8 +318,8 @@ static Err AppStopCheckNotify() { UInt32 romVersion; Err err; - - err = FtrGet(sysFtrCreator, sysFtrNumNotifyMgrVersion, &romVersion); + + err = FtrGet(sysFtrCreator, sysFtrNumNotifyMgrVersion, &romVersion); if (!err) { UInt16 cardNo; LocalID dbID; @@ -332,7 +332,7 @@ static Err AppStopCheckNotify() SysNotifyUnregister(cardNo, dbID, sysNotifyDisplayResizedEvent, sysNotifyNormalPriority); } } - + return err; } @@ -345,7 +345,7 @@ void AppStop(void) { // Close and move Game list database GamCloseDatabase(false); - // Write the saved preferences / saved-state information. This data + // Write the saved preferences / saved-state information. This data // will saved during a HotSync backup. SavePrefs(); diff --git a/backends/platform/PalmOS/Src/launcher/forms/formCards.cpp b/backends/platform/PalmOS/Src/launcher/forms/formCards.cpp index 7a6e35b1f9..eb4654ed10 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formCards.cpp +++ b/backends/platform/PalmOS/Src/launcher/forms/formCards.cpp @@ -50,7 +50,7 @@ static void CardSlotFreeList() { if (itemsText && itemsList) { cards = MemPtrRecoverHandle(itemsList); items = MemPtrRecoverHandle(itemsText); - + itemsText = NULL; itemsList = NULL; } @@ -88,13 +88,13 @@ static UInt16 CardSlotFillList(Boolean getRefNum = false) { if (err || StrLen(labelP) == 0) { // if no label try to retreive card type VolumeInfoType volInfo; err = VFSVolumeInfo(volRefNum, &volInfo); - + if (!err) { ExpCardInfoType info; err = ExpCardInfo(volInfo.slotRefNum, &info); StrCopy(labelP, info.deviceClassStr); } - + if (err) // if err default name StrPrintF(labelP,"Other Card %ld", other++); } @@ -103,7 +103,7 @@ static UInt16 CardSlotFillList(Boolean getRefNum = false) { cards = MemHandleNew(sizeof(CardInfoType)); else MemHandleResize(cards, MemHandleSize(cards) + sizeof(CardInfoType)); - + cardsInfo = (CardInfoType *)MemHandleLock(cards); cardsInfo[counter].volRefNum = volRefNum; StrCopy(cardsInfo[counter].nameP, labelP); @@ -146,7 +146,7 @@ static UInt16 CardSlotFillList(Boolean getRefNum = false) { // no card found ? free old list in any or return invalid volref } else { if (!getRefNum) - CardSlotFreeList(); + CardSlotFreeList(); else return vfsInvalidVolRef; } @@ -240,7 +240,7 @@ static UInt16 ConfigTabSave() { CardSlotCreateDirs(); CardSlotFreeList(); - + return updateCode; } @@ -341,7 +341,7 @@ Boolean CardSlotFormHandleEvent(EventPtr eventP) { case CardSlotCancelButton: CardSlotFormCancel(); break; - + case TabCardGameListMoveCheckbox: GameListTabDraw(); break; @@ -352,7 +352,7 @@ Boolean CardSlotFormHandleEvent(EventPtr eventP) { default: break; } - + return handled; } diff --git a/backends/platform/PalmOS/Src/launcher/forms/formEditGame.cpp b/backends/platform/PalmOS/Src/launcher/forms/formEditGame.cpp index ceb4886dcf..0540c12577 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formEditGame.cpp +++ b/backends/platform/PalmOS/Src/launcher/forms/formEditGame.cpp @@ -66,7 +66,7 @@ static void GameTabInit(GameInfoType *gameInfoP) { nameP = (Char *)MemHandleLock(nameH); pathP = (Char *)MemHandleLock(pathH); gameP = (Char *)MemHandleLock(gameH); - + if (gameInfoP) { LstSetSelection(list1P, gameInfoP->engine); LstSetTopItem(list1P, gameInfoP->engine); @@ -139,7 +139,7 @@ static Err GameTabSave(GameInfoType *gameInfoP) { MemPtrFree(itemsText); itemsText = NULL; } - + return errNone; } @@ -148,7 +148,7 @@ static void DisplayInit(GameInfoType *gameInfoP) { list1P = (ListType *)GetObjectPtr(TabGameDisplayGfxListList); list2P = (ListType *)GetObjectPtr(TabGameDisplayRenderList); - + if (gameInfoP) { LstSetSelection(list1P, gameInfoP->gfxMode); LstSetSelection(list2P, gameInfoP->renderMode); @@ -169,7 +169,7 @@ static void DisplayInit(GameInfoType *gameInfoP) { static Err DisplaySave(GameInfoType *gameInfoP) { ListType *list1P, *list2P; - ControlType *cck6P, *cck7P, *cck8P; + ControlType *cck6P, *cck7P, *cck8P; FormType *frmP = FrmGetActiveForm(); @@ -187,7 +187,7 @@ static Err DisplaySave(GameInfoType *gameInfoP) { gameInfoP->fullscreen = CtlGetValue(cck7P); gameInfoP->aspectRatio = CtlGetValue(cck8P); } - + return errNone; } @@ -257,7 +257,7 @@ static void OptionsInit(GameInfoType *gameInfoP) { static Err OptionsSave(GameInfoType *gameInfoP) { FieldType *fld4P, *fld5P, *fld6P; - ControlType *cck1P, *cck2P, *cck3P, *cck4P, *cck5P; + ControlType *cck1P, *cck2P, *cck3P, *cck4P, *cck5P; ListType *list2P, *list3P; FormType *frmP = FrmGetActiveForm(); @@ -291,7 +291,7 @@ static Err OptionsSave(GameInfoType *gameInfoP) { } else { gameInfoP->language = LstGetSelection(list2P); gameInfoP->platform = LstGetSelection(list3P); - + gameInfoP->autoLoad = CtlGetValue(cck1P); gameInfoP->bootParam = CtlGetValue(cck2P); gameInfoP->setPlatform = CtlGetValue(cck3P); @@ -302,7 +302,7 @@ static Err OptionsSave(GameInfoType *gameInfoP) { gameInfoP->bootValue = StrAToI(FldGetTextPtr(fld5P)); gameInfoP->talkValue = StrAToI(FldGetTextPtr(fld6P)); } - + return errNone; } @@ -371,7 +371,7 @@ static void GameManSave(UInt16 index) { newGameInfo.version = curItemVersion; newGameInfo.icnID = 0xFFFF; newGameInfo.selected = true; - + // default sound data newGameInfo.musicInfo.volume.palm = 50; newGameInfo.musicInfo.volume.music = 192; @@ -383,7 +383,7 @@ static void GameManSave(UInt16 index) { newGameInfo.musicInfo.sound.defaultTrackLength = 10; newGameInfo.musicInfo.sound.firstTrack = 1; } - + GameTabSave(&newGameInfo); DisplaySave(&newGameInfo); OptionsSave(&newGameInfo); @@ -397,14 +397,14 @@ static void GameManSave(UInt16 index) { { RectangleType rArea; UInt16 posIndex, maxView; - + // get the sorted index index = GamGetSelected(); // if new item is out of the list bounds, change current list pos SknGetListBounds(&rArea, NULL); maxView = rArea.extent.y / sknInfoListItemSize; posIndex = gPrefs->listPosition; - + // if out of the current list position if (!(index >= posIndex && index < (posIndex + maxView))) gPrefs->listPosition = index; // this value is corrected in SknUpdateList if needed @@ -421,7 +421,7 @@ static void GameManSave(UInt16 index) { * FUNCTION: EditGameFormInit * FUNCTION: EditGameFormHandleEvent * - * DESCRIPTION: + * DESCRIPTION: * * REVISION HISTORY: * @@ -468,14 +468,14 @@ static void EditGameBowser() { UInt16 volRefNum = gPrefs->card.volRefNum; Char *textP, *pathP = (Char *)MemPtrNew(kFileBrowserLibPathBufferSize); pathP[0] = chrNull; - + if (FileBrowserLibShowOpenDialog(refNum, &volRefNum, pathP, 0, 0, 0, "Game Data Path", kFileBrowserLibFlagNoFiles)) { FieldPtr fldP; MemHandle textH; Int16 offset, copySize, maxSize; - + fldP = (FieldType *)GetObjectPtr(TabGameInfoPathField); - maxSize = FldGetMaxChars(fldP); + maxSize = FldGetMaxChars(fldP); textH = FldGetTextHandle(fldP); FldSetTextHandle(fldP, NULL); @@ -518,7 +518,7 @@ Boolean EditGameFormHandleEvent(EventPtr eventP) { EditGameCancel(); handled = true; break; - + case frmOpenEvent: switch (gFormEditMode) { case edtModeAdd: @@ -567,11 +567,11 @@ Boolean EditGameFormHandleEvent(EventPtr eventP) { case GameEditCancelButton: EditGameCancel(); break; - + case GameEditDeleteButton: EditGameFormDelete(false); break; - + case TabGameInfoBrowsePushButton: EditGameBowser(); break; @@ -607,6 +607,6 @@ Boolean EditGameFormHandleEvent(EventPtr eventP) { default: break; } - + return handled; } diff --git a/backends/platform/PalmOS/Src/launcher/forms/formMisc.cpp b/backends/platform/PalmOS/Src/launcher/forms/formMisc.cpp index 509adfa735..35b44486e9 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formMisc.cpp +++ b/backends/platform/PalmOS/Src/launcher/forms/formMisc.cpp @@ -40,7 +40,7 @@ static Boolean ScummVMTabSave() { fld1P = (FieldType *)GetObjectPtr(TabMiscScummVMDebugLevelField); fld2P = (FieldType *)GetObjectPtr(TabMiscScummVMAutosaveField); - + cckP[0] = (ControlType *)GetObjectPtr(TabMiscScummVMAutosaveCheckbox); cckP[3] = (ControlType *)GetObjectPtr(TabMiscScummVMDebugCheckbox); cckP[6] = (ControlType *)GetObjectPtr(TabMiscScummVMDemoCheckbox); @@ -69,7 +69,7 @@ static Boolean ScummVMTabSave() { gPrefs->debugLevel = StrAToI(FldGetTextPtr(fld1P)); gPrefs->autoSavePeriod = StrAToI(FldGetTextPtr(fld2P)); - + return true; } @@ -111,7 +111,7 @@ static void ExtsTabSave() { gPrefs->lightspeed.enable = CtlGetValue(cckP[0]); gPrefs->lightspeed.mode = LstGetSelection(list1P); } - if (OPTIONS_TST(kOptGoLcdAPI)) { + if (OPTIONS_TST(kOptGoLcdAPI)) { cckP[1] = (ControlType *)GetObjectPtr(TabMiscExtsGolcdCheckbox); gPrefs->goLCD = CtlGetValue(cckP[1]); } @@ -176,7 +176,7 @@ static void MiscFormSave() { if (!ScummVMTabSave()) return; PalmOSTabSave(); ExtsTabSave(); - + TabDeleteTabs(myTabP); FrmReturnToMain(); } @@ -216,7 +216,7 @@ static void MiscFormInit() { TabMoveUpObject(frmP, TabMiscExtsNothingLabel, 12); extsCnt--; } - + if (extsCnt) FrmRemoveObject(&frmP, FrmGetObjectIndex(frmP, TabMiscExtsNothingLabel)); @@ -270,6 +270,6 @@ Boolean MiscFormHandleEvent(EventPtr eventP) { default: break; } - + return handled; } diff --git a/backends/platform/PalmOS/Src/launcher/forms/formSelect.cpp b/backends/platform/PalmOS/Src/launcher/forms/formSelect.cpp index 641d646bb2..bb0ac894c2 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formSelect.cpp +++ b/backends/platform/PalmOS/Src/launcher/forms/formSelect.cpp @@ -197,10 +197,10 @@ static void SelectorFormInit() { listP = (ListType *)FrmGetObjectPtr(frmP, FrmGetObjectIndex(frmP, EngineListList)); itemsText = (Char **)MemPtrNew(ENGINE_COUNT * sizeof(Char *)); - + for (int i = 0; i < ENGINE_COUNT; i++) itemsText[i] = (Char *)engines[i].nameP; - + LstSetListChoices (listP, itemsText, ENGINE_COUNT); LstSetSelection(listP, 0); @@ -251,7 +251,7 @@ Boolean SelectorFormHandleEvent(EventPtr eventP) { case lstSelectEvent: if (eventP->data.lstSelect.listID == EngineSupportedList) LstSetSelection(eventP->data.lstSelect.pList, -1); - else + else SelectorSetList(eventP->data.lstSelect.selection); handled = true; break; @@ -273,6 +273,6 @@ Boolean SelectorFormHandleEvent(EventPtr eventP) { default: break; } - + return handled; } diff --git a/backends/platform/PalmOS/Src/launcher/forms/forminfo.cpp b/backends/platform/PalmOS/Src/launcher/forms/forminfo.cpp index 74622d8f14..3f4ab1b28f 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/forminfo.cpp +++ b/backends/platform/PalmOS/Src/launcher/forms/forminfo.cpp @@ -43,10 +43,10 @@ static void SystemTabDraw() { PalmGetMemory(&sm, &dm, &sf, 0); stack = GetStackSize(); df = gVars->startupMemory; - + WinSetTextColor(UIColorGetTableEntryIndex(UIObjectForeground)); FntSetFont(stdFont); - + StrIToA(num, dm); x = 147 - FntCharsWidth(num, StrLen(num)) + 5; WinDrawChars(num, StrLen(num), x, 12 + 30); @@ -115,7 +115,7 @@ Boolean InfoFormHandleEvent(EventPtr eventP) { InfoFormInit(); handled = true; break; - + case frmCloseEvent: InfoFormSave(); handled = true; @@ -141,6 +141,6 @@ Boolean InfoFormHandleEvent(EventPtr eventP) { default: break; } - + return handled; } diff --git a/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp b/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp index 6a5520eb55..9970e608c9 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp +++ b/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp @@ -48,7 +48,7 @@ static Err BeamMe() { err = SendDatabase(0, dbID, "ScummVM.prc", "\nPlay your favorite LucasArts games"); else err = DmGetLastErr(); - + return err; } @@ -107,7 +107,7 @@ static Boolean MainFormDoCommand(UInt16 command) FrmPopupForm(GameEditForm); handled = true; break; - + case MainGamesDelete: EditGameFormDelete(true); handled = true; diff --git a/backends/platform/PalmOS/Src/launcher/forms/formmusic.cpp b/backends/platform/PalmOS/Src/launcher/forms/formmusic.cpp index 8413216bb1..58eaa5b5fc 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formmusic.cpp +++ b/backends/platform/PalmOS/Src/launcher/forms/formmusic.cpp @@ -256,7 +256,7 @@ static void MusicFormInit(UInt16 index) { recordH = DmQueryRecord(gameDB, index); ogameInfoP = (GameInfoType *)MemHandleLock(recordH); - + if (!ogameInfoP) { FrmCustomAlert(FrmErrorAlert, "An error occured.",0,0); return; diff --git a/backends/platform/PalmOS/Src/launcher/forms/formtabs.cpp b/backends/platform/PalmOS/Src/launcher/forms/formtabs.cpp index 0dd3427c1a..d3f18e39d7 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formtabs.cpp +++ b/backends/platform/PalmOS/Src/launcher/forms/formtabs.cpp @@ -26,7 +26,7 @@ void TabDeleteTabs(TabType *tabP) { UInt16 cnt, num; num = MemPtrSize(tabP->tabs) / sizeof(TabDataType); - for (cnt = 0; cnt < num; cnt++) + for (cnt = 0; cnt < num; cnt++) FrmDeleteForm(tabP->tabs[cnt].srcP); delete tabP->tabs; @@ -93,7 +93,7 @@ Err TabAddContent(FormType **frmP, TabType *tabP, const Char *nameP, UInt16 rscI UInt16 items = LstGetNumberOfItems((ListType *)objP); UInt16 trigger = id - 1; trigger = (FrmGetObjectIndex((FormType *)*dstP, trigger) != frmInvalidObjectId) ? trigger : 0; - + LstNewList(dstP, id, x, y, w, h, font, visible, trigger); newP = (ListType *)FrmGetObjectPtr((FormType *)*dstP, FrmGetObjectIndex((FormType *)*dstP, id)); LstSetListChoices(newP, itemsP, items); @@ -197,10 +197,10 @@ void TabSetActive(FormType *frmP, TabType *tabP, UInt16 num) { r.topLeft.y -= 1; WinSetForeColor(UIColorGetTableEntryIndex(UIObjectFrame)); - WinDrawRectangleFrame(simpleFrame, &r); + WinDrawRectangleFrame(simpleFrame, &r); WinSetForeColor(line); WinDrawLine(r.topLeft.x, r.topLeft.y, r.topLeft.x + r.extent.x - 1, r.topLeft.y); - FrmShowObject(frmP, idx); + FrmShowObject(frmP, idx); } else { UInt8 frame = UIColorGetTableEntryIndex(UIObjectFrame); @@ -211,7 +211,7 @@ void TabSetActive(FormType *frmP, TabType *tabP, UInt16 num) { light.b = (255 - light.b) > 72 ? light.b + 72 : 255; WinSetForeColor(WinRGBToIndex(&light)); - WinDrawRectangleFrame(simpleFrame, &r); + WinDrawRectangleFrame(simpleFrame, &r); WinSetForeColor(frame); WinDrawLine(r.topLeft.x - 1, r.topLeft.y + r.extent.y, r.topLeft.x + r.extent.x, r.topLeft.y + r.extent.y); } diff --git a/backends/platform/PalmOS/Src/launcher/games.cpp b/backends/platform/PalmOS/Src/launcher/games.cpp index 2300a36f09..b223897fd5 100644 --- a/backends/platform/PalmOS/Src/launcher/games.cpp +++ b/backends/platform/PalmOS/Src/launcher/games.cpp @@ -94,7 +94,7 @@ static Err GamUpdateList() { // new format gitCur.version = curItemVersion; - + if (version < itemVersion_300) { gitCur.musicInfo.volume.palm = 50; gitCur.musicInfo.volume.music = 192; @@ -109,7 +109,7 @@ static Err GamUpdateList() { if (version < itemVersion_310) gitCur.engine = 0; - + if (version < itemVersion_320) gitCur.renderMode = 0; @@ -159,34 +159,34 @@ static Err GamUpdateList() { if (version <= itemVersion_340) { gitCur.platform++; - + if (gitCur.language == 3) gitCur.language = 0; else if (gitCur.language >= 11) gitCur.language++; } - + if (version <= itemVersion_350) if (gitCur.platform >= 9) gitCur.platform++; - + if (version <= itemVersion_351) { if (gitCur.engine >= ENGINE_LURE) // newly added engine gitCur.engine++; - + if (gitCur.engine == ENGINE_SCUMM) // reorder gitCur.engine = ENGINE_AGOS; else if (gitCur.engine == ENGINE_AGOS) gitCur.engine = ENGINE_SCUMM; } - + if (version <= itemVersion_352) { if (gitCur.engine >= ENGINE_CINE) // newly added engine gitCur.engine++; - + gitCur.platform++; } - + if (version <= itemVersion_353) gitCur.musicInfo.sound.drvMusic++; @@ -288,16 +288,16 @@ static Err GamUpdateList() { // to V3.5 gitCur.platform++; - + if (gitCur.language == 3) gitCur.language = 0; else if (gitCur.language >= 11) gitCur.language++; - + // to V3.5.1 if (gitCur.platform >= 9) gitCur.platform++; - + //to V3.5.3 gitCur.musicInfo.sound.drvMusic++; @@ -366,7 +366,7 @@ static Err GamUpdateList() { FrmDeleteForm(frmP); if (ofmP) FrmSetActiveForm(ofmP); - } + } } } @@ -529,7 +529,7 @@ Boolean GamJumpTo(Char letter) { GamUnselect(); DmWrite(game, OffsetOf(GameInfoType,selected), &newValue, sizeof(Boolean)); - + if (index < gPrefs->listPosition || index >= (gPrefs->listPosition + maxView)) gPrefs->listPosition = index; } diff --git a/backends/platform/PalmOS/Src/launcher/launch.cpp b/backends/platform/PalmOS/Src/launcher/launch.cpp index 4dc1011a15..cb2d52b20e 100644 --- a/backends/platform/PalmOS/Src/launcher/launch.cpp +++ b/backends/platform/PalmOS/Src/launcher/launch.cpp @@ -95,7 +95,7 @@ UInt16 ModFind(const Char *f) { if (!e) e = VFSFileClose(r); if (!e) break; } - + return volRefNum; } @@ -105,7 +105,7 @@ static void ModSetStack(UInt32 newSize, UInt16 cardNo, LocalID dbID) { if (dbRef) { MemHandle pref = DmGetResource('pref',0); UInt32 size = 0; - + if (pref) { SysAppPrefsType *data = (SysAppPrefsType *)MemHandleLock(pref); size = data->stackSize; @@ -273,7 +273,7 @@ Boolean StartScummVM(Int16 engine) { case 5: ArgsAdd(&argvP[argc], "--render-mode=", "hercGreen", &argc); break; - } + } switch (gameInfoP->gfxMode) { case 1: @@ -311,7 +311,7 @@ Boolean StartScummVM(Int16 engine) { "segacd", "windows" }; - ArgsAdd(&argvP[argc], "--platform=", platform[gameInfoP->platform], &argc); + ArgsAdd(&argvP[argc], "--platform=", platform[gameInfoP->platform], &argc); } // subtitles @@ -354,7 +354,7 @@ Boolean StartScummVM(Int16 engine) { else ArgsAdd(&argvP[argc], "-e", "auto", &argc); // no driver, switch to auto } else { - ArgsAdd(&argvP[argc], "-e", drv[gameInfoP->musicInfo.sound.drvMusic], &argc); + ArgsAdd(&argvP[argc], "-e", drv[gameInfoP->musicInfo.sound.drvMusic], &argc); } // output rate @@ -398,7 +398,7 @@ Boolean StartScummVM(Int16 engine) { if (gPrefs->altIntro) ArgsAdd(&argvP[argc], "--alt-intro", NULL, &argc); } - + if (engine == ENGINE_SCUMM) { // demo mode ? if (gPrefs->demoMode) @@ -418,7 +418,7 @@ Boolean StartScummVM(Int16 engine) { lightspeed= (gPrefs->lightspeed.enable ? gPrefs->lightspeed.mode : 255); toLauncher= (gPrefs->exitLauncher); - // gVars values + // gVars values // (gVars->HRrefNum defined in checkHRmode on Clie) #ifndef _DEBUG_ENGINE gVars->VFS.volRefNum = (gPrefs->card.autoDetect ? vfsInvalidVolRef : gPrefs->card.volRefNum); @@ -436,12 +436,12 @@ Boolean StartScummVM(Int16 engine) { // user params HWR_RSTALL(); - + if (gPrefs->goLCD) HWR_SET(INIT_GOLCD); else OPTIONS_RST(kOptGoLcdAPI); - + if (!gPrefs->autoOff) HWR_SET(INIT_AUTOOFF); diff --git a/backends/platform/PalmOS/Src/launcher/skin.cpp b/backends/platform/PalmOS/Src/launcher/skin.cpp index ae042bcb39..3e8b0f0b96 100644 --- a/backends/platform/PalmOS/Src/launcher/skin.cpp +++ b/backends/platform/PalmOS/Src/launcher/skin.cpp @@ -232,7 +232,7 @@ void SknGetObjectBounds(DmOpenRef skinDBP, DmResID resID, RectangleType *rP) { rP->topLeft.x = strTemp[sknInfoPosX] * 2; rP->topLeft.y = strTemp[sknInfoPosY] * 2; - MemPtrUnlock(strTemp); + MemPtrUnlock(strTemp); DmReleaseResource(hStr); } @@ -274,8 +274,8 @@ UInt8 SknSetState(DmOpenRef skinDBP, DmResID resID, UInt8 newState) { DmWrite(strTemp, 0, &newState, 1); } - MemPtrUnlock(strTemp); - DmReleaseResource(hStr); + MemPtrUnlock(strTemp); + DmReleaseResource(hStr); } } } @@ -298,8 +298,8 @@ UInt8 SknGetDepth(DmOpenRef skinDBP) { if (hStr) { strTemp = (UInt8 *)MemHandleLock(hStr); depth = *strTemp; - MemPtrUnlock(strTemp); - DmReleaseResource(hStr); + MemPtrUnlock(strTemp); + DmReleaseResource(hStr); } } } @@ -321,9 +321,9 @@ UInt8 SknGetState(DmOpenRef skinDBP, DmResID resID) { if (hStr) { strTemp = (UInt8 *)MemHandleLock(hStr); - oldState = strTemp[sknInfoState]; - MemPtrUnlock(strTemp); - DmReleaseResource(hStr); + oldState = strTemp[sknInfoState]; + MemPtrUnlock(strTemp); + DmReleaseResource(hStr); } } } @@ -450,7 +450,7 @@ void SknUpdateList() { x = rCopy.topLeft.x; y = rCopy.topLeft.y; rCopy.topLeft.x -= rField.topLeft.x; - rCopy.topLeft.y -= rField.topLeft.y; + rCopy.topLeft.y -= rField.topLeft.y; SknCopyBits(skinDBP, skinBackgroundImageTop, &rCopy, x, y); // copy bottom bg SknGetObjectBounds(skinDBP, skinBackgroundImageBottom, &rField); @@ -458,7 +458,7 @@ void SknUpdateList() { x = rCopy.topLeft.x; y = rCopy.topLeft.y; rCopy.topLeft.x -= rField.topLeft.x; - rCopy.topLeft.y -= rField.topLeft.y; + rCopy.topLeft.y -= rField.topLeft.y; SknCopyBits(skinDBP, skinBackgroundImageBottom, &rCopy, x, y); FntSetFont(stdFont); diff --git a/backends/platform/PalmOS/Src/launcher/start.cpp b/backends/platform/PalmOS/Src/launcher/start.cpp index f492655cf8..b5e8f24884 100644 --- a/backends/platform/PalmOS/Src/launcher/start.cpp +++ b/backends/platform/PalmOS/Src/launcher/start.cpp @@ -97,9 +97,9 @@ Err SendDatabase (UInt16 cardNo, LocalID dbID, Char *nameP, Char *descriptionP) * minimum requirement. * * PARAMETERS: requiredVersion - minimum rom version required - * (see sysFtrNumROMVersion in SystemMgr.h + * (see sysFtrNumROMVersion in SystemMgr.h * for format) - * launchFlags - flags that indicate if the application + * launchFlags - flags that indicate if the application * UI is initialized. * * RETURNED: error code or zero if rom is compatible @@ -119,7 +119,7 @@ static Err RomVersionCompatible(UInt32 requiredVersion, UInt16 launchFlags) { FrmAlert (RomIncompatibleAlert); - // Palm OS 1.0 will continuously relaunch this app unless we switch to + // Palm OS 1.0 will continuously relaunch this app unless we switch to // another safe one. if (romVersion <= kPalmOS10Version) AppLaunchWithCommand(sysFileCDefaultApp, sysAppLaunchCmdNormalLaunch, NULL); @@ -210,7 +210,7 @@ static Boolean AppHandleEvent(EventPtr eventP) { } return true; } - + return false; } @@ -218,7 +218,7 @@ static Boolean AppHandleEvent(EventPtr eventP) { * * FUNCTION: AppEventLoop * - * DESCRIPTION: This routine is the event loop for the application. + * DESCRIPTION: This routine is the event loop for the application. * * PARAMETERS: nothing * @@ -249,8 +249,8 @@ static void AppEventLoop(void) { * * DESCRIPTION: This is the main entry point for the application. * - * PARAMETERS: cmd - word value specifying the launch code. - * cmdPB - pointer to a structure that is associated with the launch code. + * PARAMETERS: cmd - word value specifying the launch code. + * cmdPB - pointer to a structure that is associated with the launch code. * launchFlags - word value providing extra information about the launch. * * RETURNED: Result of launch @@ -324,7 +324,7 @@ static UInt32 ScummVMPalmMain(UInt16 cmd, MemPtr cmdPBP, UInt16 launchFlags) { case sysAppLaunchCmdNormalLaunch: error = AppStart(); - if (error) + if (error) goto end; if (!bDirectMode) { @@ -352,8 +352,8 @@ end: * * DESCRIPTION: This is the main entry point for the application. * - * PARAMETERS: cmd - word value specifying the launch code. - * cmdPB - pointer to a structure that is associated with the launch code. + * PARAMETERS: cmd - word value specifying the launch code. + * cmdPB - pointer to a structure that is associated with the launch code. * launchFlags - word value providing extra information about the launch. * RETURNED: Result of launch * diff --git a/backends/platform/PalmOS/Src/launcher/start.h b/backends/platform/PalmOS/Src/launcher/start.h index bccbc53f86..3ed52b465b 100644 --- a/backends/platform/PalmOS/Src/launcher/start.h +++ b/backends/platform/PalmOS/Src/launcher/start.h @@ -22,7 +22,7 @@ * $Id$ * */ - + #ifndef __START_H__ #define __START_H__ @@ -36,7 +36,7 @@ typedef struct { //skin params SkinInfoType skin; // card where is located the skin - Boolean soundClick; + Boolean soundClick; Boolean vibrator; Boolean autoOff; |