[Scummvm-cvs-logs] SF.net SVN: scummvm: [30664] scummvm/trunk
jvprat at users.sourceforge.net
jvprat at users.sourceforge.net
Sun Jan 27 20:47:42 CET 2008
Revision: 30664
http://scummvm.svn.sourceforge.net/scummvm/?rev=30664&view=rev
Author: jvprat
Date: 2008-01-27 11:47:41 -0800 (Sun, 27 Jan 2008)
Log Message:
-----------
Removed trailing spaces.
Modified Paths:
--------------
scummvm/trunk/Makefile
scummvm/trunk/Makefile.common
scummvm/trunk/NEWS
scummvm/trunk/README
scummvm/trunk/backends/events/default/default-events.cpp
scummvm/trunk/backends/events/default/default-events.h
scummvm/trunk/backends/fs/abstract-fs-factory.cpp
scummvm/trunk/backends/fs/abstract-fs.h
scummvm/trunk/backends/fs/amigaos4/amigaos4-fs-factory.h
scummvm/trunk/backends/fs/amigaos4/amigaos4-fs.cpp
scummvm/trunk/backends/fs/dc/dc-fs.cpp
scummvm/trunk/backends/fs/dc/ronincd-fs-factory.h
scummvm/trunk/backends/fs/ds/ds-fs-factory.h
scummvm/trunk/backends/fs/ds/ds-fs.cpp
scummvm/trunk/backends/fs/ds/ds-fs.h
scummvm/trunk/backends/fs/gp32/gp32-fs-factory.h
scummvm/trunk/backends/fs/gp32/gp32-fs.cpp
scummvm/trunk/backends/fs/morphos/abox-fs-factory.h
scummvm/trunk/backends/fs/morphos/abox-fs.cpp
scummvm/trunk/backends/fs/palmos/palmos-fs-factory.h
scummvm/trunk/backends/fs/palmos/palmos-fs.cpp
scummvm/trunk/backends/fs/posix/posix-fs-factory.h
scummvm/trunk/backends/fs/posix/posix-fs.cpp
scummvm/trunk/backends/fs/ps2/ps2-fs-factory.h
scummvm/trunk/backends/fs/ps2/ps2-fs.cpp
scummvm/trunk/backends/fs/psp/psp-fs-factory.h
scummvm/trunk/backends/fs/psp/psp-fs.cpp
scummvm/trunk/backends/fs/symbian/symbian-fs-factory.h
scummvm/trunk/backends/fs/symbian/symbian-fs.cpp
scummvm/trunk/backends/fs/windows/windows-fs-factory.h
scummvm/trunk/backends/fs/windows/windows-fs.cpp
scummvm/trunk/backends/midi/dmedia.cpp
scummvm/trunk/backends/midi/timidity.cpp
scummvm/trunk/backends/module.mk
scummvm/trunk/backends/platform/PalmOS/Src/base_event.cpp
scummvm/trunk/backends/platform/PalmOS/Src/base_gfx.cpp
scummvm/trunk/backends/platform/PalmOS/Src/base_mouse.cpp
scummvm/trunk/backends/platform/PalmOS/Src/be_base.cpp
scummvm/trunk/backends/platform/PalmOS/Src/be_base.h
scummvm/trunk/backends/platform/PalmOS/Src/be_os5.cpp
scummvm/trunk/backends/platform/PalmOS/Src/be_os5.h
scummvm/trunk/backends/platform/PalmOS/Src/be_os5ex.cpp
scummvm/trunk/backends/platform/PalmOS/Src/be_zodiac.cpp
scummvm/trunk/backends/platform/PalmOS/Src/be_zodiac.h
scummvm/trunk/backends/platform/PalmOS/Src/cd_aeroplayer.cpp
scummvm/trunk/backends/platform/PalmOS/Src/cd_aeroplayer.h
scummvm/trunk/backends/platform/PalmOS/Src/cd_msa.cpp
scummvm/trunk/backends/platform/PalmOS/Src/cd_msa.h
scummvm/trunk/backends/platform/PalmOS/Src/cd_pockettunes.cpp
scummvm/trunk/backends/platform/PalmOS/Src/cd_pockettunes.h
scummvm/trunk/backends/platform/PalmOS/Src/cdaudio.h
scummvm/trunk/backends/platform/PalmOS/Src/extend.cpp
scummvm/trunk/backends/platform/PalmOS/Src/init_golcd.cpp
scummvm/trunk/backends/platform/PalmOS/Src/init_palmos.cpp
scummvm/trunk/backends/platform/PalmOS/Src/init_sony.cpp
scummvm/trunk/backends/platform/PalmOS/Src/init_stuffs.cpp
scummvm/trunk/backends/platform/PalmOS/Src/launcher/app.cpp
scummvm/trunk/backends/platform/PalmOS/Src/launcher/forms/formCards.cpp
scummvm/trunk/backends/platform/PalmOS/Src/launcher/forms/formEditGame.cpp
scummvm/trunk/backends/platform/PalmOS/Src/launcher/forms/formMisc.cpp
scummvm/trunk/backends/platform/PalmOS/Src/launcher/forms/formSelect.cpp
scummvm/trunk/backends/platform/PalmOS/Src/launcher/forms/forminfo.cpp
scummvm/trunk/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp
scummvm/trunk/backends/platform/PalmOS/Src/launcher/forms/formmusic.cpp
scummvm/trunk/backends/platform/PalmOS/Src/launcher/forms/formtabs.cpp
scummvm/trunk/backends/platform/PalmOS/Src/launcher/games.cpp
scummvm/trunk/backends/platform/PalmOS/Src/launcher/launch.cpp
scummvm/trunk/backends/platform/PalmOS/Src/launcher/skin.cpp
scummvm/trunk/backends/platform/PalmOS/Src/launcher/start.cpp
scummvm/trunk/backends/platform/PalmOS/Src/launcher/start.h
scummvm/trunk/backends/platform/PalmOS/Src/modules.cpp
scummvm/trunk/backends/platform/PalmOS/Src/native/pace.h
scummvm/trunk/backends/platform/PalmOS/Src/native/zodiacARM.cpp
scummvm/trunk/backends/platform/PalmOS/Src/os5_gfx.cpp
scummvm/trunk/backends/platform/PalmOS/Src/os5_mouse.cpp
scummvm/trunk/backends/platform/PalmOS/Src/os5_sound.cpp
scummvm/trunk/backends/platform/PalmOS/Src/prefixes/compile.h
scummvm/trunk/backends/platform/PalmOS/Src/zodiac_event.cpp
scummvm/trunk/backends/platform/PalmOS/Src/zodiac_gfx.cpp
scummvm/trunk/backends/platform/PalmOS/Src/zodiac_mouse.cpp
scummvm/trunk/backends/platform/PalmOS/Src/zodiac_overlay.cpp
scummvm/trunk/backends/platform/dc/cache.S
scummvm/trunk/backends/platform/dc/display.cpp
scummvm/trunk/backends/platform/dc/selector.cpp
scummvm/trunk/backends/platform/ds/arm7/Makefile
scummvm/trunk/backends/platform/ds/arm7/source/libcartreset/cartreset.c
scummvm/trunk/backends/platform/ds/arm7/source/libcartreset/cartreset_nolibfat.h
scummvm/trunk/backends/platform/ds/arm7/source/main.cpp
scummvm/trunk/backends/platform/ds/arm9/makefile
scummvm/trunk/backends/platform/ds/arm9/source/blitters.cpp
scummvm/trunk/backends/platform/ds/arm9/source/blitters.h
scummvm/trunk/backends/platform/ds/arm9/source/blitters.s
scummvm/trunk/backends/platform/ds/arm9/source/cdaudio.cpp
scummvm/trunk/backends/platform/ds/arm9/source/cdaudio.h
scummvm/trunk/backends/platform/ds/arm9/source/console2.h
scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp
scummvm/trunk/backends/platform/ds/arm9/source/dsmain.h
scummvm/trunk/backends/platform/ds/arm9/source/dsoptions.cpp
scummvm/trunk/backends/platform/ds/arm9/source/dsoptions.h
scummvm/trunk/backends/platform/ds/arm9/source/fat/disc_io.c
scummvm/trunk/backends/platform/ds/arm9/source/fat/disc_io.h
scummvm/trunk/backends/platform/ds/arm9/source/fat/gba_nds_fat.c
scummvm/trunk/backends/platform/ds/arm9/source/fat/gba_nds_fat.h
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_dldi.h
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_dldi.s
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_efa2.c
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_fcsr.c
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_fcsr.h
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_m3_common.c
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_m3_common.h
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_m3cf.c
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_m3cf.h
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_m3sd.c
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_m3sd_asm.s
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_mmcf.c
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_mmcf.h
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_mpcf.c
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_mpcf.h
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_njsd.c
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_njsd.h
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_nmmc.c
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_nmmc.h
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_sccf.c
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_sccf.h
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_scsd.c
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_scsd.h
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_scsd_asm.s
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_sd_common.c
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_sd_common.h
scummvm/trunk/backends/platform/ds/arm9/source/gbampsave.cpp
scummvm/trunk/backends/platform/ds/arm9/source/gbampsave.h
scummvm/trunk/backends/platform/ds/arm9/source/keys.cpp
scummvm/trunk/backends/platform/ds/arm9/source/libcartreset/cartreset.c
scummvm/trunk/backends/platform/ds/arm9/source/libcartreset/cartreset_nolibfat.h
scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp
scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h
scummvm/trunk/backends/platform/ds/arm9/source/portdefs.h
scummvm/trunk/backends/platform/ds/arm9/source/ramsave.cpp
scummvm/trunk/backends/platform/ds/arm9/source/ramsave.h
scummvm/trunk/backends/platform/ds/arm9/source/scummconsole.c
scummvm/trunk/backends/platform/ds/arm9/source/scummconsole.h
scummvm/trunk/backends/platform/ds/arm9/source/scummhelp.cpp
scummvm/trunk/backends/platform/ds/arm9/source/scummhelp.h
scummvm/trunk/backends/platform/ds/arm9/source/touchkeyboard.cpp
scummvm/trunk/backends/platform/ds/arm9/source/touchkeyboard.h
scummvm/trunk/backends/platform/ds/arm9/source/wordcompletion.cpp
scummvm/trunk/backends/platform/ds/arm9/source/zipreader.cpp
scummvm/trunk/backends/platform/ds/arm9/source/zipreader.h
scummvm/trunk/backends/platform/ds/commoninclude/NDS/scummvm_ipc.h
scummvm/trunk/backends/platform/gp2x/build/bundle.sh
scummvm/trunk/backends/platform/gp2x/build/config.sh
scummvm/trunk/backends/platform/gp2x/module.mk
scummvm/trunk/backends/platform/gp32/gp32_main.cpp
scummvm/trunk/backends/platform/gp32/gp32_osys.cpp
scummvm/trunk/backends/platform/gp32/gp32_osys.h
scummvm/trunk/backends/platform/gp32/gp32std.cpp
scummvm/trunk/backends/platform/gp32/gp32std_input.cpp
scummvm/trunk/backends/platform/gp32/gp32std_sound.cpp
scummvm/trunk/backends/platform/gp32/gp_asmlib.s
scummvm/trunk/backends/platform/gp32/memcpy.S
scummvm/trunk/backends/platform/gp32/portdefs.h
scummvm/trunk/backends/platform/iphone/iphone_common.h
scummvm/trunk/backends/platform/iphone/iphone_main.m
scummvm/trunk/backends/platform/iphone/iphone_video.m
scummvm/trunk/backends/platform/iphone/module.mk
scummvm/trunk/backends/platform/iphone/osys_iphone.cpp
scummvm/trunk/backends/platform/iphone/osys_iphone.h
scummvm/trunk/backends/platform/maemo/hildon.cpp
scummvm/trunk/backends/platform/maemo/main.cpp
scummvm/trunk/backends/platform/maemo/portdefs.h
scummvm/trunk/backends/platform/maemo/scummvm-0.11.0-maemo.patch
scummvm/trunk/backends/platform/ps2/Gs2dScreen.cpp
scummvm/trunk/backends/platform/ps2/cd.c
scummvm/trunk/backends/platform/ps2/iop/CoDyVDfs/iop/codyvdfs.c
scummvm/trunk/backends/platform/ps2/iop/CoDyVDfs/iop/fiofs.c
scummvm/trunk/backends/platform/ps2/iop/CoDyVDfs/iop/imports.lst
scummvm/trunk/backends/platform/ps2/iop/CoDyVDfs/iop/rpcfs.c
scummvm/trunk/backends/platform/ps2/irxboot.cpp
scummvm/trunk/backends/platform/ps2/savefile.cpp
scummvm/trunk/backends/platform/ps2/savefile.h
scummvm/trunk/backends/platform/ps2/systemps2.cpp
scummvm/trunk/backends/platform/psp/Makefile
scummvm/trunk/backends/platform/psp/README.PSP
scummvm/trunk/backends/platform/psp/kbd_l_c.cpp
scummvm/trunk/backends/platform/psp/kbd_ls_c.cpp
scummvm/trunk/backends/platform/psp/kbd_s_c.cpp
scummvm/trunk/backends/platform/psp/kbd_ss_c.cpp
scummvm/trunk/backends/platform/psp/osys_psp.cpp
scummvm/trunk/backends/platform/psp/osys_psp.h
scummvm/trunk/backends/platform/psp/osys_psp_gu.cpp
scummvm/trunk/backends/platform/psp/osys_psp_gu.h
scummvm/trunk/backends/platform/psp/portdefs.h
scummvm/trunk/backends/platform/psp/psp_main.cpp
scummvm/trunk/backends/platform/psp/trace.cpp
scummvm/trunk/backends/platform/sdl/graphics.cpp
scummvm/trunk/backends/platform/sdl/main.cpp
scummvm/trunk/backends/platform/sdl/sdl.cpp
scummvm/trunk/backends/platform/symbian/AdaptAllMMPs.pl
scummvm/trunk/backends/platform/symbian/BuildPackageUpload_AllVersions.pl
scummvm/trunk/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
scummvm/trunk/backends/platform/symbian/README
scummvm/trunk/backends/platform/symbian/S60/ScummVM_S60.mmp.in
scummvm/trunk/backends/platform/symbian/S60/ScummVM_S60_App.mmp
scummvm/trunk/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg
scummvm/trunk/backends/platform/symbian/S60v3/ScummVM_Loc.rss
scummvm/trunk/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
scummvm/trunk/backends/platform/symbian/S60v3/icons.mk
scummvm/trunk/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
scummvm/trunk/backends/platform/symbian/S60v3/scummvm_reg.rss
scummvm/trunk/backends/platform/symbian/S80/ScummVM_S80.mmp.in
scummvm/trunk/backends/platform/symbian/S80/ScummVM_S80_App.mmp
scummvm/trunk/backends/platform/symbian/S80/scummvm-CVS-SymbianS80.pkg
scummvm/trunk/backends/platform/symbian/S90/Scummvm_S90.mmp.in
scummvm/trunk/backends/platform/symbian/S90/Scummvm_S90_App.mmp
scummvm/trunk/backends/platform/symbian/S90/scummvm-CVS-SymbianS90.pkg
scummvm/trunk/backends/platform/symbian/UIQ2/ScummVM.rss
scummvm/trunk/backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in
scummvm/trunk/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2.pkg
scummvm/trunk/backends/platform/symbian/UIQ3/ScummVM.rss
scummvm/trunk/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
scummvm/trunk/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
scummvm/trunk/backends/platform/symbian/UIQ3/scummvm_loc.rss
scummvm/trunk/backends/platform/symbian/UIQ3/scummvm_reg.rss
scummvm/trunk/backends/platform/symbian/mmp/scummvm_base.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_igor.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_lure.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_scumm.mmp.in
scummvm/trunk/backends/platform/symbian/res/ScummVmAif.rss
scummvm/trunk/backends/platform/symbian/res/scummvm.rss
scummvm/trunk/backends/platform/symbian/src/ScummApp.cpp
scummvm/trunk/backends/platform/symbian/src/SymbianActions.cpp
scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
scummvm/trunk/backends/platform/symbian/src/main_features.inl
scummvm/trunk/backends/platform/symbian/src/portdefs.h
scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp
scummvm/trunk/backends/platform/wince/CEActionsSmartphone.cpp
scummvm/trunk/backends/platform/wince/CEDevice.cpp
scummvm/trunk/backends/platform/wince/CEScaler.cpp
scummvm/trunk/backends/platform/wince/Makefile
scummvm/trunk/backends/platform/wince/README-WinCE.txt
scummvm/trunk/backends/platform/wince/missing/missing.cpp
scummvm/trunk/backends/platform/wince/missing/time.h
scummvm/trunk/backends/platform/wince/stub.cpp
scummvm/trunk/backends/platform/wince/wince-sdl.cpp
scummvm/trunk/backends/platform/x11/x11.cpp
scummvm/trunk/backends/plugins/dc/dc-provider.cpp
scummvm/trunk/backends/plugins/dynamic-plugin.h
scummvm/trunk/backends/plugins/posix/posix-provider.cpp
scummvm/trunk/backends/plugins/sdl/sdl-provider.cpp
scummvm/trunk/backends/plugins/win32/win32-provider.cpp
scummvm/trunk/backends/saves/default/default-saves.cpp
scummvm/trunk/backends/saves/default/default-saves.h
scummvm/trunk/backends/saves/savefile.cpp
scummvm/trunk/backends/timer/default/default-timer.h
scummvm/trunk/base/module.mk
scummvm/trunk/common/config-manager.cpp
scummvm/trunk/common/config-manager.h
scummvm/trunk/common/endian.h
scummvm/trunk/common/events.h
scummvm/trunk/common/file.cpp
scummvm/trunk/common/fs.cpp
scummvm/trunk/common/fs.h
scummvm/trunk/common/func.h
scummvm/trunk/common/hashmap.h
scummvm/trunk/common/keyboard.h
scummvm/trunk/common/list.h
scummvm/trunk/common/md5.cpp
scummvm/trunk/common/md5.h
scummvm/trunk/common/module.mk
scummvm/trunk/common/savefile.h
scummvm/trunk/common/str.h
scummvm/trunk/common/system.h
scummvm/trunk/common/util.h
scummvm/trunk/configure
scummvm/trunk/dists/debian/changelog
scummvm/trunk/dists/debian/prepare
scummvm/trunk/dists/redhat/README
scummvm/trunk/dists/redhat/scummvm-tools.spec
scummvm/trunk/dists/redhat/scummvm.spec
scummvm/trunk/dists/redhat/scummvm.spec.in
scummvm/trunk/dists/scummvm.6
scummvm/trunk/dists/slackware/scummvm.SlackBuild
scummvm/trunk/dists/slackware/scummvm.SlackBuild.in
scummvm/trunk/dists/slackware/slack-desc
scummvm/trunk/engines/agi/agi.cpp
scummvm/trunk/engines/agi/menu.h
scummvm/trunk/engines/agi/preagi_mickey.cpp
scummvm/trunk/engines/agi/preagi_mickey.h
scummvm/trunk/engines/agi/preagi_troll.cpp
scummvm/trunk/engines/agi/preagi_troll.h
scummvm/trunk/engines/agi/preagi_winnie.cpp
scummvm/trunk/engines/agi/predictive.cpp
scummvm/trunk/engines/agi/sound.h
scummvm/trunk/engines/agi/sprite.cpp
scummvm/trunk/engines/agi/sprite.h
scummvm/trunk/engines/agi/text.cpp
scummvm/trunk/engines/agi/view.cpp
scummvm/trunk/engines/agi/wagparser.h
scummvm/trunk/engines/agos/agos.cpp
scummvm/trunk/engines/agos/agos.h
scummvm/trunk/engines/agos/animation.h
scummvm/trunk/engines/agos/intern.h
scummvm/trunk/engines/agos/module.mk
scummvm/trunk/engines/agos/script_e2.cpp
scummvm/trunk/engines/cine/module.mk
scummvm/trunk/engines/cruise/actor.cpp
scummvm/trunk/engines/cruise/background.cpp
scummvm/trunk/engines/cruise/backgroundIncrust.cpp
scummvm/trunk/engines/cruise/cell.cpp
scummvm/trunk/engines/cruise/cruise_main.cpp
scummvm/trunk/engines/cruise/ctp.cpp
scummvm/trunk/engines/cruise/dataLoader.cpp
scummvm/trunk/engines/cruise/decompiler.cpp
scummvm/trunk/engines/cruise/function.cpp
scummvm/trunk/engines/cruise/mainDraw.cpp
scummvm/trunk/engines/cruise/module.mk
scummvm/trunk/engines/cruise/mouse.cpp
scummvm/trunk/engines/cruise/overlay.cpp
scummvm/trunk/engines/cruise/perso.cpp
scummvm/trunk/engines/cruise/saveload.cpp
scummvm/trunk/engines/cruise/vars.h
scummvm/trunk/engines/drascula/drascula.cpp
scummvm/trunk/engines/gob/coktelvideo.h
scummvm/trunk/engines/gob/game.h
scummvm/trunk/engines/gob/goblin.cpp
scummvm/trunk/engines/gob/map.h
scummvm/trunk/engines/gob/module.mk
scummvm/trunk/engines/gob/mult.h
scummvm/trunk/engines/gob/music.h
scummvm/trunk/engines/gob/parse.h
scummvm/trunk/engines/gob/scenery.h
scummvm/trunk/engines/gob/sound.h
scummvm/trunk/engines/igor/parts/part_05.cpp
scummvm/trunk/engines/igor/parts/part_17.cpp
scummvm/trunk/engines/igor/parts/part_21.cpp
scummvm/trunk/engines/kyra/animator_v1.h
scummvm/trunk/engines/kyra/animator_v2.cpp
scummvm/trunk/engines/kyra/debugger.cpp
scummvm/trunk/engines/kyra/gui_v1.cpp
scummvm/trunk/engines/kyra/gui_v2.cpp
scummvm/trunk/engines/kyra/items_v1.cpp
scummvm/trunk/engines/kyra/items_v2.cpp
scummvm/trunk/engines/kyra/kyra.cpp
scummvm/trunk/engines/kyra/kyra.h
scummvm/trunk/engines/kyra/kyra_v1.cpp
scummvm/trunk/engines/kyra/kyra_v1.h
scummvm/trunk/engines/kyra/kyra_v2.cpp
scummvm/trunk/engines/kyra/kyra_v2.h
scummvm/trunk/engines/kyra/kyra_v3.cpp
scummvm/trunk/engines/kyra/kyra_v3.h
scummvm/trunk/engines/kyra/module.mk
scummvm/trunk/engines/kyra/resource.cpp
scummvm/trunk/engines/kyra/scene.cpp
scummvm/trunk/engines/kyra/scene_v1.cpp
scummvm/trunk/engines/kyra/scene_v2.cpp
scummvm/trunk/engines/kyra/screen.cpp
scummvm/trunk/engines/kyra/screen.h
scummvm/trunk/engines/kyra/screen_v1.h
scummvm/trunk/engines/kyra/screen_v2.cpp
scummvm/trunk/engines/kyra/screen_v2.h
scummvm/trunk/engines/kyra/script.h
scummvm/trunk/engines/kyra/script_v2.cpp
scummvm/trunk/engines/kyra/seqplayer.h
scummvm/trunk/engines/kyra/sequences_v1.cpp
scummvm/trunk/engines/kyra/sequences_v2.cpp
scummvm/trunk/engines/kyra/sound.cpp
scummvm/trunk/engines/kyra/sound_digital.cpp
scummvm/trunk/engines/kyra/sound_v1.cpp
scummvm/trunk/engines/kyra/sprites.h
scummvm/trunk/engines/kyra/staticres.cpp
scummvm/trunk/engines/kyra/text.h
scummvm/trunk/engines/kyra/text_v1.cpp
scummvm/trunk/engines/kyra/text_v2.cpp
scummvm/trunk/engines/kyra/timer.cpp
scummvm/trunk/engines/kyra/timer.h
scummvm/trunk/engines/kyra/timer_v1.cpp
scummvm/trunk/engines/kyra/timer_v2.cpp
scummvm/trunk/engines/kyra/util.h
scummvm/trunk/engines/kyra/wsamovie.h
scummvm/trunk/engines/lure/animseq.cpp
scummvm/trunk/engines/lure/animseq.h
scummvm/trunk/engines/lure/debugger.cpp
scummvm/trunk/engines/lure/decode.cpp
scummvm/trunk/engines/lure/decode.h
scummvm/trunk/engines/lure/fights.cpp
scummvm/trunk/engines/lure/game.cpp
scummvm/trunk/engines/lure/hotspots.cpp
scummvm/trunk/engines/lure/hotspots.h
scummvm/trunk/engines/lure/intro.cpp
scummvm/trunk/engines/lure/lure.cpp
scummvm/trunk/engines/lure/lure.h
scummvm/trunk/engines/lure/luredefs.h
scummvm/trunk/engines/lure/menu.cpp
scummvm/trunk/engines/lure/module.mk
scummvm/trunk/engines/lure/palette.cpp
scummvm/trunk/engines/lure/palette.h
scummvm/trunk/engines/lure/res.cpp
scummvm/trunk/engines/lure/res.h
scummvm/trunk/engines/lure/res_struct.cpp
scummvm/trunk/engines/lure/res_struct.h
scummvm/trunk/engines/lure/room.cpp
scummvm/trunk/engines/lure/screen.cpp
scummvm/trunk/engines/lure/scripts.cpp
scummvm/trunk/engines/lure/sound.cpp
scummvm/trunk/engines/lure/sound.h
scummvm/trunk/engines/lure/strings.cpp
scummvm/trunk/engines/lure/surface.cpp
scummvm/trunk/engines/lure/surface.h
scummvm/trunk/engines/module.mk
scummvm/trunk/engines/queen/defs.h
scummvm/trunk/engines/queen/display.cpp
scummvm/trunk/engines/queen/xref.txt
scummvm/trunk/engines/saga/actor.cpp
scummvm/trunk/engines/saga/actor.h
scummvm/trunk/engines/saga/actor_path.cpp
scummvm/trunk/engines/saga/actor_walk.cpp
scummvm/trunk/engines/saga/animation.cpp
scummvm/trunk/engines/saga/console.cpp
scummvm/trunk/engines/saga/detection.cpp
scummvm/trunk/engines/saga/detection_tables.h
scummvm/trunk/engines/saga/font.cpp
scummvm/trunk/engines/saga/font.h
scummvm/trunk/engines/saga/ihnm_introproc.cpp
scummvm/trunk/engines/saga/interface.cpp
scummvm/trunk/engines/saga/ite_introproc.cpp
scummvm/trunk/engines/saga/module.mk
scummvm/trunk/engines/saga/music.cpp
scummvm/trunk/engines/saga/objectmap.cpp
scummvm/trunk/engines/saga/puzzle.cpp
scummvm/trunk/engines/saga/rscfile.cpp
scummvm/trunk/engines/saga/rscfile.h
scummvm/trunk/engines/saga/saga.h
scummvm/trunk/engines/saga/sagaresnames.h
scummvm/trunk/engines/saga/scene.cpp
scummvm/trunk/engines/saga/script.cpp
scummvm/trunk/engines/saga/sfuncs.cpp
scummvm/trunk/engines/saga/sndres.cpp
scummvm/trunk/engines/saga/sprite.cpp
scummvm/trunk/engines/saga/xref.txt
scummvm/trunk/engines/scumm/cursor.cpp
scummvm/trunk/engines/scumm/detection.h
scummvm/trunk/engines/scumm/dialogs.cpp
scummvm/trunk/engines/scumm/dialogs.h
scummvm/trunk/engines/scumm/file_nes.cpp
scummvm/trunk/engines/scumm/gfx.cpp
scummvm/trunk/engines/scumm/he/animation_he.h
scummvm/trunk/engines/scumm/he/resource_he.h
scummvm/trunk/engines/scumm/he/script_v72he.cpp
scummvm/trunk/engines/scumm/he/sound_he.h
scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp
scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.h
scummvm/trunk/engines/scumm/intern.h
scummvm/trunk/engines/scumm/module.mk
scummvm/trunk/engines/scumm/object.h
scummvm/trunk/engines/scumm/saveload.cpp
scummvm/trunk/engines/scumm/script_v6.cpp
scummvm/trunk/engines/scumm/scumm.h
scummvm/trunk/engines/scumm/sound.cpp
scummvm/trunk/engines/scumm/verbs.cpp
scummvm/trunk/engines/sky/module.mk
scummvm/trunk/engines/sky/music/adlibchannel.h
scummvm/trunk/engines/sky/music/gmchannel.cpp
scummvm/trunk/engines/sky/music/mt32music.cpp
scummvm/trunk/engines/sky/music/musicbase.cpp
scummvm/trunk/engines/sword1/animation.h
scummvm/trunk/engines/sword1/module.mk
scummvm/trunk/engines/sword1/resman.h
scummvm/trunk/engines/sword2/header.h
scummvm/trunk/engines/sword2/module.mk
scummvm/trunk/engines/sword2/mouse.h
scummvm/trunk/engines/sword2/object.h
scummvm/trunk/graphics/colormasks.h
scummvm/trunk/graphics/module.mk
scummvm/trunk/graphics/scaler/hq2x_i386.asm
scummvm/trunk/graphics/scaler/hq3x_i386.asm
scummvm/trunk/graphics/scaler.cpp
scummvm/trunk/gui/ThemeClassic.cpp
scummvm/trunk/gui/ThemeClassic.h
scummvm/trunk/gui/ThemeModern.cpp
scummvm/trunk/gui/ThemeModern.h
scummvm/trunk/gui/console.h
scummvm/trunk/gui/debugger.h
scummvm/trunk/gui/massadd.h
scummvm/trunk/gui/module.mk
scummvm/trunk/gui/newgui.h
scummvm/trunk/gui/options.h
scummvm/trunk/gui/theme-config.cpp
scummvm/trunk/gui/theme.cpp
scummvm/trunk/gui/theme.h
scummvm/trunk/rules.mk
scummvm/trunk/sound/adpcm.h
scummvm/trunk/sound/flac.cpp
scummvm/trunk/sound/mididrv.h
scummvm/trunk/sound/mods/infogrames.cpp
scummvm/trunk/sound/mods/paula.cpp
scummvm/trunk/sound/mods/paula.h
scummvm/trunk/sound/mp3.cpp
scummvm/trunk/sound/softsynth/adlib.cpp
scummvm/trunk/sound/softsynth/mt32/module.mk
scummvm/trunk/sound/softsynth/mt32/structures.h
scummvm/trunk/sound/softsynth/ym2612.cpp
scummvm/trunk/sound/vorbis.cpp
scummvm/trunk/test/common/hashmap.h
scummvm/trunk/test/common/list.h
scummvm/trunk/test/common/pack.h
scummvm/trunk/test/module.mk
scummvm/trunk/tools/README
scummvm/trunk/tools/agi-palex.py
scummvm/trunk/tools/convbdf.c
scummvm/trunk/tools/create_kyradat/Makefile
scummvm/trunk/tools/create_kyradat/create_kyradat.cpp
scummvm/trunk/tools/create_kyradat/create_kyradat.h
scummvm/trunk/tools/create_kyradat/hof_floppy.h
scummvm/trunk/tools/create_kyradat/hof_towns.h
scummvm/trunk/tools/create_kyradat/md5.cpp
scummvm/trunk/tools/create_kyradat/pak.cpp
scummvm/trunk/tools/create_kyradat/pak.h
scummvm/trunk/tools/create_kyradat/towns.h
scummvm/trunk/tools/create_kyradat/util.h
scummvm/trunk/tools/create_lure/create_lure_dat.cpp
scummvm/trunk/tools/create_lure/create_lure_dat.h
scummvm/trunk/tools/create_lure/process_actions.cpp
scummvm/trunk/tools/credits.pl
scummvm/trunk/tools/md5table.c
scummvm/trunk/tools/module.mk
scummvm/trunk/tools/skycpt/KmpSearch.cpp
scummvm/trunk/tools/skycpt/ReadMe.txt
scummvm/trunk/tools/skycpt/cptcompiler.cpp
scummvm/trunk/tools/skycpt/idFinder.cpp
scummvm/trunk/tools/update-version.pl
Modified: scummvm/trunk/Makefile
===================================================================
--- scummvm/trunk/Makefile 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/Makefile 2008-01-27 19:47:41 UTC (rev 30664)
@@ -21,7 +21,7 @@
CXXFLAGS:= -Wall $(CXXFLAGS)
# Turn off some annoying and not-so-useful warnings
-CXXFLAGS+= -Wno-long-long -Wno-multichar -Wno-unknown-pragmas -Wno-reorder
+CXXFLAGS+= -Wno-long-long -Wno-multichar -Wno-unknown-pragmas -Wno-reorder
# Enable even more warnings...
CXXFLAGS+= -pedantic -Wpointer-arith -Wcast-qual -Wconversion
CXXFLAGS+= -Wshadow -Wimplicit -Wundef -Wnon-virtual-dtor -Wwrite-strings
Modified: scummvm/trunk/Makefile.common
===================================================================
--- scummvm/trunk/Makefile.common 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/Makefile.common 2008-01-27 19:47:41 UTC (rev 30664)
@@ -52,7 +52,7 @@
# Depdir information
DEPDIRS = $(addsuffix $(DEPDIR),$(MODULE_DIRS))
-DEPFILES =
+DEPFILES =
# Make base/version.o depend on all other object files. This way if anything is
# changed, it causes version.cpp to be recompiled. This in turn ensures that
@@ -78,7 +78,7 @@
ifndef HAVE_GCC3
# If you use GCC, disable the above and enable this for intelligent
-# dependency tracking.
+# dependency tracking.
%.o: %.cpp
$(MKDIR) $(*D)/$(DEPDIR)
$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d2" $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
Modified: scummvm/trunk/NEWS
===================================================================
--- scummvm/trunk/NEWS 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/NEWS 2008-01-27 19:47:41 UTC (rev 30664)
@@ -20,7 +20,7 @@
New Ports:
- Added iPhone port.
- Added Maemo port for Nokia Internet tablets.
-
+
General:
- Added ARM assembly routines for code in the sound mixer and SCUMM
video playback, resulting in some nice speedups on several ports.
@@ -157,7 +157,7 @@
- Improved performance for S60v3 and UIQ3 using ARM target.
- Limited support for pre Symbian OS9 devices due to compiler issues.
- Updated key mapping handling.
-
+
WinCE Port:
- Switched to using a GCC toolchain for building.
- Major update to the SDL lib. Better, faster, more compatible :-)
@@ -274,13 +274,13 @@
- Missing data files are handled more gracefully.
WinCE Port:
- - Added: PocketPC: Vertical oversampling scaler 320x200=>320x240 when panel not shown (n0p)
- - Added: PocketPC: Right click by double-tapping (n0p)
- - Fixed: All: Clipping issues in some cases
- - Added: PocketPC: Mouse emulation using keys
- - Added: Smartphones: Virtual keyboard popup
- - Fixed: Smartphones: Incorrect screen blit in SDL port
- - Added: All: Mouse cursor visible on panel if using emulated mouse
+ - Added: PocketPC: Vertical oversampling scaler 320x200=>320x240 when panel not shown (n0p)
+ - Added: PocketPC: Right click by double-tapping (n0p)
+ - Fixed: All: Clipping issues in some cases
+ - Added: PocketPC: Mouse emulation using keys
+ - Added: Smartphones: Virtual keyboard popup
+ - Fixed: Smartphones: Incorrect screen blit in SDL port
+ - Added: All: Mouse cursor visible on panel if using emulated mouse
- Added: All: Inverse landscape mode
- Fixed: PocketPC: Dialogs cut-off/not redrawn
@@ -298,7 +298,7 @@
- Should fix weird crashes with DOTT stamp and in FOA (#1399830 #1392815)
- Fixed Monkey Island blocking keyboard panel on Smartphones (thks Knakos)
- Fixed QVGA Smartphone detection (mean it this time :p)
- - Fixed Smartphone double right click issue.
+ - Fixed Smartphone double right click issue.
0.8.1 (2006-01-31)
General:
@@ -437,12 +437,12 @@
SCUMM:
- Fixed wrong actor animation in Full Throttle INSANE
-
+
Windows Mobile port (PocketPC / Smartphone) :
- Fixed FOTAQ crash on all platforms when leaving the hotel AGAIN
- Better low quality Adlib emulation for FOTAQ
- Fix randomly broken Hide Toolbar option (thanks iKi)
- - Fix first hardware key mapping (was not displayed before)
+ - Fix first hardware key mapping (was not displayed before)
- Fix BASS & Simon hangs on Smartphone when using the Skip hotkey
- Fix Zone key action on Smartphone (now mapped on key 9)
- Experimental third party VGA mode (SE-VGA) fix
@@ -494,7 +494,7 @@
file. This removes the need for using the 'RESCUMM' program
- Added smooth horizontal scrolling for The Dig, Full Throttle and COMI
(matching the original engine)
- - Partially rewrote the text engine, fixing various bugs, especially in
+ - Partially rewrote the text engine, fixing various bugs, especially in
newer games (The Dig, COMI)
- Fixed actor drawing glitches in V1 Maniac and Zak
- Fixed ship-to-ship graphic glitches in COMI
@@ -521,7 +521,7 @@
0.6.1b (2004-08-03)
General:
- - Fixed copy/paste bug in launcher that may corrupt the Savegame Path
+ - Fixed copy/paste bug in launcher that may corrupt the Savegame Path
- Fixed crashes on 64-bit architectures
SCUMM:
@@ -602,7 +602,7 @@
- Keyboard support for cannon battle in Curse of Monkey Island
- Keyboard support for derby scene in Full Throttle
-0.5.1 (2003-08-06)
+0.5.1 (2003-08-06)
- Rewrote Beneath a Steel Sky savegame code (see note in READMEs 'Known Bugs')
- Fixed dialog skipping, music volume and several crashes/freezes in Steel Sky
- Fixed dialog skipping in V7 games
@@ -644,7 +644,7 @@
- Added support for the EGA versions of Loom, Monkey Island and Indy3
- Improved music support in Indy3 and the floppy versions of Monkey Island
- Many Simon the Sorcerer 1 & 2 improvements and fixes
-- Very pre-alpha Beneath a Steel Sky code. Don't expect it to do anything.
+- Very pre-alpha Beneath a Steel Sky code. Don't expect it to do anything.
- Even more pre-alpha support for V2 SCUMM games (Maniac Mansion and Zak)
- Preliminary support for early Humongous Entertainment titles (very
experimental)
Modified: scummvm/trunk/README
===================================================================
--- scummvm/trunk/README 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/README 2008-01-27 19:47:41 UTC (rev 30664)
@@ -149,12 +149,12 @@
King's Quest II [kq2]
King's Quest III [kq3]
King's Quest IV [kq4]
- Leisure Suit Larry in the Land of the
+ Leisure Suit Larry in the Land of the
Lounge Lizards [lsl1]
Mixed-Up Mother Goose [mixedup]
Manhunter 1: New York [mh1]
Manhunter 2: San Francisco [mh2]
- Police Quest I: In Pursuit of the Death
+ Police Quest I: In Pursuit of the Death
Angel [pq1]
Space Quest I: The Sarien Encounter [sq1]
Space Quest II: Vohaul's Revenge [sq2]
@@ -401,7 +401,7 @@
For systems that are too slow to handle the decoding of FLAC audio,
the audio for these cutscenes is also provided separately as OGG Vorbis audio.
Viewing these cutscenes with OGG Vorbis audio requires a version of ScummVM
-compiled with both libVorbis and zlib support.
+compiled with both libVorbis and zlib support.
The cutscenes should be placed in the main game data directory. Note that
currently this requires either copying the game to hard disk or burning
@@ -512,7 +512,7 @@
Many of the files necessary for the game are stored in an InstallShield file
called data1.cab, which ScummVM is unable to unpack. You will need to use the
-original installer or i5comp to unpack the contents of this file. The i5comp
+original installer or i5comp to unpack the contents of this file. The i5comp
decompression tool, can be found via a search on the internet.
The game uses Smacker cutscenes extensively, which we can't support directly,
@@ -565,7 +565,7 @@
words 'quit' and 'suit' map to the same number, namely 7848. In these cases the
(#)next button lights up. By pressing it, you can cycle through the list of
words sharing the same code and finally accept the correct one by pressing
-(0)space or the Ok button.
+(0)space or the Ok button.
The second input method (123) is the numeric input: Each key you press is
entered verbatim as a number.
@@ -1788,7 +1788,7 @@
* run 'make config'
* run 'make scummvm'
* create your debian/changelog in top directory
- * run 'make deb' in backends/platform/maemo
+ * run 'make deb' in backends/platform/maemo
------------------------------------------------------------------------
Good Luck and Happy Adventuring!
Modified: scummvm/trunk/backends/events/default/default-events.cpp
===================================================================
--- scummvm/trunk/backends/events/default/default-events.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/events/default/default-events.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -60,7 +60,7 @@
break;
default:
break;
- }
+ }
}
void writeRecord(Common::OutSaveFile *outFile, uint32 diff, Common::Event &event) {
@@ -174,7 +174,7 @@
// conf vars
ConfMan.setBool("subtitles", _playbackFile->readByte() != 0);
-
+
_recordCount = _playbackFile->readUint32LE();
_recordTimeCount = _playbackFile->readUint32LE();
randomSourceCount = _playbackFile->readUint32LE();
@@ -274,7 +274,7 @@
break;
default:
break;
- }
+ }
event = _playbackEvent;
_hasPlaybackEvent = false;
_lastEventCount = _eventCount;
@@ -361,7 +361,7 @@
if (event.type != Common::EVENT_QUIT) {
result = playback(event);
}
- } else {
+ } else {
if (_recordMode == kRecorderRecord) {
if (result) {
record(event);
Modified: scummvm/trunk/backends/events/default/default-events.h
===================================================================
--- scummvm/trunk/backends/events/default/default-events.h 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/events/default/default-events.h 2008-01-27 19:47:41 UTC (rev 30664)
@@ -48,13 +48,13 @@
int _buttonState;
int _modifierState;
bool _shouldQuit;
-
+
class RandomSourceRecord {
public:
Common::String name;
uint32 seed;
};
- Common::Array<RandomSourceRecord> _randomSourceRecords;
+ Common::Array<RandomSourceRecord> _randomSourceRecords;
bool _recordSubtitles;
volatile uint32 _recordCount;
@@ -70,7 +70,7 @@
volatile uint32 _playbackDiff;
volatile bool _hasPlaybackEvent;
volatile uint32 _playbackTimeCount;
- Common::Event _playbackEvent;
+ Common::Event _playbackEvent;
Common::InSaveFile *_playbackFile;
Common::InSaveFile *_playbackTimeFile;
@@ -86,7 +86,7 @@
Common::String _recordFileName;
Common::String _recordTempFileName;
Common::String _recordTimeFileName;
-
+
// for continuous events (keyDown)
enum {
kKeyRepeatInitialDelay = 400,
Modified: scummvm/trunk/backends/fs/abstract-fs-factory.cpp
===================================================================
--- scummvm/trunk/backends/fs/abstract-fs-factory.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/fs/abstract-fs-factory.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -27,7 +27,7 @@
/*
* All the following includes choose, at compile time, which specific backend will be used
* during the execution of the ScummVM.
- *
+ *
* It has to be done this way because not all the necessary libraries will be available in
* all build environments. Additionally, this results in smaller binaries.
*/
@@ -57,8 +57,8 @@
/**
* Creates concrete FilesystemFactory objects depending on the current architecture.
- *
- * @return AbstractFilesystemFactory* The specific factory for the current architecture.
+ *
+ * @return AbstractFilesystemFactory* The specific factory for the current architecture.
*/
AbstractFilesystemFactory *AbstractFilesystemFactory::makeFSFactory() {
#if defined(__amigaos4__)
Modified: scummvm/trunk/backends/fs/abstract-fs.h
===================================================================
--- scummvm/trunk/backends/fs/abstract-fs.h 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/fs/abstract-fs.h 2008-01-27 19:47:41 UTC (rev 30664)
@@ -46,7 +46,7 @@
friend class FilesystemNode;
typedef Common::String String;
typedef FilesystemNode::ListMode ListMode;
-
+
/**
* Returns the child node with the given name. If no child with this name
* exists, returns 0. When called on a non-directory node, it should
@@ -55,13 +55,13 @@
* Example:
* Calling getChild() for a node with path "/foo/bar" using name="file.txt",
* would produce a new node with "/foo/bar/file.txt" as path.
- *
+ *
* @note This function will append a separator char (\ or /) to the end of the
* path if needed.
- *
+ *
* @note Handling calls on non-dir nodes gracefully makes it possible to
* switch to a lazy type detection scheme in the future.
- *
+ *
* @param name String containing the name of the child to create a new node.
*/
virtual AbstractFilesystemNode *getChild(const String &name) const = 0;
@@ -77,7 +77,7 @@
* Destructor.
*/
virtual ~AbstractFilesystemNode() {}
-
+
/*
* Indicates whether the object referred by this path exists in the filesystem or not.
*/
@@ -86,65 +86,65 @@
/**
* Return a list of child nodes of this directory node. If called on a node
* that does not represent a directory, false is returned.
- *
+ *
* @param list List to put the contents of the directory in.
* @param mode Mode to use while listing the directory.
* @param hidden Whether to include hidden files or not in the results.
- *
+ *
* @return true if succesful, false otherwise (e.g. when the directory does not exist).
*/
virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const = 0;
/**
* Returns a human readable path string.
- *
+ *
* @note By default, this method returns the value of getName().
*/
virtual String getDisplayName() const { return getName(); }
-
+
/**
* Returns the last component of the path pointed by this FilesystemNode.
- *
+ *
* Examples (POSIX):
* /foo/bar.txt would return /bar.txt
* /foo/bar/ would return /bar/
- *
+ *
* @note This method is very architecture dependent, please check the concrete implementation for more information.
*/
virtual String getName() const = 0;
-
+
/**
* Returns the 'path' of the current node, usable in fopen().
*/
virtual String getPath() const = 0;
-
+
/**
* Indicates whether this path refers to a directory or not.
*/
virtual bool isDirectory() const = 0;
-
+
/**
* Indicates whether the object referred by this path can be read from or not.
- *
- * If the path refers to a directory, readability implies being able to read
+ *
+ * If the path refers to a directory, readability implies being able to read
* and list the directory entries.
- *
- * If the path refers to a file, readability implies being able to read the
+ *
+ * If the path refers to a file, readability implies being able to read the
* contents of the file.
- *
+ *
* @return bool true if the object can be read, false otherwise.
*/
virtual bool isReadable() const = 0;
-
+
/**
* Indicates whether the object referred by this path can be written to or not.
- *
+ *
* If the path refers to a directory, writability implies being able to modify
* the directory entry (i.e. rename the directory, remove it or write files inside of it).
- *
+ *
* If the path refers to a file, writability implies being able to write data
* to the file.
- *
+ *
* @return bool true if the object can be written to, false otherwise.
*/
virtual bool isWritable() const = 0;
Modified: scummvm/trunk/backends/fs/amigaos4/amigaos4-fs-factory.h
===================================================================
--- scummvm/trunk/backends/fs/amigaos4/amigaos4-fs-factory.h 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/fs/amigaos4/amigaos4-fs-factory.h 2008-01-27 19:47:41 UTC (rev 30664)
@@ -30,20 +30,20 @@
/**
* Creates AmigaOSFilesystemNode objects.
- *
+ *
* Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
*/
-class AmigaOSFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<AmigaOSFilesystemFactory> {
+class AmigaOSFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<AmigaOSFilesystemFactory> {
public:
typedef Common::String String;
-
+
virtual AbstractFilesystemNode *makeRootFileNode() const;
virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const;
-
+
protected:
AmigaOSFilesystemFactory() {};
-
+
private:
friend class Common::Singleton<SingletonBaseType>;
};
Modified: scummvm/trunk/backends/fs/amigaos4/amigaos4-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/amigaos4/amigaos4-fs.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/fs/amigaos4/amigaos4-fs.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -46,7 +46,7 @@
/**
* Implementation of the ScummVM file system API.
- *
+ *
* Parts of this class are documented in the base interface class, AbstractFilesystemNode.
*/
class AmigaOSFilesystemNode : public AbstractFilesystemNode {
@@ -56,11 +56,11 @@
String _sPath;
bool _bIsDirectory;
bool _bIsValid;
-
+
/**
* Obtain the FileInfoBlock protection value for this FilesystemNode,
* as defined in the <proto/dos.h> header.
- *
+ *
* @return -1 if there were errors, 0 or a positive integer otherwise.
*/
virtual int getFibProtection() const;
@@ -70,14 +70,14 @@
* Creates a AmigaOSFilesystemNode with the root node as path.
*/
AmigaOSFilesystemNode();
-
+
/**
* Creates a AmigaOSFilesystemNode for a given path.
- *
+ *
* @param path String with the path the new node should point to.
*/
AmigaOSFilesystemNode(const String &p);
-
+
/**
* FIXME: document this constructor.
*/
@@ -85,11 +85,11 @@
/**
* Copy constructor.
- *
+ *
* @note Needed because it duplicates the file lock
*/
AmigaOSFilesystemNode(const AmigaOSFilesystemNode &node);
-
+
/**
* Destructor.
*/
@@ -102,11 +102,11 @@
virtual bool isDirectory() const { return _bIsDirectory; };
virtual bool isReadable() const;
virtual bool isWritable() const;
-
+
virtual AbstractFilesystemNode *getChild(const String &n) const;
virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
virtual AbstractFilesystemNode *getParent() const;
-
+
/**
* Creates a list with all the volumes present in the root node.
*/
@@ -115,18 +115,18 @@
/**
* Returns the last component of a given path.
- *
+ *
* @param str String containing the path.
* @return Pointer to the first char of the last component inside str.
*/
const char *lastPathComponent(const Common::String &str) {
int offset = str.size();
-
+
if (offset <= 0) {
debug(6, "Bad offset");
return 0;
}
-
+
const char *p = str.c_str();
while (offset > 0 && (p[offset-1] == '/' || p[offset-1] == ':'))
@@ -189,7 +189,7 @@
else {
//_bIsDirectory = false;
_bIsValid = true;
- }
+ }
}
IDOS->UnLock(pLock);
@@ -220,7 +220,7 @@
delete [] n;
return;
}
-
+
bufSize *= 2;
delete [] n;
}
@@ -248,7 +248,7 @@
else {
//_bIsDirectory = false;
_bIsValid = true;
- }
+ }
}
IDOS->FreeDosObject(DOS_FIB, fib);
@@ -277,23 +277,23 @@
ENTER();
if(_sPath.empty())
return false;
-
+
bool nodeExists = false;
-
+
struct FileInfoBlock *fib = (struct FileInfoBlock *)IDOS->AllocDosObject(DOS_FIB, NULL);
if (!fib) {
debug(6, "FileInfoBlock is NULL");
LEAVE();
return false;
}
-
+
BPTR pLock = IDOS->Lock((STRPTR)_sPath.c_str(), SHARED_LOCK);
if (pLock) {
if (IDOS->Examine(pLock, fib) != DOSFALSE)
nodeExists = true;
IDOS->UnLock(pLock);
}
-
+
IDOS->FreeDosObject(DOS_FIB, fib);
LEAVE();
return nodeExists;
@@ -402,13 +402,13 @@
}
LEAVE();
-
+
return true;
}
int AmigaOSFilesystemNode::getFibProtection() const {
ENTER();
-
+
int fibProt = -1;
struct FileInfoBlock *fib = (struct FileInfoBlock *)IDOS->AllocDosObject(DOS_FIB, NULL);
if (!fib) {
@@ -416,7 +416,7 @@
LEAVE();
return fibProt;
}
-
+
BPTR pLock = IDOS->Lock((STRPTR)_sPath.c_str(), SHARED_LOCK);
if (pLock) {
if (IDOS->Examine(pLock, fib) != DOSFALSE) {
@@ -424,7 +424,7 @@
}
IDOS->UnLock(pLock);
}
-
+
IDOS->FreeDosObject(DOS_FIB, fib);
LEAVE();
return fibProt;
@@ -456,39 +456,39 @@
node = new AmigaOSFilesystemNode();
LEAVE();
-
+
return node;
}
bool AmigaOSFilesystemNode::isReadable() const {
bool readable = false;
int fibProt = getFibProtection();
-
+
if (fibProt >= 0) {
/* The fib_Protection flag is low-active or inverted, thus the negation.
- *
+ *
* For more information, consult the compiler/include/dos/dos.h
* file from the AROS source (http://aros.sourceforge.net/).
*/
readable = !(fibProt & FIBF_READ);
}
-
+
return readable;
}
bool AmigaOSFilesystemNode::isWritable() const {
bool writable = false;
int fibProt = getFibProtection();
-
+
if (fibProt >= 0) {
/* The fib_Protection flag is low-active or inverted, thus the negation.
- *
+ *
* For more information, consult the compiler/include/dos/dos.h
* file from the AROS source (http://aros.sourceforge.net/).
*/
writable = !(fibProt & FIBF_WRITE);
}
-
+
return writable;
}
@@ -513,7 +513,7 @@
dosList->dol_Name &&
dosList->dol_Task) {
//const char *volName = (const char *)BADDR(dosList->dol_Name)+1;
-
+
// Copy name to buffer
IDOS->CopyStringBSTRToC(dosList->dol_Name, buffer, MAXPATHLEN);
@@ -533,7 +533,7 @@
// Find device name
IDOS->DevNameFromLock(volumeLock, devName, MAXPATHLEN, DN_DEVICEONLY);
-
+
sprintf(buffer, "%s (%s)", volName, devName);
delete [] devName;
@@ -562,7 +562,7 @@
IDOS->UnLockDosList(kLockFlags);
LEAVE();
-
+
return myList;
}
Modified: scummvm/trunk/backends/fs/dc/dc-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/dc/dc-fs.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/fs/dc/dc-fs.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -32,7 +32,7 @@
/**
* Implementation of the ScummVM file system API based on Ronin.
- *
+ *
* Parts of this class are documented in the base interface class, AbstractFilesystemNode.
*/
class RoninCDFilesystemNode : public AbstractFilesystemNode {
@@ -47,10 +47,10 @@
* Creates a RoninCDFilesystemNode with the root node as path.
*/
RoninCDFilesystemNode();
-
+
/**
* Creates a RoninCDFilesystemNode for a given path.
- *
+ *
* @param path String with the path the new node should point to.
* @param verify true if the isValid and isDirectory flags should be verified during the construction.
*/
@@ -71,18 +71,18 @@
/**
* Returns the last component of a given path.
- *
+ *
* Examples:
* /foo/bar.txt would return /bar.txt
* /foo/bar/ would return /bar/
- *
+ *
* @param str String containing the path.
* @return Pointer to the first char of the last component inside str.
*/
const char *lastPathComponent(const Common::String &str) {
if(str.empty())
return "";
-
+
const char *start = str.c_str();
const char *cur = start + str.size() - 2;
@@ -129,7 +129,7 @@
// FIXME: Pretty lame implementation! We do no error checking to speak
// of, do not check if this is a special node, etc.
assert(_isDirectory);
-
+
String newPath(_path);
if (_path.lastChar() != '/')
newPath += '/';
@@ -140,9 +140,9 @@
bool RoninCDFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, bool hidden) const {
assert(_isDirectory);
-
+
//TODO: honor the hidden flag
-
+
DIR *dirp = opendir(_path.c_str());
struct dirent *dp;
@@ -172,11 +172,11 @@
if (entry._isDirectory)
entry._path += "/";
-
+
myList.push_back(new RoninCDFilesystemNode(entry));
}
closedir(dirp);
-
+
return true;
}
Modified: scummvm/trunk/backends/fs/dc/ronincd-fs-factory.h
===================================================================
--- scummvm/trunk/backends/fs/dc/ronincd-fs-factory.h 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/fs/dc/ronincd-fs-factory.h 2008-01-27 19:47:41 UTC (rev 30664)
@@ -30,20 +30,20 @@
/**
* Creates RoninCDFilesystemNode objects.
- *
+ *
* Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
*/
-class RoninCDFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<RoninCDFilesystemFactory> {
+class RoninCDFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<RoninCDFilesystemFactory> {
public:
typedef Common::String String;
-
+
virtual AbstractFilesystemNode *makeRootFileNode() const;
virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const;
-
+
protected:
RoninCDFilesystemFactory() {};
-
+
private:
friend class Common::Singleton<SingletonBaseType>;
};
Modified: scummvm/trunk/backends/fs/ds/ds-fs-factory.h
===================================================================
--- scummvm/trunk/backends/fs/ds/ds-fs-factory.h 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/fs/ds/ds-fs-factory.h 2008-01-27 19:47:41 UTC (rev 30664)
@@ -30,20 +30,20 @@
/**
* Creates DSFilesystemNode objects.
- *
+ *
* Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
*/
-class DSFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<DSFilesystemFactory> {
+class DSFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<DSFilesystemFactory> {
public:
typedef Common::String String;
-
+
virtual AbstractFilesystemNode *makeRootFileNode() const;
virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const;
-
+
protected:
DSFilesystemFactory() {};
-
+
private:
friend class Common::Singleton<SingletonBaseType>;
};
Modified: scummvm/trunk/backends/fs/ds/ds-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/ds/ds-fs.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/fs/ds/ds-fs.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -8,7 +8,7 @@
* 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
@@ -49,7 +49,7 @@
_archive = (GBFS_FILE *) find_first_gbfs_file(scummdata);
if (!_archive) consolePrintf("No GBFS archive found!\n");
}*/
-
+
if (!_zipFile) {
_zipFile = new ZipFile();
}
@@ -57,19 +57,19 @@
DSFileSystemNode::DSFileSystemNode(const String& path) {
// consolePrintf("--%s ",path.c_str());
-
+
char disp[128];
char* pathStr = (char *) path.c_str();
-
+
int lastSlash = 3;
for (int r = 0; r < (int) strlen(pathStr) - 1; r++) {
if (path[r] == '\\') {
lastSlash = r;
}
}
-
+
strcpy(disp, pathStr + lastSlash + 1);
-
+
_displayName = String(disp);
_path = path;
// _isValid = true;
@@ -78,13 +78,13 @@
if (!strncmp(pathStr, "ds:/", 4)) {
pathStr += 4;
}
-
+
if (*pathStr == '\0') {
_isValid = true;
_isDirectory = true;
return;
}
-
+
_zipFile->setAllFilesVisible(true);
if (_zipFile->findFile(pathStr)) {
_isValid = true;
@@ -94,13 +94,13 @@
_isDirectory = false;
}
_zipFile->setAllFilesVisible(false);
-
+
// consolePrintf("%s - Found: %d, Dir: %d\n", pathStr, _isValid, _isDirectory);
}
DSFileSystemNode::DSFileSystemNode(const String& path, bool isDir) {
// consolePrintf("--%s ",path.c_str());
-
+
char disp[128];
char* pathStr = (char *) path.c_str();
int lastSlash = 3;
@@ -109,14 +109,14 @@
lastSlash = r;
}
}
-
+
strcpy(disp, pathStr + lastSlash + 1);
-
+
_displayName = String(disp);
_path = path;
_isValid = true;
_isDirectory = isDir;
-
+
// consolePrintf("Found: %d, Dir: %d\n", _isValid, _isDirectory);
}
@@ -130,7 +130,7 @@
} else {
return new DSFileSystemNode(_path + "\\" + n);
}
-
+
return NULL;
}
@@ -150,7 +150,7 @@
_zipFile->changeDirectory(&temp[4]);
} else {
_zipFile->changeToRoot();
-
+
/* // This is the root dir, so add the RAM folder
DSFileSystemNode* dsfsn = new DSFileSystemNode("ds:/ram");
dsfsn->_isDirectory = true;
@@ -160,21 +160,21 @@
} else {
_zipFile->changeDirectory(temp);
}
-
+
if (_zipFile->restartFile()) {
do {
- char n[128];
+ char n[128];
_zipFile->getFileName(n);
-
+
// consolePrintf("file: %s\n", n);
- if ( (_zipFile->isDirectory() && ((mode == FilesystemNode::kListDirectoriesOnly) || (mode == FilesystemNode::kListAll)) )
- || (!_zipFile->isDirectory() && ((mode == FilesystemNode::kListFilesOnly) || (mode == FilesystemNode::kListAll)) ) )
+ if ( (_zipFile->isDirectory() && ((mode == FilesystemNode::kListDirectoriesOnly) || (mode == FilesystemNode::kListAll)) )
+ || (!_zipFile->isDirectory() && ((mode == FilesystemNode::kListFilesOnly) || (mode == FilesystemNode::kListAll)) ) )
{
DSFileSystemNode* dsfsn = new DSFileSystemNode("ds:/" + String(n), _zipFile->isDirectory());
dsfsn->_isDirectory = _zipFile->isDirectory();
dirList.push_back((dsfsn));
}
-
+
} while (_zipFile->skipFile());
}
@@ -185,10 +185,10 @@
// consolePrintf("parent\n");
DSFileSystemNode *p;
- if (_path != "ds:/") {
+ if (_path != "ds:/") {
char *path = (char *) _path.c_str();
int lastSlash = 4;
-
+
for (int r = 4; r < (int) strlen((char *) path); r++) {
if (path[r] == '\\') {
lastSlash = r;
@@ -218,7 +218,7 @@
GBAMPFileSystemNode::GBAMPFileSystemNode(const String& path) {
// consolePrintf("'%s'",path.c_str());
-
+
char disp[128];
char* pathStr = (char *) path.c_str();
int lastSlash = 3;
@@ -227,12 +227,12 @@
lastSlash = r;
}
}
-
+
strcpy(disp, pathStr + lastSlash + 1);
char check[128];
int success;
-
+
memset(check, 0, 128);
if (strlen(pathStr) > 3) {
strcpy(check, pathStr + 3);
@@ -244,7 +244,7 @@
success = FT_DIR;
}
// consolePrintf("Path: %s (%d)\n", check, success);
-
+
_displayName = String(disp);
_path = path;
_isValid = success == FT_FILE;
@@ -253,7 +253,7 @@
GBAMPFileSystemNode::GBAMPFileSystemNode(const String& path, bool isDirectory) {
// consolePrintf("'%s'",path.c_str());
-
+
char disp[128];
char* pathStr = (char *) path.c_str();
int lastSlash = 3;
@@ -262,7 +262,7 @@
lastSlash = r;
}
}
-
+
strcpy(disp, pathStr + lastSlash + 1);
_displayName = String(disp);
@@ -282,7 +282,7 @@
} else {
return new DSFileSystemNode(_path + "\\" + n);
}
-
+
return NULL;
}
@@ -292,12 +292,12 @@
//TODO: honor the hidden flag
enum { TYPE_NO_MORE = 0, TYPE_FILE = 1, TYPE_DIR = 2 };
-
+
char temp[128], fname[256], *path, *pathTemp;
strcpy(temp, _path.c_str());
-
+
path = temp + 3;
-
+
pathTemp = path;
while (*pathTemp) {
if (*pathTemp == '\\') {
@@ -308,37 +308,37 @@
consolePrintf("This dir: %s\n", path);
FAT_chdir(path);
-
+
int entryType = FAT_FindFirstFileLFN(fname);
-
+
while (entryType != TYPE_NO_MORE) {
-
+
if ( ((entryType == TYPE_DIR) && ((mode == FilesystemNode::kListDirectoriesOnly) || (mode == FilesystemNode::kListAll)))
|| ((entryType == TYPE_FILE) && ((mode == FilesystemNode::kListFilesOnly) || (mode == FilesystemNode::kListAll))) ) {
GBAMPFileSystemNode* dsfsn;
consolePrintf("Fname: %s\n", fname);
-
+
if (strcmp(fname, ".") && strcmp(fname, "..")) {
-
+
if (!strcmp(path, "/")) {
dsfsn = new GBAMPFileSystemNode("mp:" + String(path) + String(fname), entryType == TYPE_DIR);
} else {
dsfsn = new GBAMPFileSystemNode("mp:" + String(path) + String("/") + String(fname), entryType == TYPE_DIR);
}
-
+
// dsfsn->_isDirectory = entryType == DIR;
dirList.push_back((dsfsn));
}
} else {
// consolePrintf("Skipping %s\n", fname);
}
-
+
entryType = FAT_FindNextFileLFN(fname);
}
-
+
// consolePrintf("No more");
-
+
FAT_chdir("/");
return true;
@@ -348,10 +348,10 @@
// consolePrintf("parent\n");
GBAMPFileSystemNode *p;
- if (_path != "mp:/") {
+ if (_path != "mp:/") {
char *path = (char *) _path.c_str();
int lastSlash = 4;
-
+
for (int r = 4; r < (int) strlen((char *) path); r++) {
if (path[r] == '/') {
lastSlash = r;
@@ -381,14 +381,14 @@
inited = true;
currentDir[0] = '\0';
}
-
+
char* realName = (char *) name;
-
+
// Remove file system prefix
if ((name[0] == 'd') && (name[1] == 's') && (name[2] == ':') && (name[3] == '/')) {
realName += 4;
}
-
+
if ((name[0] == 'm') && (name[1] == 'p') && (name[2] == ':') && (name[3] == '/')) {
realName += 4;
}
@@ -398,15 +398,15 @@
if (DS::isGBAMPAvailable()) {
FAT_chdir("/");
-
+
char* p = realName;
while (*p) {
if (*p == '\\') *p = '/';
p++;
}
-
+
FAT_FILE* result = FAT_fopen(realName, mode);
-
+
if (result == 0) {
// consolePrintf("Error code %d\n", result);
//consolePrintf("Opening file %s\n", realName);
@@ -414,16 +414,16 @@
// consolePrintf("Opened file %d\n", result);
}
// MT_memoryReport();
-
+
return (FILE *) result;
}
-
+
// Fail to open file for writing. It's in ROM!
-
+
// Allocate a file handle
int r = 0;
while (handle[r].used) r++;
-
+
if (strchr(mode, 'w')) {
// consolePrintf("Writing %s\n", realName);
handle[r].sramFile = (DSSaveFile *) DSSaveFileManager::instance()->openSavefile(realName, true);
@@ -439,22 +439,22 @@
handle[r].size = handle[r].sramFile->getSize();
// consolePrintf("Found it");
return &handle[r];
- }
+ }
// consolePrintf("Not in SRAM!");
char* data;
-
+
ZipFile* zip = DSFileSystemNode::getZip();
if (!zip) {
// consolePrintf("No zip yet!");
return NULL;
}
-
+
// Grab the data if it exists
-
+
zip->setAllFilesVisible(true);
-
+
if (currentDir[0] != 0) {
char nameWithPath[128];
sprintf(nameWithPath, "%s\%s", currentDir, realName);
@@ -462,16 +462,16 @@
}
// consolePrintf("fopen(%s, %s)\n", realName, name);
-
+
if (zip->findFile(realName)) {
data = zip->getFile();
zip->setAllFilesVisible(false);
-
+
// Allocate a file handle
int r = 0;
while (handle[r].used) r++;
-
-
+
+
handle[r].used = true;
handle[r].pos = 0;
handle[r].data = data;
@@ -512,26 +512,26 @@
return bytes / size;
}
return numItems;
-
+
/* int item = 0;
u8* data = (u8 *) ptr;
while ((item < numItems) && (!FAT_feof((FAT_FILE *) handle))) {
-
+
int bytes = 0;
while ((bytes < size) && (!FAT_feof((FAT_FILE *) handle))) {
*data++ = FAT_fgetc((FAT_FILE *) handle);
bytes++;
}
-
+
item++;
-
+
}
-
+
return item;
*/
int items = 0;
-
+
//for (int r = 0; r < numItems; r++) {
if (!std_feof(handle)) {
/* for (int t = 0; t < size; t++) {
@@ -540,7 +540,7 @@
}*/
int left = size * numItems;
int bytesRead = -1;
-
+
while ((left > 0) && (!FAT_feof((FAT_FILE *) handle))) {
int amount = left > 8192? 8192: left;
// do {
@@ -548,9 +548,9 @@
/* if (bytesRead == 0) {
consolePrintf("Pos:%d items:%d num:%d amount:%d read:%d\n", ftell(handle), items, numItems, amount, bytesRead);
left++;
-
+
int pos = ftell(handle);
-
+
fseek(handle, 0, SEEK_SET);
int c = getc(handle);
fseek(handle, pos - 1024, SEEK_SET);
@@ -562,21 +562,21 @@
} while (bytesRead == 0);
*/
left -= bytesRead;
- ptr = ((char *) (ptr)) + bytesRead;
+ ptr = ((char *) (ptr)) + bytesRead;
}
-
+
items = numItems - (left / size);
// FAT_fread((void *) ptr, size, 1, ((int) (handle)) - 1);
-// ptr = ((char *) (ptr)) + size;
+// ptr = ((char *) (ptr)) + size;
}
// }
-
+
// consolePrintf("...done %d \n", items)
return items;
}
-
+
if (handle->sramFile) {
int bytes = 0;
int result = 1;
@@ -586,9 +586,9 @@
bytes += result;
//consolePrintf("'%d',", ((char *) (ptr))[0]);
}
-
+
handle->pos += bytes;
-
+
return bytes / size;
}
@@ -607,7 +607,7 @@
size_t std_fwrite(const void* ptr, size_t size, size_t numItems, FILE* handle) {
if ((handle == stdin)) return 0;
-
+
if ((handle == stderr) || (handle == stdout)) {
// consolePrintf((char *) ptr);
return size;
@@ -618,18 +618,18 @@
if (DS::isGBAMPAvailable()) {
FAT_fwrite(((char *) (ptr)), size, numItems, (FAT_FILE *) handle);
return numItems;
-
+
int length = size * numItems;
int pos = 0;
-
+
while (pos < length) {
int amount = length > 512? 512: length;
-
+
FAT_fwrite(((char *) (ptr)) + pos, 1, amount, (FAT_FILE *) handle);
length -= amount;
- pos += amount;
- }
-
+ pos += amount;
+ }
+
return numItems;
}
@@ -651,7 +651,7 @@
if (DS::isGBAMPAvailable()) {
return FAT_feof((FAT_FILE *) handle);
}
-
+
if (handle->sramFile) {
return handle->sramFile->eos();
}
@@ -667,19 +667,19 @@
char* std_fgets(char* str, int size, FILE* file) {
// consolePrintf("fgets file=%d ", file);
-
+
if (DS::isGBAMPAvailable()) {
char* s = str;
while ((*s++ = std_getc(file)) >= 32) {
// consolePrintf("%d ", *s);
}
*s = 0;
-
+
// consolePrintf("Read:%s\n", str);
-
+
return str;
}
-
+
if (file->sramFile) {
file->pos--;
int p = -1;
@@ -694,7 +694,7 @@
// consolePrintf("Read:%s\n", str);
return str;
}
-
+
return NULL;
}
@@ -727,7 +727,7 @@
handle->pos = offset;
break;
}
-
+
return 0;
}
@@ -740,7 +740,7 @@
if (DS::isGBAMPAvailable()) {
char c;
FAT_fread(&c, 1, 1, (FAT_FILE *) handle);
-
+
return c;
}
@@ -763,15 +763,15 @@
if ((strlen(dir) >= 4) && (dir[0] == 'm') && (dir[1] == 'p') && (dir[2] == ':') && (dir[3] == '/')) {
realName += 4;
}
-
+
// consolePrintf("Real cwd:%d\n", realName);
-
+
char* p = realName;
while (*p) {
if (*p == '\\') *p = '/';
p++;
}
-
+
// consolePrintf("Real cwd:%d\n", realName);
FAT_chdir(realName);
} else {
@@ -784,13 +784,13 @@
if (*p == '\\') *p = '/';
p++;
}
-
+
strcpy(currentDir, realName);
if (*(currentDir + strlen(currentDir) - 1) == '/') {
*(currentDir + strlen(currentDir) - 1) = '\0';
}
// consolePrintf("CWD: %s\n", currentDir);
- }
+ }
}
int std_ferror(FILE* handle) {
@@ -801,11 +801,11 @@
/**
* Returns the last component of a given path.
- *
+ *
* Examples:
* /foo/bar.txt would return /bar.txt
* /foo/bar/ would return /bar/
- *
+ *
* @param str String containing the path.
* @return Pointer to the first char of the last component inside str.
*/
Modified: scummvm/trunk/backends/fs/ds/ds-fs.h
===================================================================
--- scummvm/trunk/backends/fs/ds/ds-fs.h 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/fs/ds/ds-fs.h 2008-01-27 19:47:41 UTC (rev 30664)
@@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
-
+
#ifndef _DS_FS_H
#define _DS_FS_H
@@ -36,7 +36,7 @@
/**
* Implementation of the ScummVM file system API.
* This class is used when a Flash cart is in use.
- *
+ *
* Parts of this class are documented in the base interface class, AbstractFilesystemNode.
*/
class DSFileSystemNode : public AbstractFilesystemNode {
@@ -50,33 +50,33 @@
bool _isDirectory;
bool _isValid;
int _refCountVal;
-
+
public:
/**
* Creates a DSFilesystemNode with the root node as path.
*/
DSFileSystemNode();
-
+
/**
* Creates a DSFilesystemNode for a given path.
- *
+ *
* @param path String with the path the new node should point to.
*/
DSFileSystemNode(const String &path);
-
+
/**
* Creates a DSFilesystemNode for a given path.
- *
+ *
* @param path String with the path the new node should point to.
* @param path true if path is a directory, false otherwise.
*/
DSFileSystemNode(const String& path, bool isDir);
-
+
/**
* Copy constructor.
*/
DSFileSystemNode(const DSFileSystemNode *node);
-
+
virtual bool exists() const { return true; } //FIXME: this is just a stub
virtual String getDisplayName() const { return _displayName; }
virtual String getName() const { return _displayName; }
@@ -84,7 +84,7 @@
virtual bool isDirectory() const { return _isDirectory; }
virtual bool isReadable() const { return true; } //FIXME: this is just a stub
virtual bool isWritable() const { return true; } //FIXME: this is just a stub
-
+
/**
* Returns a copy of this node.
*/
@@ -92,7 +92,7 @@
virtual AbstractFilesystemNode *getChild(const Common::String& name) const;
virtual bool getChildren(AbstractFSList &list, ListMode mode = FilesystemNode::kListDirectoriesOnly, bool hidden = false) const;
virtual AbstractFilesystemNode *getParent() const;
-
+
/**
* Returns the zip file this node points to.
* TODO: check this documentation.
@@ -103,7 +103,7 @@
/**
* Implementation of the ScummVM file system API.
* This class is used when the GBAMP (GBA Movie Player) is used with a CompactFlash card.
- *
+ *
* Parts of this class are documented in the base interface class, AbstractFilesystemNode.
*/
class GBAMPFileSystemNode : public AbstractFilesystemNode {
@@ -115,41 +115,41 @@
bool _isDirectory;
bool _isValid;
int _refCountVal;
-
+
public:
/**
* Creates a GBAMPFilesystemNode with the root node as path.
*/
GBAMPFileSystemNode();
-
+
/**
* Creates a GBAMPFilesystemNode for a given path.
- *
+ *
* @param path String with the path the new node should point to.
*/
GBAMPFileSystemNode(const String &path);
-
+
/**
* Creates a DSFilesystemNode for a given path.
- *
+ *
* @param path String with the path the new node should point to.
* @param path true if path is a directory, false otherwise.
*/
GBAMPFileSystemNode(const String &path, bool isDirectory);
-
+
/**
* Copy constructor.
*/
GBAMPFileSystemNode(const GBAMPFileSystemNode *node);
- virtual bool exists() const { return _isValid || _isDirectory; }
+ virtual bool exists() const { return _isValid || _isDirectory; }
virtual String getDisplayName() const { return _displayName; }
virtual String getName() const { return _displayName; }
virtual String getPath() const { return _path; }
virtual bool isDirectory() const { return _isDirectory; }
virtual bool isReadable() const { return true; } //FIXME: this is just a stub
virtual bool isWritable() const { return true; } //FIXME: this is just a stub
-
+
/**
* Returns a copy of this node.
*/
@@ -164,7 +164,7 @@
bool used;
char* data;
int size;
-
+
DSSaveFile* sramFile;
};
@@ -177,7 +177,7 @@
#define stdin ((DS::fileHandle*) -3)
#define FILE DS::fileHandle
-
+
// Please do not remove any of these prototypes that appear not to be required.
FILE* std_fopen(const char* name, const char* mode);
void std_fclose(FILE* handle);
Modified: scummvm/trunk/backends/fs/gp32/gp32-fs-factory.h
===================================================================
--- scummvm/trunk/backends/fs/gp32/gp32-fs-factory.h 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/fs/gp32/gp32-fs-factory.h 2008-01-27 19:47:41 UTC (rev 30664)
@@ -30,20 +30,20 @@
/**
* Creates GP32FilesystemNode objects.
- *
+ *
* Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
*/
-class GP32FilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<GP32FilesystemFactory> {
+class GP32FilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<GP32FilesystemFactory> {
public:
typedef Common::String String;
-
+
virtual AbstractFilesystemNode *makeRootFileNode() const;
virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const;
-
+
protected:
GP32FilesystemFactory() {};
-
+
private:
friend class Common::Singleton<SingletonBaseType>;
};
Modified: scummvm/trunk/backends/fs/gp32/gp32-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/gp32/gp32-fs.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/fs/gp32/gp32-fs.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -29,7 +29,7 @@
/**
* Implementation of the ScummVM file system API.
- *
+ *
* Parts of this class are documented in the base interface class, AbstractFilesystemNode.
*/
class GP32FilesystemNode : public AbstractFilesystemNode {
@@ -44,10 +44,10 @@
* Creates a GP32FilesystemNode with the root node as path.
*/
GP32FilesystemNode();
-
+
/**
* Creates a GP32FilesystemNode for a given path.
- *
+ *
* @param path String with the path the new node should point to.
*/
GP32FilesystemNode(const String &path);
@@ -72,18 +72,18 @@
/**
* Returns the last component of a given path.
- *
+ *
* Examples:
* gp:\foo\bar.txt would return "\bar.txt"
* gp:\foo\bar\ would return "\bar\"
- *
+ *
* @param str Path to obtain the last component from.
* @return Pointer to the first char of the last component inside str.
*/
const char *lastPathComponent(const Common::String &str) {
if(str.empty())
return "";
-
+
const char *start = str.c_str();
const char *cur = start + str.size() - 2;
@@ -96,7 +96,7 @@
/**
* FIXME: document this function.
- *
+ *
* @param path
* @param convPath
*/
@@ -165,7 +165,7 @@
_path = convPath;
pos = convPath;
-
+
while (*pos)
if (*pos++ == '\\')
dsplName = pos;
@@ -186,7 +186,7 @@
// FIXME: Pretty lame implementation! We do no error checking to speak
// of, do not check if this is a special node, etc.
assert(_isDirectory);
-
+
String newPath(_path);
if (_path.lastChar() != '\\')
newPath += '\\';
@@ -213,11 +213,11 @@
int startIdx = 0; // current file
String listDir(_path);
//listDir += "/";
-
+
while (GpDirEnumList(listDir.c_str(), startIdx++, 1, &dirEntry, &read) == SM_OK) {
da if (dirEntry.name[0] == '.')
continue;
-
+
entry._displayName = dirEntry.name;
entry._path = _path;
entry._path += dirEntry.name;
Modified: scummvm/trunk/backends/fs/morphos/abox-fs-factory.h
===================================================================
--- scummvm/trunk/backends/fs/morphos/abox-fs-factory.h 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/fs/morphos/abox-fs-factory.h 2008-01-27 19:47:41 UTC (rev 30664)
@@ -30,20 +30,20 @@
/**
* Creates ABoxFilesystemNode objects.
- *
+ *
* Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
*/
-class ABoxFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<ABoxFilesystemFactory> {
+class ABoxFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<ABoxFilesystemFactory> {
public:
typedef Common::String String;
-
+
virtual AbstractFilesystemNode *makeRootFileNode() const;
virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const;
-
+
protected:
ABoxFilesystemFactory() {};
-
+
private:
friend class Common::Singleton<SingletonBaseType>;
};
Modified: scummvm/trunk/backends/fs/morphos/abox-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/morphos/abox-fs.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/fs/morphos/abox-fs.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -35,7 +35,7 @@
/**
* Implementation of the ScummVM file system API based on the MorphOS A-Box API.
- *
+ *
* Parts of this class are documented in the base interface class, AbstractFilesystemNode.
*/
class ABoxFilesystemNode : public AbstractFilesystemNode {
@@ -51,19 +51,19 @@
* Creates a ABoxFilesystemNode with the root node as path.
*/
ABoxFilesystemNode();
-
+
/**
* Creates a ABoxFilesystemNode for a given path.
- *
+ *
* @param path String with the path the new node should point to.
*/
ABoxFilesystemNode(const String &p);
-
+
/**
* FIXME: document this constructor.
*/
ABoxFilesystemNode(BPTR lock, CONST_STRPTR display_name = NULL);
-
+
/**
* Copy constructor.
*/
@@ -81,11 +81,11 @@
virtual bool isDirectory() const { return _isDirectory; }
virtual bool isReadable() const { return true; } //FIXME: this is just a stub
virtual bool isWritable() const { return true; } //FIXME: this is just a stub
-
+
virtual AbstractFilesystemNode *getChild(const String &name) const;
virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
virtual AbstractFilesystemNode *getParent() const;
-
+
/**
* Return the list of child nodes for the root node.
*/
@@ -94,14 +94,14 @@
/**
* Returns the last component of a given path.
- *
+ *
* @param str String containing the path.
* @return Pointer to the first char of the last component inside str.
*/
const char *lastPathComponent(const Common::String &str) {
if (str.empty())
return "";
-
+
const char *str = _path.c_str();
while (offset > 0 && (str[offset-1] == '/' || str[offset-1] == ':') )
offset--;
@@ -109,7 +109,7 @@
len++;
offset--;
}
-
+
return str + offset;
}
@@ -162,7 +162,7 @@
_isValid = true;
}
}
-
+
UnLock(pLock);
}
@@ -217,7 +217,7 @@
_isValid = true;
}
}
-
+
FreeDosObject(DOS_FIB, fib);
}
@@ -262,7 +262,7 @@
bool ABoxFilesystemNode::getChildren(AbstractFSList &list, ListMode mode, bool hidden) const
{
//TODO: honor the hidden flag
-
+
if (!_isValid)
{
debug(6, "listDir() called on invalid node");
Modified: scummvm/trunk/backends/fs/palmos/palmos-fs-factory.h
===================================================================
--- scummvm/trunk/backends/fs/palmos/palmos-fs-factory.h 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/fs/palmos/palmos-fs-factory.h 2008-01-27 19:47:41 UTC (rev 30664)
@@ -30,20 +30,20 @@
/**
* Creates PalmOSFilesystemNode objects.
- *
+ *
* Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
*/
-class PalmOSFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<PalmOSFilesystemFactory> {
+class PalmOSFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<PalmOSFilesystemFactory> {
public:
typedef Common::String String;
-
+
virtual AbstractFilesystemNode *makeRootFileNode() const;
virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const;
-
+
protected:
PalmOSFilesystemFactory() {};
-
+
private:
friend class Common::Singleton<SingletonBaseType>;
};
Modified: scummvm/trunk/backends/fs/palmos/palmos-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/palmos/palmos-fs.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/fs/palmos/palmos-fs.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -31,7 +31,7 @@
/**
* Implementation of the ScummVM file system API based on PalmOS VFS API.
- *
+ *
* Parts of this class are documented in the base interface class, AbstractFilesystemNode.
*/
class PalmOSFilesystemNode : public AbstractFilesystemNode {
@@ -41,16 +41,16 @@
bool _isDirectory;
bool _isValid;
bool _isPseudoRoot;
-
+
public:
/**
* Creates a PalmOSFilesystemNode with the root node as path.
*/
PalmOSFilesystemNode();
-
+
/**
* Creates a POSIXFilesystemNode for a given path.
- *
+ *
* @param path String with the path the new node should point to.
*/
PalmOSFilesystemNode(const String &p);
@@ -70,8 +70,8 @@
private:
/**
* Adds a single WindowsFilesystemNode to a given list.
- * This method is used by getChildren() to populate the directory entries list.
- *
+ * This method is used by getChildren() to populate the directory entries list.
+ *
* @param list List to put the file entry node in.
* @param mode Mode to use while adding the file entry to the list.
* @param base String with the directory being listed.
@@ -82,18 +82,18 @@
/**
* Returns the last component of a given path.
- *
+ *
* Examples:
* /foo/bar.txt would return /bar.txt
* /foo/bar/ would return /bar/
- *
+ *
* @param str String containing the path.
* @return Pointer to the first char of the last component inside str.
*/
const char *lastPathComponent(const Common::String &str) {
if(str.empty())
return "";
-
+
const char *start = str.c_str();
const char *cur = start + str.size() - 2;
@@ -122,7 +122,7 @@
if (entry._isDirectory)
entry._path += "/";
- entry._isValid = true;
+ entry._isValid = true;
entry._isPseudoRoot = false;
list.push_back(new PalmOSFilesystemNode(entry));
@@ -161,7 +161,7 @@
AbstractFilesystemNode *PalmOSFilesystemNode::getChild(const String &n) const {
assert(_isDirectory);
-
+
String newPath(_path);
if (_path.lastChar() != '/')
newPath += '/';
@@ -172,7 +172,7 @@
Err error = VFSFileOpen(gVars->VFS.volRefNum, newPath.c_str(), vfsModeRead, &handle);
if (error)
return 0;
-
+
error = VFSFileGetAttributes(handle, &attr);
VFSFileClose(handle);
@@ -184,7 +184,7 @@
bool PalmOSFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, bool hidden) const {
//TODO: honor the hidden flag
-
+
Err error;
Char nameP[256];
FileInfoType desc;
@@ -197,7 +197,7 @@
if (error)
return false;
-
+
while (dirIterator != expIteratorStop) {
error = VFSDirEntryEnumerate(handle, &dirIterator, &desc);
if (!error) {
@@ -212,11 +212,11 @@
AbstractFilesystemNode *PalmOSFilesystemNode::getParent() const {
PalmOSFilesystemNode *p = 0;
-
+
if (!_isPseudoRoot) {
const char *start = _path.c_str();
const char *end = lastPathComponent(_path);
-
+
p = new PalmOSFilesystemNode();
p->_path = String(start, end - start);
p->_isValid = true;
@@ -224,7 +224,7 @@
p->_displayName = lastPathComponent(p->_path);
p->_isPseudoRoot =(p->_path == "/");
}
-
+
return p;
}
Modified: scummvm/trunk/backends/fs/posix/posix-fs-factory.h
===================================================================
--- scummvm/trunk/backends/fs/posix/posix-fs-factory.h 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/fs/posix/posix-fs-factory.h 2008-01-27 19:47:41 UTC (rev 30664)
@@ -30,20 +30,20 @@
/**
* Creates POSIXFilesystemNode objects.
- *
+ *
* Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
*/
class POSIXFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<POSIXFilesystemFactory> {
public:
typedef Common::String String;
-
+
virtual AbstractFilesystemNode *makeRootFileNode() const;
virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const;
-
+
protected:
POSIXFilesystemFactory() {};
-
+
private:
friend class Common::Singleton<SingletonBaseType>;
};
Modified: scummvm/trunk/backends/fs/posix/posix-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/posix/posix-fs.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/fs/posix/posix-fs.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -37,7 +37,7 @@
/**
* Implementation of the ScummVM file system API based on POSIX.
- *
+ *
* Parts of this class are documented in the base interface class, AbstractFilesystemNode.
*/
class POSIXFilesystemNode : public AbstractFilesystemNode {
@@ -52,15 +52,15 @@
* Creates a POSIXFilesystemNode with the root node as path.
*/
POSIXFilesystemNode();
-
+
/**
* Creates a POSIXFilesystemNode for a given path.
- *
+ *
* @param path String with the path the new node should point to.
* @param verify true if the isValid and isDirectory flags should be verified during the construction.
*/
POSIXFilesystemNode(const String &path, bool verify);
-
+
virtual bool exists() const { return access(_path.c_str(), F_OK) == 0; }
virtual String getDisplayName() const { return _displayName; }
virtual String getName() const { return _displayName; }
@@ -68,11 +68,11 @@
virtual bool isDirectory() const { return _isDirectory; }
virtual bool isReadable() const { return access(_path.c_str(), R_OK) == 0; }
virtual bool isWritable() const { return access(_path.c_str(), W_OK) == 0; }
-
+
virtual AbstractFilesystemNode *getChild(const String &n) const;
virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
virtual AbstractFilesystemNode *getParent() const;
-
+
private:
/**
* Tests and sets the _isValid and _isDirectory flags, using the stat() function.
@@ -82,18 +82,18 @@
/**
* Returns the last component of a given path.
- *
+ *
* Examples:
* /foo/bar.txt would return /bar.txt
* /foo/bar/ would return /bar/
- *
+ *
* @param str String containing the path.
* @return Pointer to the first char of the last component inside str.
*/
const char *lastPathComponent(const Common::String &str) {
if(str.empty())
return "";
-
+
const char *start = str.c_str();
const char *cur = start + str.size() - 2;
@@ -106,7 +106,7 @@
void POSIXFilesystemNode::setFlags() {
struct stat st;
-
+
_isValid = (0 == stat(_path.c_str(), &st));
_isDirectory = _isValid ? S_ISDIR(st.st_mode) : false;
}
@@ -146,18 +146,18 @@
// FIXME: Pretty lame implementation! We do no error checking to speak
// of, do not check if this is a special node, etc.
assert(_isDirectory);
-
+
String newPath(_path);
if (_path.lastChar() != '/')
newPath += '/';
newPath += n;
-
+
return new POSIXFilesystemNode(newPath, true);
}
bool POSIXFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, bool hidden) const {
assert(_isDirectory);
-
+
DIR *dirp = opendir(_path.c_str());
struct dirent *dp;
@@ -186,7 +186,7 @@
/* TODO: d_type is not part of POSIX, so it might not be supported
* on some of our targets. For those systems where it isn't supported,
* add this #elif case, which tries to use stat() instead.
- *
+ *
* The d_type method is used to avoid costly recurrent stat() calls in big
* directories.
*/
@@ -221,11 +221,11 @@
if (entry._isDirectory)
entry._path += "/";
-
+
myList.push_back(new POSIXFilesystemNode(entry));
}
closedir(dirp);
-
+
return true;
}
Modified: scummvm/trunk/backends/fs/ps2/ps2-fs-factory.h
===================================================================
--- scummvm/trunk/backends/fs/ps2/ps2-fs-factory.h 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/fs/ps2/ps2-fs-factory.h 2008-01-27 19:47:41 UTC (rev 30664)
@@ -30,20 +30,20 @@
/**
* Creates PS2FilesystemNode objects.
- *
+ *
* Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
*/
-class Ps2FilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<Ps2FilesystemFactory> {
+class Ps2FilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<Ps2FilesystemFactory> {
public:
typedef Common::String String;
-
+
virtual AbstractFilesystemNode *makeRootFileNode() const;
virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const;
-
+
protected:
Ps2FilesystemFactory() {};
-
+
private:
friend class Common::Singleton<SingletonBaseType>;
};
Modified: scummvm/trunk/backends/fs/ps2/ps2-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/ps2/ps2-fs.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/fs/ps2/ps2-fs.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -34,7 +34,7 @@
/**
* Implementation of the ScummVM file system API based on the Ps2SDK.
- *
+ *
* Parts of this class are documented in the base interface class, AbstractFilesystemNode.
*/
class Ps2FilesystemNode : public AbstractFilesystemNode {
@@ -49,14 +49,14 @@
* Creates a PS2FilesystemNode with the root node as path.
*/
Ps2FilesystemNode();
-
+
/**
* Creates a PS2FilesystemNode for a given path.
- *
+ *
* @param path String with the path the new node should point to.
*/
Ps2FilesystemNode(const String &path);
-
+
/**
* Copy constructor.
*/
@@ -78,7 +78,7 @@
/**
* Returns the last component of a given path.
- *
+ *
* @param str String containing the path.
* @return Pointer to the first char of the last component inside str.
*/
@@ -138,10 +138,10 @@
char listDir[256];
sprintf(listDir, "%s/", _path.c_str());
int fd = fio.dopen(listDir);
-
+
if (fd >= 0) {
iox_dirent_t dirent;
-
+
while (fio.dread(fd, &dirent) > 0) {
if (strcmp(n.c_str(), dirent.name) == 0) {
Ps2FilesystemNode *dirEntry = new Ps2FilesystemNode();
@@ -161,13 +161,13 @@
}
fio.dclose(fd);
}
-
+
return NULL;
}
bool Ps2FilesystemNode::getChildren(AbstractFSList &list, ListMode mode, bool hidden) const {
//TODO: honor the hidden flag
-
+
if (!_isDirectory)
return false;
@@ -194,14 +194,14 @@
} else {
char listDir[256];
int fd;
-
+
if (_path.lastChar() == '/')
fd = fio.dopen(_path.c_str());
else {
sprintf(listDir, "%s/", _path.c_str());
fd = fio.dopen(listDir);
}
-
+
if (fd >= 0) {
iox_dirent_t dirent;
Ps2FilesystemNode dirEntry;
Modified: scummvm/trunk/backends/fs/psp/psp-fs-factory.h
===================================================================
--- scummvm/trunk/backends/fs/psp/psp-fs-factory.h 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/fs/psp/psp-fs-factory.h 2008-01-27 19:47:41 UTC (rev 30664)
@@ -30,20 +30,20 @@
/**
* Creates PSPFilesystemNode objects.
- *
+ *
* Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
*/
-class PSPFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<PSPFilesystemFactory> {
+class PSPFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<PSPFilesystemFactory> {
public:
typedef Common::String String;
-
+
virtual AbstractFilesystemNode *makeRootFileNode() const;
virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const;
-
+
protected:
PSPFilesystemFactory() {};
-
+
private:
friend class Common::Singleton<SingletonBaseType>;
};
Modified: scummvm/trunk/backends/fs/psp/psp-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/psp/psp-fs.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/fs/psp/psp-fs.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -34,7 +34,7 @@
/**
* Implementation of the ScummVM file system API based on PSPSDK API.
- *
+ *
* Parts of this class are documented in the base interface class, AbstractFilesystemNode.
*/
class PSPFilesystemNode : public AbstractFilesystemNode {
@@ -43,16 +43,16 @@
String _path;
bool _isDirectory;
bool _isValid;
-
+
public:
/**
* Creates a PSPFilesystemNode with the root node as path.
*/
PSPFilesystemNode();
-
+
/**
* Creates a PSPFilesystemNode for a given path.
- *
+ *
* @param path String with the path the new node should point to.
* @param verify true if the isValid and isDirectory flags should be verified during the construction.
*/
@@ -73,18 +73,18 @@
/**
* Returns the last component of a given path.
- *
+ *
* Examples:
* /foo/bar.txt would return /bar.txt
* /foo/bar/ would return /bar/
- *
+ *
* @param str String containing the path.
* @return Pointer to the first char of the last component inside str.
*/
const char *lastPathComponent(const Common::String &str) {
if(str.empty())
return "";
-
+
const char *start = str.c_str();
const char *cur = start + str.size() - 2;
@@ -104,24 +104,24 @@
PSPFilesystemNode::PSPFilesystemNode(const Common::String &p, bool verify) {
assert(p.size() > 0);
-
+
_path = p;
_displayName = lastPathComponent(_path);
_isValid = true;
_isDirectory = true;
if (verify) {
- struct stat st;
+ struct stat st;
_isValid = (0 == stat(_path.c_str(), &st));
_isDirectory = S_ISDIR(st.st_mode);
- }
+ }
}
AbstractFilesystemNode *PSPFilesystemNode::getChild(const String &n) const {
// FIXME: Pretty lame implementation! We do no error checking to speak
// of, do not check if this is a special node, etc.
assert(_isDirectory);
-
+
String newPath(_path);
if (_path.lastChar() != '/')
newPath += '/';
@@ -137,30 +137,30 @@
int dfd = sceIoDopen(_path.c_str());
if (dfd > 0) {
- SceIoDirent dir;
+ SceIoDirent dir;
memset(&dir, 0, sizeof(dir));
-
+
while (sceIoDread(dfd, &dir) > 0) {
// Skip 'invisible files
- if (dir.d_name[0] == '.')
+ if (dir.d_name[0] == '.')
continue;
-
+
PSPFilesystemNode entry;
-
+
entry._isValid = true;
entry._displayName = dir.d_name;
entry._path = _path;
entry._path += dir.d_name;
entry._isDirectory = dir.d_stat.st_attr & FIO_SO_IFDIR;
-
+
if (entry._isDirectory)
entry._path += "/";
-
+
// Honor the chosen mode
if ((mode == FilesystemNode::kListFilesOnly && entry._isDirectory) ||
(mode == FilesystemNode::kListDirectoriesOnly && !entry._isDirectory))
continue;
-
+
myList.push_back(new PSPFilesystemNode(entry));
}
@@ -174,10 +174,10 @@
AbstractFilesystemNode *PSPFilesystemNode::getParent() const {
if (_path == ROOT_PATH)
return 0;
-
+
const char *start = _path.c_str();
const char *end = lastPathComponent(_path);
-
+
return new PSPFilesystemNode(String(start, end - start), false);
}
Modified: scummvm/trunk/backends/fs/symbian/symbian-fs-factory.h
===================================================================
--- scummvm/trunk/backends/fs/symbian/symbian-fs-factory.h 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/fs/symbian/symbian-fs-factory.h 2008-01-27 19:47:41 UTC (rev 30664)
@@ -30,20 +30,20 @@
/**
* Creates SymbianFilesystemNode objects.
- *
+ *
* Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
*/
-class SymbianFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<SymbianFilesystemFactory> {
+class SymbianFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<SymbianFilesystemFactory> {
public:
typedef Common::String String;
-
+
virtual AbstractFilesystemNode *makeRootFileNode() const;
virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const;
-
+
protected:
SymbianFilesystemFactory() {};
-
+
private:
friend class Common::Singleton<SingletonBaseType>;
};
Modified: scummvm/trunk/backends/fs/symbian/symbian-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/symbian/symbian-fs.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/fs/symbian/symbian-fs.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -22,7 +22,7 @@
* $Id$
*/
-#if defined (__SYMBIAN32__)
+#if defined (__SYMBIAN32__)
#include "backends/fs/abstract-fs.h"
#include <dirent.h>
@@ -32,7 +32,7 @@
/**
* Implementation of the ScummVM file system API based on POSIX.
- *
+ *
* Parts of this class are documented in the base interface class, AbstractFilesystemNode.
*/
class SymbianFilesystemNode : public AbstractFilesystemNode {
@@ -46,19 +46,19 @@
public:
/**
* Creates a SymbianFilesystemNode with the root node as path.
- *
+ *
* @param aIsRoot true if the node will be a pseudo root, false otherwise.
*/
SymbianFilesystemNode(bool aIsRoot);
-
+
/**
* Creates a SymbianFilesystemNode for a given path.
- *
+ *
* @param path String with the path the new node should point to.
*/
SymbianFilesystemNode(const String &path);
-
- virtual bool exists() const {
+
+ virtual bool exists() const {
TFileName fname;
TPtrC8 ptr((const unsigned char*)_path.c_str(),_path.size());
fname.Copy(ptr);
@@ -79,18 +79,18 @@
/**
* Returns the last component of a given path.
- *
+ *
* Examples:
* c:\foo\bar.txt would return "\bar.txt"
* c:\foo\bar\ would return "\bar\"
- *
+ *
* @param str Path to obtain the last component from.
* @return Pointer to the first char of the last component inside str.
*/
const char *lastPathComponent(const Common::String &str) {
if(str.empty())
return "";
-
+
const char *start = str.c_str();
const char *cur = start + str.size() - 2;
@@ -103,14 +103,14 @@
/**
* Fixes the path by changing all slashes to backslashes.
- *
+ *
* @param path String with the path to be fixed.
*/
static void fixFilePath(Common::String& path) {
TInt len = path.size();
-
+
for (TInt index = 0; index < len; index++) {
- if (path[index] == '/') {
+ if (path[index] == '/') {
path[index] = '\\';
}
}
@@ -132,7 +132,7 @@
_isPseudoRoot = false;
_path = path;
-
+
fixFilePath(_path);
_displayName = lastPathComponent(_path);
@@ -184,27 +184,27 @@
TVolumeInfo volumeInfo;
TBuf8<30> driveLabel8;
TBuf8<30> driveString8;
-
+
for (driveNumber=EDriveA; driveNumber<=EDriveZ; driveNumber++) {
TInt err = fs.Volume(volumeInfo, driveNumber);
if (err != KErrNone)
- continue;
+ continue;
if (fs.DriveToChar(driveNumber,driveLetter) != KErrNone)
continue;
driveLetterValue = driveLetter;
- if (volumeInfo.iName.Length() > 0) {
+ if (volumeInfo.iName.Length() > 0) {
driveLabel8.Copy(volumeInfo.iName); // 16 to 8bit des // enabling this line alone gives KERN-EXEC 3 with non-optimized GCC? WHY? grrr
driveString8.Format(_L8("Drive %c: (%S)"), driveLetterValue, &driveLabel8);
} else {
driveString8.Format(_L8("Drive %c:"), driveLetterValue);
}
-
+
char path[10];
sprintf(path,"%c:\\", driveNumber+'A');
-
- SymbianFilesystemNode entry(false);
+
+ SymbianFilesystemNode entry(false);
entry._displayName = (char*)driveString8.PtrZ(); // drive_name
entry._isDirectory = true;
entry._isValid = true;
@@ -226,17 +226,17 @@
nameBuf.Copy(fileentry.iName);
SymbianFilesystemNode entry(false);
entry._isPseudoRoot = false;
-
+
entry._displayName =(char*)nameBuf.PtrZ();
entry._path = _path;
entry._path +=(char*)nameBuf.PtrZ();
entry._isDirectory = fileentry.IsDir();
-
+
// Honor the chosen mode
if ((mode == FilesystemNode::kListFilesOnly && entry._isDirectory) ||
(mode == FilesystemNode::kListDirectoriesOnly && !entry._isDirectory))
continue;
-
+
if (entry._isDirectory)
entry._path += "\\";
myList.push_back(new SymbianFilesystemNode(entry));
@@ -244,7 +244,7 @@
CleanupStack::PopAndDestroy(dirPtr);
}
}
-
+
return true;
}
@@ -267,7 +267,7 @@
{
p = new SymbianFilesystemNode(true);
}
-
+
return p;
}
Modified: scummvm/trunk/backends/fs/windows/windows-fs-factory.h
===================================================================
--- scummvm/trunk/backends/fs/windows/windows-fs-factory.h 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/fs/windows/windows-fs-factory.h 2008-01-27 19:47:41 UTC (rev 30664)
@@ -30,20 +30,20 @@
/**
* Creates WindowsFilesystemNode objects.
- *
+ *
* Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
*/
-class WindowsFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<WindowsFilesystemFactory> {
+class WindowsFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<WindowsFilesystemFactory> {
public:
typedef Common::String String;
-
+
virtual AbstractFilesystemNode *makeRootFileNode() const;
virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const;
-
+
protected:
WindowsFilesystemFactory() {};
-
+
private:
friend class Common::Singleton<SingletonBaseType>;
};
Modified: scummvm/trunk/backends/fs/windows/windows-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/windows/windows-fs.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/fs/windows/windows-fs.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -141,7 +141,7 @@
const char *lastPathComponent(const Common::String &str) {
if(str.empty())
return "";
-
+
const char *start = str.c_str();
const char *cur = start + str.size() - 2;
Modified: scummvm/trunk/backends/midi/dmedia.cpp
===================================================================
--- scummvm/trunk/backends/midi/dmedia.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/midi/dmedia.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -18,8 +18,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL:
- * $Id: dmedia.cpp
+ * $URL:$
+ * $Id: dmedia.cpp$
*/
/*
@@ -27,7 +27,7 @@
* some code liberated from seq.cpp and coremidi.cpp
*/
-#if defined(IRIX)
+#if defined(IRIX)
#include "common/scummsys.h"
#include "sound/mpu401.h"
@@ -86,7 +86,7 @@
if (getenv("SCUMMVM_MIDIPORT")) {
_deviceNum = atoi(getenv("SCUMMVM_MIDIPORT"));
_midiportName = mdGetName(_deviceNum);
- }
+ }
else
{
_midiportName = mdGetName(0);
Modified: scummvm/trunk/backends/midi/timidity.cpp
===================================================================
--- scummvm/trunk/backends/midi/timidity.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/midi/timidity.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -168,7 +168,7 @@
return -1;
}
- /* should read greeting issued by server upon connect:
+ /* should read greeting issued by server upon connect:
* "220 TiMidity++ v2.13.2 ready)" */
res = timidity_ctl_command(NULL);
if (atoi(res) != 220) {
@@ -178,7 +178,7 @@
}
/*
- * setup buf and prepare data connection
+ * setup buf and prepare data connection
*/
/* should read: "200 OK" */
res = timidity_ctl_command("SETBUF %f %f", BUF_LOW_SYNC, BUF_HIGH_SYNC);
@@ -200,7 +200,7 @@
}
/*
- * open data connection
+ * open data connection
*/
data_port = atoi(res + 4);
if ((_data_fd = connect_to_server(timidity_host, data_port)) < 0) {
Modified: scummvm/trunk/backends/module.mk
===================================================================
--- scummvm/trunk/backends/module.mk 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/module.mk 2008-01-27 19:47:41 UTC (rev 30664)
@@ -21,5 +21,5 @@
saves/compressed/compressed-saves.o \
timer/default/default-timer.o
-# Include common rules
+# Include common rules
include $(srcdir)/rules.mk
Modified: scummvm/trunk/backends/platform/PalmOS/Src/base_event.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/base_event.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/platform/PalmOS/Src/base_event.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -208,7 +208,7 @@
sy = -1;
else if (keyCurrentState & _keyExtra.bitDown)
sy = +1;
-
+
if (keyCurrentState & _keyExtra.bitLeft)
sx = -1;
else if (keyCurrentState & _keyExtra.bitRight)
@@ -222,7 +222,7 @@
warpMouse(x, y);
return true;
- }
+ }
}
}
@@ -293,7 +293,7 @@
k = Common::KEYCODE_RIGHT; break;
case chrLeftArrow:
k = Common::KEYCODE_LEFT; break;
-
+
// return
case chrLineFeed:
case chrCarriageReturn:
@@ -314,10 +314,10 @@
return true;
// prevent crash when alarm is raised
- handled = ((ev.eType == keyDownEvent) &&
- (ev.data.keyDown.modifiers & commandKeyMask) &&
- ((ev.data.keyDown.chr == vchrAttnStateChanged) ||
- (ev.data.keyDown.chr == vchrAttnUnsnooze)));
+ handled = ((ev.eType == keyDownEvent) &&
+ (ev.data.keyDown.modifiers & commandKeyMask) &&
+ ((ev.data.keyDown.chr == vchrAttnStateChanged) ||
+ (ev.data.keyDown.chr == vchrAttnUnsnooze)));
// graffiti strokes, auto-off, etc...
if (!handled)
Modified: scummvm/trunk/backends/platform/PalmOS/Src/base_gfx.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/base_gfx.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/platform/PalmOS/Src/base_gfx.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -99,7 +99,7 @@
base[i].r = colors[0];
base[i].g = colors[1];
base[i].b = colors[2];
-
+
extras_palette(i + start, colors[0], colors[1], colors[2]);
colors += 4;
}
@@ -134,7 +134,7 @@
void OSystem_PalmBase::updateScreen() {
// Check whether the palette was changed in the meantime and update the
- // screen surface accordingly.
+ // screen surface accordingly.
if (_paletteDirtyEnd != 0 && _setPalette) {
WinSetDrawWindow(WinGetDisplayWindow());
WinPalette(winPaletteSet, _paletteDirtyStart, _paletteDirtyEnd - _paletteDirtyStart, _currentPalette + _paletteDirtyStart);
Modified: scummvm/trunk/backends/platform/PalmOS/Src/base_mouse.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/base_mouse.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/platform/PalmOS/Src/base_mouse.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -54,10 +54,10 @@
if (_mouseCurState.w != w || _mouseCurState.h != h) {
_mouseCurState.w = w;
_mouseCurState.h = h;
-
+
if (_mouseDataP)
free(_mouseDataP);
-
+
if (_mouseBackupP)
free(_mouseBackupP);
@@ -95,7 +95,7 @@
x = (x >= _screenWidth ) ? _screenWidth - 1 : x;
y = (y < 0 ) ? 0 : y;
y = (y >= _screenHeight ) ? _screenHeight - 1 : y;
-
+
*xr = x;
*yr = y;
}
Modified: scummvm/trunk/backends/platform/PalmOS/Src/be_base.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/be_base.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/platform/PalmOS/Src/be_base.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -45,13 +45,13 @@
_mode = _setMode;
_redawOSD = false;
_setPalette = true;
-
+
_offScreenH = NULL;
_screenH = NULL;
_offScreenP = NULL;
_screenP = NULL;
_screenPitch = gVars->screenPitch;
-
+
_wasKey = false;
_lastKeyModifier = kModifierNone;
_lastKeyRepeat = 100;
@@ -59,11 +59,11 @@
_showBatLow = false;
_batCheckTicks = SysTicksPerSecond() * 15;
_batCheckLast = TimGetTicks();
-
+
_saveMgr = 0;
_timerMgr = 0;
_mixerMgr = 0;
-
+
_mouseDataP = NULL;
_mouseBackupP = NULL;
_mouseVisible = false;
@@ -73,7 +73,7 @@
MemSet(&_mouseOldState, sizeof(_mouseOldState), 0);
MemSet(&_timer, sizeof(TimerType), 0);
MemSet(&_sound, sizeof(SoundType), 0);
-
+
_keyExtraRepeat = 0;
_keyExtraPressed = 0;
_keyExtraDelay = (gVars->arrowKeys) ? computeMsecs(125) : computeMsecs(25);
@@ -136,7 +136,7 @@
_timer.duration = timer;
_timer.nextExpiry = getMillis() + timer;
_timer.callback = callback;
- _timer.active = true;
+ _timer.active = true;
} else {
_timer.active = false;
}
@@ -155,7 +155,7 @@
delete _saveMgr;
delete _timerMgr;
delete _mixerMgr;
-
+
exit(0);
}
Modified: scummvm/trunk/backends/platform/PalmOS/Src/be_base.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/be_base.h 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/platform/PalmOS/Src/be_base.h 2008-01-27 19:47:41 UTC (rev 30664)
@@ -90,7 +90,7 @@
class OSystem_PalmBase : public OSystem {
private:
virtual void int_initBackend() { }
-
+
virtual const GraphicsMode *int_getSupportedGraphicsModes() const;
virtual void int_updateScreen() = 0;
virtual void int_initSize(uint w, uint h) = 0;
@@ -104,9 +104,9 @@
virtual void draw_mouse() = 0;
virtual void undraw_mouse() = 0;
-
+
virtual bool check_event(Common::Event &event, EventPtr ev) = 0;
-
+
virtual void timer_handler();
void battery_handler();
virtual void get_coordinates(EventPtr ev, Coord &x, Coord &y) = 0;
@@ -134,12 +134,12 @@
RGBColorType _currentPalette[256];
uint _paletteDirtyStart, _paletteDirtyEnd;
-
+
int _mode, _setMode;
int16 _screenWidth, _screenHeight;
Boolean _modeChanged, _gfxLoaded;
UInt32 _screenPitch;
-
+
PointType _screenOffset;
struct {
Coord w, h;
@@ -162,7 +162,7 @@
UInt32 bitActionA; // left mouse button
UInt32 bitActionB; // right mouse button
} _keyExtra;
-
+
bool _mouseVisible;
bool _mouseDrawn;
MousePos _mouseCurState;
@@ -171,14 +171,14 @@
int16 _mouseHotspotY;
byte _mouseKeyColor;
byte *_mouseDataP, *_mouseBackupP;
-
+
bool _wasKey;
UInt8 _lastKeyModifier;
UInt32 _lastKeyRepeat;
Boolean _useNumPad, _showBatLow;
UInt32 _batCheckTicks, _batCheckLast;
-
+
int _samplesPerSec;
public:
@@ -190,19 +190,19 @@
bool hasFeature(Feature f);
bool getFeatureState(Feature f);
-
+
virtual void beginGFXTransaction();
virtual void endGFXTransaction();
-
+
virtual int16 getOverlayHeight();
virtual int16 getOverlayWidth();
-
+
virtual OverlayColor ARGBToColor(uint8 a, uint8 r, uint8 g, uint8 b);
virtual void colorToARGB(OverlayColor color, uint8 &a, uint8 &r, uint8 &g, uint8 &b);
-
+
virtual void setCursorPalette(const byte *colors, uint start, uint num);
virtual void disableCursorPalette(bool disable);
-
+
virtual void displayMessageOnOSD(const char *msg);
*/
const GraphicsMode *getSupportedGraphicsModes() const;
@@ -233,25 +233,25 @@
void grabPalette(byte *colors, uint start, uint num);
virtual OverlayColor RGBToColor(uint8 r, uint8 g, uint8 b) = 0;
virtual void colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b) = 0;
-
+
bool pollEvent(Common::Event &event);
-
+
virtual uint32 getMillis();
virtual void delayMillis(uint msecs);
-
+
virtual void setTimerCallback(TimerProc callback, int interval);
virtual MutexRef createMutex() { return NULL; }
virtual void lockMutex(MutexRef mutex) {}
virtual void unlockMutex(MutexRef mutex) {}
virtual void deleteMutex(MutexRef mutex) {}
-
+
int getOutputSampleRate() const { return _samplesPerSec; }
virtual Audio::Mixer *getMixer();
void quit();
virtual void setWindowCaption(const char *caption) = 0;
-
+
Common::SaveFileManager *getSavefileManager();
Common::TimerManager *getTimerManager();
};
Modified: scummvm/trunk/backends/platform/PalmOS/Src/be_os5.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/be_os5.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/platform/PalmOS/Src/be_os5.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -29,7 +29,7 @@
OSystem_PalmOS5::OSystem_PalmOS5() : OSystem_PalmBase() {
_sound.active = false;
_setPalette = false;
-
+
_workScreenH = NULL;
_overlayH = NULL;
_isSwitchable = false;
@@ -67,9 +67,9 @@
h = gVars->screenHeight * _screenHeight / _screenWidth;
_screenOffset.x = 0;
- _screenOffset.y = (gVars->screenHeight - h) / 2;
+ _screenOffset.y = (gVars->screenHeight - h) / 2;
}
-
+
_screenDest.w = w;
_screenDest.h = h;
}
Modified: scummvm/trunk/backends/platform/PalmOS/Src/be_os5.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/be_os5.h 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/platform/PalmOS/Src/be_os5.h 2008-01-27 19:47:41 UTC (rev 30664)
@@ -115,7 +115,7 @@
OverlayColor *_overlayP;
WinHandle _overlayH, _workScreenH;
int16 *_workScreenP;
-
+
Boolean _isSwitchable, _wasRotated;
virtual void int_initBackend();
@@ -183,7 +183,7 @@
virtual void copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h);
virtual OverlayColor RGBToColor(uint8 r, uint8 g, uint8 b);
virtual void colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b);
-
+
void setWindowCaption(const char *caption);
};
Modified: scummvm/trunk/backends/platform/PalmOS/Src/be_os5ex.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/be_os5ex.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/platform/PalmOS/Src/be_os5ex.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -70,7 +70,7 @@
} else {
_timer.active = false;
}
-
+
if (!_timer.active)
_timerEx.timerID = 0;
}
Modified: scummvm/trunk/backends/platform/PalmOS/Src/be_zodiac.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/be_zodiac.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/platform/PalmOS/Src/be_zodiac.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -38,7 +38,7 @@
_keyExtra.bitDown = keyBitRockerDown;
_keyExtra.bitLeft = keyBitRockerLeft;
_keyExtra.bitRight = keyBitRockerRight;
-
+
// _keyExtra.bitActionA = keyBitActionD;
// _keyExtra.bitActionB = keyBitActionB;
}
Modified: scummvm/trunk/backends/platform/PalmOS/Src/be_zodiac.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/be_zodiac.h 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/platform/PalmOS/Src/be_zodiac.h 2008-01-27 19:47:41 UTC (rev 30664)
@@ -38,7 +38,7 @@
TwGfxSurfaceType *_palmScreenP, *_tmpScreenP;
TwGfxSurfaceType *_overlayP;
Boolean _fullscreen;
-
+
TwGfxPointType _srcPos;
TwGfxRectType _srcRect, _dstRect;
TwGfxBitmapType _srcBmp;
@@ -61,7 +61,7 @@
OSystem_PalmZodiac();
static OSystem *create();
-
+
void setFeatureState(Feature f, bool enable);
int getDefaultGraphicsMode() const;
Modified: scummvm/trunk/backends/platform/PalmOS/Src/cd_aeroplayer.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/cd_aeroplayer.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/platform/PalmOS/Src/cd_aeroplayer.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -36,7 +36,7 @@
bool AeroCDPlayer::init() {
aeroplayer_Startup();
_isInitialized = aeroplayer_PlayerIsActive();
-
+
if (_isInitialized)
_volumeLimit = aeroplayer_GetMaxVolumeIndex();
@@ -73,7 +73,7 @@
bool AeroCDPlayer::poll() {
return
- ( _pckLoops != 0 &&
+ ( _pckLoops != 0 &&
( getPosition() < _pckTrackEndFrame &&
getStatus() == AEROPLAYER_STATUS_PLAY
)
@@ -107,7 +107,7 @@
forceStop();
else {
//_pckStopTime = 0;
-
+
if (_pckTrackStartFrame == 0 && _pckTrackDuration == 0) {
setPosition(0);
} else {
@@ -136,10 +136,10 @@
Char fileP[100];
static const Char *ext[] = { "mp3", "ogg" };
-
+
// if (duration > 0)
// duration += 5;
-
+
_pckTrack = track;
_pckLoops = num_loops;
_pckTrackStartFrame = TO_MSECS(start_frame);
@@ -149,7 +149,7 @@
aeroplayer_Pause();
aeroplayer_PlayTrack(gVars->VFS.volRefNum, fileP);
aeroplayer_Pause();
-
+
if (_pckTrackStartFrame == 0 && _pckTrackDuration == 0) {
_pckTrackDuration = getDuration();
} else {
@@ -157,7 +157,7 @@
if (_pckTrackDuration == 0)
_pckTrackDuration = getDuration() - _pckTrackStartFrame;
}
-
+
aeroplayer_Play();
_pckStopTime = 0;
Modified: scummvm/trunk/backends/platform/PalmOS/Src/cd_aeroplayer.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/cd_aeroplayer.h 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/platform/PalmOS/Src/cd_aeroplayer.h 2008-01-27 19:47:41 UTC (rev 30664)
@@ -22,7 +22,7 @@
* $Id$
*
*/
-
+
#ifndef CD_AEROPLAYER_H
#define CD_AEROPLAYER_H
@@ -40,9 +40,9 @@
void update();
void play(int track, int num_loops, int start_frame, int duration);
void stop();
-
+
void setVolume(int volume);
-
+
private:
OSystem *_sys;
Char gameP[15];
Modified: scummvm/trunk/backends/platform/PalmOS/Src/cd_msa.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/cd_msa.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/platform/PalmOS/Src/cd_msa.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -49,7 +49,7 @@
if (!(error = FtrGet(sonySysFtrCreator, sonySysFtrNumSysInfoP, (UInt32*)&sonySysFtrSysInfoP))) {
// not found with audio adapter ?!
- //if (sonySysFtrSysInfoP->libr & sonySysFtrSysInfoLibrMsa) {
+ //if (sonySysFtrSysInfoP->libr & sonySysFtrSysInfoLibrMsa) {
if ((error = SysLibFind(sonySysLibNameMsa, &_msaRefNum)))
if (error == sysErrLibNotFound)
error = SysLibLoad(sonySysFileTMsaLib, sonySysFileCMsaLib, &_msaRefNum);
@@ -59,11 +59,11 @@
// this doesn't work the same way on build-in MP3 device and external MP3 devices
if (!error) {
//MsaLibClose(_msaRefNum, msaLibOpenModeAlbum); // close the lib if we previously let it open (?) Need to add Notify for sonySysNotifyMsaEnforceOpenEvent just in case ...
- error = MsaLibOpen(_msaRefNum, msaLibOpenModeAlbum);
+ error = MsaLibOpen(_msaRefNum, msaLibOpenModeAlbum);
//if (error == msaErrAlreadyOpen)
// error = MsaLibEnforceOpen(_msaRefNum, msaLibOpenModeAlbum, appFileCreator);
-
+
//error = (error != msaErrStillOpen) ? error : errNone;
}
//}
@@ -156,7 +156,7 @@
}
MsaStop(_msaRefNum, true);
-
+
if (_msaLoops == 0)
return;
@@ -194,13 +194,13 @@
if (!num_loops && !start_frame)
return;
-
+
_msaTrack = track + gVars->CD.firstTrack - 1; // first track >= 1 ?, not 0 (0=album)
_msaLoops = num_loops;
_msaStartFrame = TO_MSECS(start_frame);
_msaDuration = TO_MSECS(duration);
- Err e;
+ Err e;
MemHandle trackH;
// stop current play if any
@@ -215,19 +215,19 @@
MsaTime msaTime;
MsaTrackInfo *trackP;
UInt32 SU, fullLength;
-
+
// FIXME (?) : this enable MsaSuToTime to return the right value in some cases
MsaPlay(_msaRefNum, _msaTrack, 0, msa_PBRATE_SP);
MsaStop(_msaRefNum, true);
-
- // get the msa time
- trackP = (MsaTrackInfo *)MemHandleLock(trackH);
+
+ // get the msa time
+ trackP = (MsaTrackInfo *)MemHandleLock(trackH);
MsaSuToTime(_msaRefNum, trackP->totalsu, &msaTime);
SU = trackP->totalsu;
MemPtrUnlock(trackP);
MemHandleFree(trackH);
-
- // MSA frame in milli-seconds
+
+ // MSA frame in milli-seconds
fullLength = FROM_MIN(msaTime.minute);
fullLength += FROM_SEC(msaTime.second);
fullLength += msaTime.frame;
@@ -240,7 +240,7 @@
} else {
_msaTrackLength = fullLength;
}
-
+
// try to play the track
if (start_frame == 0 && duration == 0) {
MsaPlay(_msaRefNum, _msaTrack, 0, msa_PBRATE_SP);
@@ -250,7 +250,7 @@
_msaTrackStartSu = (UInt32) ((float)(_msaStartFrame) / ((float)fullLength / (float)SU));
_msaTrackEndSu = (UInt32) ((float)(_msaTrackLength) / ((float)fullLength / (float)SU));
_msaTrackEndSu += _msaTrackStartSu;
-
+
if (_msaTrackEndSu > SU)
_msaTrackEndSu = SU;
Modified: scummvm/trunk/backends/platform/PalmOS/Src/cd_msa.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/cd_msa.h 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/platform/PalmOS/Src/cd_msa.h 2008-01-27 19:47:41 UTC (rev 30664)
@@ -64,5 +64,5 @@
UInt32 _msaTrackStartSu, _msaTrackEndSu;
UInt32 _msaTrackLength;
};
-
+
#endif
Modified: scummvm/trunk/backends/platform/PalmOS/Src/cd_pockettunes.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/cd_pockettunes.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/platform/PalmOS/Src/cd_pockettunes.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -37,7 +37,7 @@
_isInitialized = PocketTunesIsRunning();
_isPlaying = false;
_pAction = NULL;
-
+
if (_isInitialized) {
_pAction = (PocketTunesAction*)MemPtrNew(sizeof(PocketTunesAction));
_volumeLimit = getVolumeLimit();
@@ -64,12 +64,12 @@
_pAction->action = kPocketTunesActionGetValue;
_pAction->data.getValueAction.which = kPtunesValueMaxVolume;
-
+
EvtGetEvent(&_eAction, evtNoWait);
if (PocketTunesCallSynch(_pAction) == errNone)
value = _pAction->data.getValueAction.value;
- return value;
+ return value;
}
UInt32 PckTunesCDPlayer::getStatus() {
@@ -83,8 +83,8 @@
EvtGetEvent(&_eAction, evtNoWait);
if (PocketTunesCallSynch(_pAction) == errNone)
status = _pAction->data.getStatusAction.status;
-
- return status;
+
+ return status;
}
UInt32 PckTunesCDPlayer::getPosition(UInt32 deflt) {
@@ -95,7 +95,7 @@
_pAction->action = kPocketTunesActionGetValue;
_pAction->data.getValueAction.which = kPtunesValueSongPosition;
-
+
EvtGetEvent(&_eAction, evtNoWait);
if (PocketTunesCallSynch(_pAction) == errNone)
value = _pAction->data.getValueAction.value;
@@ -111,12 +111,12 @@
_pAction->action = kPocketTunesActionGetValue;
_pAction->data.getValueAction.which = kPtunesValueSongDuration;
-
+
EvtGetEvent(&_eAction, evtNoWait);
if (PocketTunesCallSynch(_pAction) == errNone)
value = _pAction->data.getValueAction.value;
- return value;
+ return value;
}
void PckTunesCDPlayer::setPosition(UInt32 value) {
@@ -203,16 +203,16 @@
EventType e;
Char nameP[256], fileP[100];
static const Char *ext[] = { "mp3", "ogg" };
-
+
_pckTrack = track;
_pckLoops = num_loops;
_pckTrackStartFrame = TO_MSECS(start_frame);
_pckTrackDuration = TO_MSECS(duration);
VFSVolumeGetLabel(gVars->VFS.volRefNum, nameP, 256);
-
+
StrPrintF(fileP, "/Palm/Programs/ScummVM/Audio/%s_%03ld.%s", gameP, (track + gVars->CD.firstTrack - 1), ext[gVars->CD.format]);
-
+
if (PocketTunesOpenFile(nameP, fileP, 0) == errNone) {
EvtGetEvent(&e, evtNoWait);
PocketTunesPauseIfPlaying();
Modified: scummvm/trunk/backends/platform/PalmOS/Src/cd_pockettunes.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/cd_pockettunes.h 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/platform/PalmOS/Src/cd_pockettunes.h 2008-01-27 19:47:41 UTC (rev 30664)
@@ -22,48 +22,48 @@
* $Id$
*
*/
-
+
#ifndef CD_POCKETTUNES_H
#define CD_POCKETTUNES_H
-
+
#include "cdaudio.h"
#include "pockettunes.h"
-
+
class PckTunesCDPlayer : public CDAudio {
public:
PckTunesCDPlayer(OSystem *sys);
bool init();
void release();
-
+
bool poll();
void update();
void play(int track, int num_loops, int start_frame, int duration);
void stop();
-
+
void setVolume(int volume);
-
+
private:
OSystem *_sys;
Char gameP[15];
-
+
PocketTunesAction *_pAction; // prevent memory fragmentation
EventType _eAction;
-
+
UInt32 getStatus();
void setPosition(UInt32 value);
UInt32 getDuration();
UInt32 getPosition(UInt32 deft);
-
- UInt32 _volumeLimit;
+
+ UInt32 _volumeLimit;
UInt32 getVolumeLimit();
-
+
Boolean _isPlaying;
// cdrom
UInt16 _pckLoops, _pckTrack;
UInt32 _pckTrackStartFrame, _pckTrackEndFrame;
UInt32 _pckStopTime, _pckTrackDuration;
};
-
+
#endif
-
+
Modified: scummvm/trunk/backends/platform/PalmOS/Src/cdaudio.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/cdaudio.h 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/platform/PalmOS/Src/cdaudio.h 2008-01-27 19:47:41 UTC (rev 30664)
@@ -22,7 +22,7 @@
* $Id$
*
*/
-
+
#ifndef CDAUDIO_H
#define CDAUDIO_H
@@ -37,7 +37,7 @@
#define FROM_SEC(secs) ((UInt32)((secs) * 1000))
class CDAudio {
-public:
+public:
CDAudio() {
_isInitialized = false;
_volumeLevel = 100;
@@ -45,7 +45,7 @@
virtual bool init() = 0;
virtual void release() = 0;
-
+
// OSystem functions
virtual bool poll() = 0;
virtual void play(int track, int num_loops, int start_frame, int duration) = 0;
Modified: scummvm/trunk/backends/platform/PalmOS/Src/extend.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/extend.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/platform/PalmOS/Src/extend.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -43,7 +43,7 @@
if (OPTIONS_TST(kOptDisableOnScrDisp))
return;
- UInt8 x,y;
+ UInt8 x,y;
UInt32 depth, d1;
Boolean d2;
WinScreenMode(winScreenModeGet, &d1, &d1, &depth, &d2);
Modified: scummvm/trunk/backends/platform/PalmOS/Src/init_golcd.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/init_golcd.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/platform/PalmOS/Src/init_golcd.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -14,7 +14,7 @@
UInt16 refNum;
Boolean loaded = false;
*goLcdH = NULL;
-
+
if (e = SysLibFind(goLcdLibName, &refNum))
loaded = !(e = SysLibLoad(goLcdLibType, goLcdLibCreator, &refNum));
@@ -41,7 +41,7 @@
Err e;
GoLCDType *lcdP = (GoLCDType *)MemHandleLock(goLcdH);
- if (lcdP->refNum != sysInvalidRefNum)
+ if (lcdP->refNum != sysInvalidRefNum)
if (!(e = GoLcdLibClose(lcdP->refNum)))
e = SysLibRemove(lcdP->refNum);
@@ -115,7 +115,7 @@
GoLCDType *lcdP = (GoLCDType *)MemHandleLock(goLcdH);
active = lcdP->active;
MemPtrUnlock(lcdP);
-
+
GoLCDActivate(goLcdH, !active);
return (!active);
}
Modified: scummvm/trunk/backends/platform/PalmOS/Src/init_palmos.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/init_palmos.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/platform/PalmOS/Src/init_palmos.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -75,7 +75,7 @@
UInt8 mode = 0;
Coord sw = 160;
- Coord sh = 160;
+ Coord sh = 160;
// Hi-Density present ?
if (!FtrGet(sysFtrCreator, sysFtrNumWinVersion, &ftr)) {
@@ -136,7 +136,7 @@
UInt32 dynamicFree = 0;
// Iterate through each card to support devices with multiple cards.
- nCards = MemNumCards();
+ nCards = MemNumCards();
for (cardNo = 0; cardNo < nCards; cardNo++) {
// Iterate through the RAM heaps on a card (excludes ROM).
Modified: scummvm/trunk/backends/platform/PalmOS/Src/init_sony.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/init_sony.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/platform/PalmOS/Src/init_sony.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -121,7 +121,7 @@
UInt8 mode = 0;
Coord sw = 160;
- Coord sh = 160;
+ Coord sh = 160;
Coord fw = sw;
Coord fh = sh;
@@ -158,6 +158,6 @@
*stdh = sh;
*fullw = fw;
*fullh = fh;
-
+
return mode;
}
Modified: scummvm/trunk/backends/platform/PalmOS/Src/init_stuffs.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/init_stuffs.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/platform/PalmOS/Src/init_stuffs.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -33,7 +33,7 @@
if (OPTIONS_TST(kOptModeHiDensity)) {
WinScreenGetAttribute(winScreenRowBytes, &pitch);
-
+
// FIXME : hack for TT3 simulator (and real ?) return 28 on landscape mode
if (pitch < fullw)
pitch = fullw;
Modified: scummvm/trunk/backends/platform/PalmOS/Src/launcher/app.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/launcher/app.cpp 2008-01-27 16:55:42 UTC (rev 30663)
+++ scummvm/trunk/backends/platform/PalmOS/Src/launcher/app.cpp 2008-01-27 19:47:41 UTC (rev 30664)
@@ -86,7 +86,7 @@
UInt32 romVersion;
Err err;
- err = FtrGet(sysFtrCreator, sysFtrNumNotifyMgrVersion, &romVersion);
+ err = FtrGet(sysFtrCreator, sysFtrNumNotifyMgrVersion, &romVersion);
if (!err) {
UInt16 cardNo;
LocalID dbID;
@@ -128,7 +128,7 @@
if (type != 'skin' || creator != appFileCreator)
err = dmErrInvalidParam;
}
-
+
if (!found || err)
MemSet(&(gPrefs->skin),sizeof(SkinInfoType),0);
}
@@ -141,13 +141,13 @@
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 @@
FrmCustomAlert(FrmErrorAlert,"Can't open MathLib !",0,0);
break;
}
-
+
return e;
}
@@ -262,7 +262,7 @@
gPrefs->exitLauncher = true;
gPrefs->stdPalette = OPTIONS_TST(kOptDeviceOS5);
gPrefs->stylusClick = true;
-
+
} else {
PrefGetAppPreferences(appFileCreator, appPrefID, gPrefs, &dataSize, true);
}
@@ -274,7 +274,7 @@
error = AppStartCheckHRmode();
if (error) return (error);
-
+
bDirectMode = (AppStartLoadSkin() != errNone);
// if volref previously defined, check if it's a valid one
@@ -318,8 +318,8 @@
{
UInt32 romVersion;
Err err;
-
- err = FtrGet(sysFtrCreator, sysFtrNumNotifyMgrVersion, &romVersion);
+
+ err = FtrGet(sysFtrCreator, sysFtrNumNotifyMgrVersion, &romVersion);
if (!err) {
UInt16 cardNo;
LocalID dbID;
@@ -332,7 +332,7 @@
SysNotifyUnregister(cardNo, dbID, sysNotifyDisplayResizedEvent, sysNotifyNormalPriority);
}
}
-
+
return err;
}
@@ -345,7 +345,7 @@
// 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();
Modified: scummvm/trunk/backends/platform/PalmOS/Src/launcher/forms/formCards.cpp
===================================================================
@@ 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