[Scummvm-cvs-logs] SF.net SVN: scummvm: [27681] scummvm/branches/gsoc2007-fsnode
david_corrales at users.sourceforge.net
david_corrales at users.sourceforge.net
Sat Jun 23 20:51:34 CEST 2007
Revision: 27681
http://scummvm.svn.sourceforge.net/scummvm/?rev=27681&view=rev
Author: david_corrales
Date: 2007-06-23 11:51:33 -0700 (Sat, 23 Jun 2007)
Log Message:
-----------
Merged the FSNode branch with trunk r27031:27680
Modified Paths:
--------------
scummvm/branches/gsoc2007-fsnode/AUTHORS
scummvm/branches/gsoc2007-fsnode/COPYRIGHT
scummvm/branches/gsoc2007-fsnode/Makefile
scummvm/branches/gsoc2007-fsnode/Makefile.common
scummvm/branches/gsoc2007-fsnode/NEWS
scummvm/branches/gsoc2007-fsnode/README
scummvm/branches/gsoc2007-fsnode/backends/events/default/default-events.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/base_event.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/be_os5.h
scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/launcher/forms/formSelect.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/launcher/games.h
scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/os5_gfx.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/os5_renderer.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/zodiac_event.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/dc/dc.h
scummvm/branches/gsoc2007-fsnode/backends/platform/dc/display.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/dc/input.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/dc/selector.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/dc/softkbd.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/makefile
scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/source/dsmain.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/source/dsoptions.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/source/osystem_ds.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/source/osystem_ds.h
scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/source/touchkeyboard.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/source/touchkeyboard.h
scummvm/branches/gsoc2007-fsnode/backends/platform/gp2x/build/bundle.sh
scummvm/branches/gsoc2007-fsnode/backends/platform/gp2x/events.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/gp2x/gp2x-common.h
scummvm/branches/gsoc2007-fsnode/backends/platform/gp2x/graphics.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/gp32/gp32_osys.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/gp32/gp32_osys.h
scummvm/branches/gsoc2007-fsnode/backends/platform/maemo/hildon.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/maemo/main.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/morphos/morphos.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/null/null.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/ps2/Gs2dScreen.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/ps2/Gs2dScreen.h
scummvm/branches/gsoc2007-fsnode/backends/platform/ps2/ps2input.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/ps2/systemps2.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/ps2/systemps2.h
scummvm/branches/gsoc2007-fsnode/backends/platform/psp/osys_psp.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/psp/osys_psp.h
scummvm/branches/gsoc2007-fsnode/backends/platform/psp/osys_psp_gu.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/sdl/events.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/sdl/graphics.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/sdl/sdl-common.h
scummvm/branches/gsoc2007-fsnode/backends/platform/sdl/sdl.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/README
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v2.pkg
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/S80/scummvm-CVS-SymbianS80.pkg
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/S90/scummvm-CVS-SymbianS90.pkg
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2.pkg
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2_SE.pkg
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/mmp/scummvm_agi.mmp.in
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/mmp/scummvm_agos.mmp.in
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/mmp/scummvm_base.mmp.in
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/mmp/scummvm_cine.mmp.in
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/mmp/scummvm_cruise.mmp.in
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/mmp/scummvm_gob.mmp.in
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/mmp/scummvm_kyra.mmp.in
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/mmp/scummvm_lure.mmp.in
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/mmp/scummvm_parallaction.mmp.in
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/mmp/scummvm_queen.mmp.in
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/mmp/scummvm_saga.mmp.in
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/mmp/scummvm_scumm.mmp.in
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/mmp/scummvm_sky.mmp.in
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/mmp/scummvm_sword1.mmp.in
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/mmp/scummvm_sword2.mmp.in
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/mmp/scummvm_touche.mmp.in
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/src/SymbianActions.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/src/SymbianActions.h
scummvm/branches/gsoc2007-fsnode/backends/platform/symbian/src/SymbianOS.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/wince/CEActionsPocket.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/wince/CEActionsPocket.h
scummvm/branches/gsoc2007-fsnode/backends/platform/wince/CEActionsSmartphone.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/wince/CEActionsSmartphone.h
scummvm/branches/gsoc2007-fsnode/backends/platform/wince/CEDevice.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/wince/CEgui/PanelKeyboard.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/wince/CEgui/PanelKeyboard.h
scummvm/branches/gsoc2007-fsnode/backends/platform/wince/CEkeys/EventsBuffer.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/wince/Makefile
scummvm/branches/gsoc2007-fsnode/backends/platform/wince/wince-sdl.cpp
scummvm/branches/gsoc2007-fsnode/backends/platform/wince/wince-sdl.h
scummvm/branches/gsoc2007-fsnode/backends/saves/compressed/compressed-saves.cpp
scummvm/branches/gsoc2007-fsnode/base/commandLine.cpp
scummvm/branches/gsoc2007-fsnode/base/game.cpp
scummvm/branches/gsoc2007-fsnode/base/game.h
scummvm/branches/gsoc2007-fsnode/base/internal_version.h
scummvm/branches/gsoc2007-fsnode/base/main.cpp
scummvm/branches/gsoc2007-fsnode/common/advancedDetector.cpp
scummvm/branches/gsoc2007-fsnode/common/advancedDetector.h
scummvm/branches/gsoc2007-fsnode/common/events.h
scummvm/branches/gsoc2007-fsnode/common/scummsys.h
scummvm/branches/gsoc2007-fsnode/common/str.cpp
scummvm/branches/gsoc2007-fsnode/common/str.h
scummvm/branches/gsoc2007-fsnode/common/system.cpp
scummvm/branches/gsoc2007-fsnode/common/system.h
scummvm/branches/gsoc2007-fsnode/configure
scummvm/branches/gsoc2007-fsnode/dists/macosx/DS_Store
scummvm/branches/gsoc2007-fsnode/dists/macosx/Info.plist
scummvm/branches/gsoc2007-fsnode/dists/msvc71/agi.vcproj
scummvm/branches/gsoc2007-fsnode/dists/msvc71/scummvm.vcproj
scummvm/branches/gsoc2007-fsnode/dists/msvc8/agi.vcproj
scummvm/branches/gsoc2007-fsnode/dists/msvc8/lure.vcproj
scummvm/branches/gsoc2007-fsnode/dists/msvc8/scummvm.vcproj
scummvm/branches/gsoc2007-fsnode/dists/redhat/scummvm-tools.spec
scummvm/branches/gsoc2007-fsnode/dists/redhat/scummvm.spec
scummvm/branches/gsoc2007-fsnode/dists/redhat/scummvm.spec.in
scummvm/branches/gsoc2007-fsnode/dists/scummvm.rc
scummvm/branches/gsoc2007-fsnode/dists/slackware/scummvm.SlackBuild
scummvm/branches/gsoc2007-fsnode/engines/agi/agi.cpp
scummvm/branches/gsoc2007-fsnode/engines/agi/agi.h
scummvm/branches/gsoc2007-fsnode/engines/agi/agi_v3.cpp
scummvm/branches/gsoc2007-fsnode/engines/agi/checks.cpp
scummvm/branches/gsoc2007-fsnode/engines/agi/detection.cpp
scummvm/branches/gsoc2007-fsnode/engines/agi/graphics.cpp
scummvm/branches/gsoc2007-fsnode/engines/agi/module.mk
scummvm/branches/gsoc2007-fsnode/engines/agi/op_cmd.cpp
scummvm/branches/gsoc2007-fsnode/engines/agi/picture.cpp
scummvm/branches/gsoc2007-fsnode/engines/agi/picture.h
scummvm/branches/gsoc2007-fsnode/engines/agi/predictive.cpp
scummvm/branches/gsoc2007-fsnode/engines/agi/sprite.cpp
scummvm/branches/gsoc2007-fsnode/engines/agi/sprite.h
scummvm/branches/gsoc2007-fsnode/engines/agi/view.cpp
scummvm/branches/gsoc2007-fsnode/engines/agi/view.h
scummvm/branches/gsoc2007-fsnode/engines/agos/agos.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/agos.h
scummvm/branches/gsoc2007-fsnode/engines/agos/animation.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/animation.h
scummvm/branches/gsoc2007-fsnode/engines/agos/charset.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/cursor.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/debugger.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/detection.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/detection_tables.h
scummvm/branches/gsoc2007-fsnode/engines/agos/draw.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/event.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/gfx.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/icons.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/input.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/intern.h
scummvm/branches/gsoc2007-fsnode/engines/agos/items.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/menus.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/oracle.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/res.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/res_snd.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/rooms.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/saveload.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/script.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/script_e1.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/script_e2.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/script_ff.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/script_pp.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/script_s1.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/script_s2.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/script_ww.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/sound.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/string.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/subroutine.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/verb.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/vga.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/vga_e2.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/vga_ff.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/vga_s2.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/vga_ww.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/window.cpp
scummvm/branches/gsoc2007-fsnode/engines/agos/zones.cpp
scummvm/branches/gsoc2007-fsnode/engines/cine/anim.cpp
scummvm/branches/gsoc2007-fsnode/engines/cine/bg.cpp
scummvm/branches/gsoc2007-fsnode/engines/cine/detection.cpp
scummvm/branches/gsoc2007-fsnode/engines/cine/main_loop.cpp
scummvm/branches/gsoc2007-fsnode/engines/cine/object.cpp
scummvm/branches/gsoc2007-fsnode/engines/cine/part.cpp
scummvm/branches/gsoc2007-fsnode/engines/cine/various.cpp
scummvm/branches/gsoc2007-fsnode/engines/cruise/detection.cpp
scummvm/branches/gsoc2007-fsnode/engines/gob/detection.cpp
scummvm/branches/gsoc2007-fsnode/engines/gob/mult_v2.cpp
scummvm/branches/gsoc2007-fsnode/engines/gob/scenery.cpp
scummvm/branches/gsoc2007-fsnode/engines/gob/util.cpp
scummvm/branches/gsoc2007-fsnode/engines/gob/util.h
scummvm/branches/gsoc2007-fsnode/engines/kyra/detection.cpp
scummvm/branches/gsoc2007-fsnode/engines/kyra/gui.cpp
scummvm/branches/gsoc2007-fsnode/engines/kyra/kyra.cpp
scummvm/branches/gsoc2007-fsnode/engines/kyra/kyra.h
scummvm/branches/gsoc2007-fsnode/engines/kyra/kyra_v1.h
scummvm/branches/gsoc2007-fsnode/engines/kyra/kyra_v2.cpp
scummvm/branches/gsoc2007-fsnode/engines/kyra/kyra_v2.h
scummvm/branches/gsoc2007-fsnode/engines/kyra/screen.cpp
scummvm/branches/gsoc2007-fsnode/engines/kyra/screen.h
scummvm/branches/gsoc2007-fsnode/engines/kyra/sequences_v2.cpp
scummvm/branches/gsoc2007-fsnode/engines/kyra/text.cpp
scummvm/branches/gsoc2007-fsnode/engines/lure/animseq.cpp
scummvm/branches/gsoc2007-fsnode/engines/lure/debugger.cpp
scummvm/branches/gsoc2007-fsnode/engines/lure/debugger.h
scummvm/branches/gsoc2007-fsnode/engines/lure/detection.cpp
scummvm/branches/gsoc2007-fsnode/engines/lure/events.cpp
scummvm/branches/gsoc2007-fsnode/engines/lure/events.h
scummvm/branches/gsoc2007-fsnode/engines/lure/game.cpp
scummvm/branches/gsoc2007-fsnode/engines/lure/game.h
scummvm/branches/gsoc2007-fsnode/engines/lure/hotspots.cpp
scummvm/branches/gsoc2007-fsnode/engines/lure/hotspots.h
scummvm/branches/gsoc2007-fsnode/engines/lure/intro.cpp
scummvm/branches/gsoc2007-fsnode/engines/lure/intro.h
scummvm/branches/gsoc2007-fsnode/engines/lure/lure.cpp
scummvm/branches/gsoc2007-fsnode/engines/lure/lure.h
scummvm/branches/gsoc2007-fsnode/engines/lure/luredefs.h
scummvm/branches/gsoc2007-fsnode/engines/lure/menu.cpp
scummvm/branches/gsoc2007-fsnode/engines/lure/menu.h
scummvm/branches/gsoc2007-fsnode/engines/lure/module.mk
scummvm/branches/gsoc2007-fsnode/engines/lure/res.cpp
scummvm/branches/gsoc2007-fsnode/engines/lure/res_struct.cpp
scummvm/branches/gsoc2007-fsnode/engines/lure/res_struct.h
scummvm/branches/gsoc2007-fsnode/engines/lure/room.cpp
scummvm/branches/gsoc2007-fsnode/engines/lure/room.h
scummvm/branches/gsoc2007-fsnode/engines/lure/scripts.cpp
scummvm/branches/gsoc2007-fsnode/engines/lure/scripts.h
scummvm/branches/gsoc2007-fsnode/engines/lure/surface.cpp
scummvm/branches/gsoc2007-fsnode/engines/parallaction/archive.cpp
scummvm/branches/gsoc2007-fsnode/engines/parallaction/callables.cpp
scummvm/branches/gsoc2007-fsnode/engines/parallaction/detection.cpp
scummvm/branches/gsoc2007-fsnode/engines/parallaction/dialogue.cpp
scummvm/branches/gsoc2007-fsnode/engines/parallaction/disk.cpp
scummvm/branches/gsoc2007-fsnode/engines/parallaction/graphics.cpp
scummvm/branches/gsoc2007-fsnode/engines/parallaction/intro.cpp
scummvm/branches/gsoc2007-fsnode/engines/parallaction/inventory.cpp
scummvm/branches/gsoc2007-fsnode/engines/parallaction/location.cpp
scummvm/branches/gsoc2007-fsnode/engines/parallaction/menu.cpp
scummvm/branches/gsoc2007-fsnode/engines/parallaction/parallaction.cpp
scummvm/branches/gsoc2007-fsnode/engines/parallaction/parallaction.h
scummvm/branches/gsoc2007-fsnode/engines/queen/input.cpp
scummvm/branches/gsoc2007-fsnode/engines/queen/input.h
scummvm/branches/gsoc2007-fsnode/engines/queen/journal.cpp
scummvm/branches/gsoc2007-fsnode/engines/saga/actor.cpp
scummvm/branches/gsoc2007-fsnode/engines/saga/actor.h
scummvm/branches/gsoc2007-fsnode/engines/saga/animation.cpp
scummvm/branches/gsoc2007-fsnode/engines/saga/animation.h
scummvm/branches/gsoc2007-fsnode/engines/saga/console.cpp
scummvm/branches/gsoc2007-fsnode/engines/saga/console.h
scummvm/branches/gsoc2007-fsnode/engines/saga/detection.cpp
scummvm/branches/gsoc2007-fsnode/engines/saga/detection_tables.h
scummvm/branches/gsoc2007-fsnode/engines/saga/displayinfo.h
scummvm/branches/gsoc2007-fsnode/engines/saga/events.cpp
scummvm/branches/gsoc2007-fsnode/engines/saga/events.h
scummvm/branches/gsoc2007-fsnode/engines/saga/gfx.h
scummvm/branches/gsoc2007-fsnode/engines/saga/ihnm_introproc.cpp
scummvm/branches/gsoc2007-fsnode/engines/saga/input.cpp
scummvm/branches/gsoc2007-fsnode/engines/saga/interface.cpp
scummvm/branches/gsoc2007-fsnode/engines/saga/interface.h
scummvm/branches/gsoc2007-fsnode/engines/saga/itedata.h
scummvm/branches/gsoc2007-fsnode/engines/saga/objectmap.cpp
scummvm/branches/gsoc2007-fsnode/engines/saga/objectmap.h
scummvm/branches/gsoc2007-fsnode/engines/saga/puzzle.cpp
scummvm/branches/gsoc2007-fsnode/engines/saga/saga.cpp
scummvm/branches/gsoc2007-fsnode/engines/saga/saga.h
scummvm/branches/gsoc2007-fsnode/engines/saga/sagaresnames.h
scummvm/branches/gsoc2007-fsnode/engines/saga/saveload.cpp
scummvm/branches/gsoc2007-fsnode/engines/saga/scene.cpp
scummvm/branches/gsoc2007-fsnode/engines/saga/scene.h
scummvm/branches/gsoc2007-fsnode/engines/saga/script.cpp
scummvm/branches/gsoc2007-fsnode/engines/saga/script.h
scummvm/branches/gsoc2007-fsnode/engines/saga/sfuncs.cpp
scummvm/branches/gsoc2007-fsnode/engines/saga/sndres.cpp
scummvm/branches/gsoc2007-fsnode/engines/saga/sthread.cpp
scummvm/branches/gsoc2007-fsnode/engines/scumm/detection.cpp
scummvm/branches/gsoc2007-fsnode/engines/scumm/detection_tables.h
scummvm/branches/gsoc2007-fsnode/engines/scumm/dialogs.cpp
scummvm/branches/gsoc2007-fsnode/engines/scumm/dialogs.h
scummvm/branches/gsoc2007-fsnode/engines/scumm/gfx.cpp
scummvm/branches/gsoc2007-fsnode/engines/scumm/he/animation_he.cpp
scummvm/branches/gsoc2007-fsnode/engines/scumm/he/script_v60he.cpp
scummvm/branches/gsoc2007-fsnode/engines/scumm/he/script_v70he.cpp
scummvm/branches/gsoc2007-fsnode/engines/scumm/imuse_digi/dimuse.cpp
scummvm/branches/gsoc2007-fsnode/engines/scumm/imuse_digi/dimuse.h
scummvm/branches/gsoc2007-fsnode/engines/scumm/imuse_digi/dimuse_bndmgr.cpp
scummvm/branches/gsoc2007-fsnode/engines/scumm/imuse_digi/dimuse_bndmgr.h
scummvm/branches/gsoc2007-fsnode/engines/scumm/imuse_digi/dimuse_codecs.cpp
scummvm/branches/gsoc2007-fsnode/engines/scumm/imuse_digi/dimuse_music.cpp
scummvm/branches/gsoc2007-fsnode/engines/scumm/imuse_digi/dimuse_script.cpp
scummvm/branches/gsoc2007-fsnode/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
scummvm/branches/gsoc2007-fsnode/engines/scumm/imuse_digi/dimuse_sndmgr.h
scummvm/branches/gsoc2007-fsnode/engines/scumm/imuse_digi/dimuse_track.cpp
scummvm/branches/gsoc2007-fsnode/engines/scumm/input.cpp
scummvm/branches/gsoc2007-fsnode/engines/scumm/insane/insane.cpp
scummvm/branches/gsoc2007-fsnode/engines/scumm/insane/insane_enemy.cpp
scummvm/branches/gsoc2007-fsnode/engines/scumm/intern.h
scummvm/branches/gsoc2007-fsnode/engines/scumm/script_v6.cpp
scummvm/branches/gsoc2007-fsnode/engines/scumm/scumm-md5.h
scummvm/branches/gsoc2007-fsnode/engines/scumm/scumm.cpp
scummvm/branches/gsoc2007-fsnode/engines/scumm/scumm.h
scummvm/branches/gsoc2007-fsnode/engines/scumm/sound.cpp
scummvm/branches/gsoc2007-fsnode/engines/sky/control.cpp
scummvm/branches/gsoc2007-fsnode/engines/sky/control.h
scummvm/branches/gsoc2007-fsnode/engines/sky/intro.cpp
scummvm/branches/gsoc2007-fsnode/engines/sky/mouse.cpp
scummvm/branches/gsoc2007-fsnode/engines/sky/sky.cpp
scummvm/branches/gsoc2007-fsnode/engines/sky/sky.h
scummvm/branches/gsoc2007-fsnode/engines/sword1/animation.cpp
scummvm/branches/gsoc2007-fsnode/engines/sword1/control.cpp
scummvm/branches/gsoc2007-fsnode/engines/sword1/control.h
scummvm/branches/gsoc2007-fsnode/engines/sword1/music.cpp
scummvm/branches/gsoc2007-fsnode/engines/sword1/sword1.cpp
scummvm/branches/gsoc2007-fsnode/engines/sword1/sword1.h
scummvm/branches/gsoc2007-fsnode/engines/sword2/animation.cpp
scummvm/branches/gsoc2007-fsnode/engines/sword2/controls.cpp
scummvm/branches/gsoc2007-fsnode/engines/sword2/screen.cpp
scummvm/branches/gsoc2007-fsnode/engines/sword2/sword2.cpp
scummvm/branches/gsoc2007-fsnode/engines/sword2/sword2.h
scummvm/branches/gsoc2007-fsnode/engines/touche/detection.cpp
scummvm/branches/gsoc2007-fsnode/engines/touche/touche.cpp
scummvm/branches/gsoc2007-fsnode/engines/touche/ui.cpp
scummvm/branches/gsoc2007-fsnode/graphics/dxa_player.cpp
scummvm/branches/gsoc2007-fsnode/graphics/dxa_player.h
scummvm/branches/gsoc2007-fsnode/graphics/scaler/thumbnail.cpp
scummvm/branches/gsoc2007-fsnode/gui/Key.cpp
scummvm/branches/gsoc2007-fsnode/gui/Key.h
scummvm/branches/gsoc2007-fsnode/gui/KeysDialog.cpp
scummvm/branches/gsoc2007-fsnode/gui/ListWidget.cpp
scummvm/branches/gsoc2007-fsnode/gui/PopUpWidget.cpp
scummvm/branches/gsoc2007-fsnode/gui/TabWidget.cpp
scummvm/branches/gsoc2007-fsnode/gui/TabWidget.h
scummvm/branches/gsoc2007-fsnode/gui/about.cpp
scummvm/branches/gsoc2007-fsnode/gui/console.cpp
scummvm/branches/gsoc2007-fsnode/gui/credits.h
scummvm/branches/gsoc2007-fsnode/gui/dialog.cpp
scummvm/branches/gsoc2007-fsnode/gui/editable.cpp
scummvm/branches/gsoc2007-fsnode/gui/launcher.cpp
scummvm/branches/gsoc2007-fsnode/gui/massadd.cpp
scummvm/branches/gsoc2007-fsnode/gui/message.cpp
scummvm/branches/gsoc2007-fsnode/gui/newgui.cpp
scummvm/branches/gsoc2007-fsnode/gui/options.cpp
scummvm/branches/gsoc2007-fsnode/gui/theme-config.cpp
scummvm/branches/gsoc2007-fsnode/gui/theme.h
scummvm/branches/gsoc2007-fsnode/gui/themes/classic080.ini
scummvm/branches/gsoc2007-fsnode/gui/themes/modern.ini
scummvm/branches/gsoc2007-fsnode/sound/mixer.cpp
scummvm/branches/gsoc2007-fsnode/sound/module.mk
scummvm/branches/gsoc2007-fsnode/sound/rate.cpp
scummvm/branches/gsoc2007-fsnode/sound/rate.h
scummvm/branches/gsoc2007-fsnode/tools/create_lure/create_lure_dat.cpp
scummvm/branches/gsoc2007-fsnode/tools/create_lure/create_lure_dat.h
scummvm/branches/gsoc2007-fsnode/tools/create_lure/process_actions.cpp
scummvm/branches/gsoc2007-fsnode/tools/credits.pl
scummvm/branches/gsoc2007-fsnode/tools/scumm-md5.txt
scummvm/branches/gsoc2007-fsnode/tools/update-version.pl
Removed Paths:
-------------
scummvm/branches/gsoc2007-fsnode/backends/platform/ps2/sdlkeys.h
scummvm/branches/gsoc2007-fsnode/backends/platform/wince/README-WinCE
scummvm/branches/gsoc2007-fsnode/engines/lure/debug-input.cpp
scummvm/branches/gsoc2007-fsnode/engines/lure/debug-input.h
scummvm/branches/gsoc2007-fsnode/engines/lure/debug-methods.cpp
scummvm/branches/gsoc2007-fsnode/engines/lure/debug-methods.h
scummvm/branches/gsoc2007-fsnode/engines/lure/disassembly/
Property Changed:
----------------
scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/makefile
scummvm/branches/gsoc2007-fsnode/dists/slackware/scummvm.SlackBuild
scummvm/branches/gsoc2007-fsnode/gui/themes/classic080.ini
Modified: scummvm/branches/gsoc2007-fsnode/AUTHORS
===================================================================
--- scummvm/branches/gsoc2007-fsnode/AUTHORS 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/AUTHORS 2007-06-23 18:51:33 UTC (rev 27681)
@@ -238,6 +238,7 @@
and right click input method
Mikesch Nepomuk - MI1 VGA floppy patches
Nicolas Noble - Config file and ALSA support
+ Tim Phillips - Initial MI1 CD music support
Quietust - Sound support for Amiga SCUMM V2/V3 games, MM
NES support
Andreas Roever - Broken Sword 1/2 MPEG2 cutscene support
@@ -245,7 +246,6 @@
Daniel Schepler - Final MI1 CD music support, initial Ogg Vorbis
support
Andre Souza - SDL-based OpenGL renderer
- Tim Phillips - Initial MI1 CD music support
Robin Watts - ARM assembly routines for the Windows CE port
And to all the contributors, users, and beta testers we've missed. Thanks!
Modified: scummvm/branches/gsoc2007-fsnode/COPYRIGHT
===================================================================
--- scummvm/branches/gsoc2007-fsnode/COPYRIGHT 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/COPYRIGHT 2007-06-23 18:51:33 UTC (rev 27681)
@@ -13,6 +13,7 @@
Ralph Brorsen
James Brown
Stuart Caie
+Filippos Carapetis
Jamieson Christian
Marcus Comstedt
Paolo Costabel
@@ -69,3 +70,120 @@
n0p
peres
Quietust
+
+
+Patches contributed by:
+
+Laura Abbott "sageofminerva"
+Vikram Aggarwal "youngelf"
+Dieter Baron "dillo"
+Alban Bedel "albeu"
+Bodo Bellut "bellut"
+Andreas Bierfert "awjb"
+Elio Blanca "eblanca76"
+David Breakey "dbreakey"
+Robert Buchholz "prendi"
+Filippos Carapetis "thebluegr"
+Mathieu Carot "yokna"
+Stefano Ceccherini "jackburton"
+Travis S Coady "theealien"
+Josh Coalson "jcoalson"
+Thomas Combeleran "hibernatus"
+Carlos Corbacho "cathectic"
+Roberto Costa "fiix76"
+Michael Drueing "doc_wagon"
+Matthew Duggan "stauff1"
+John Eckerdal "johneck"
+Florent "flobo"
+Florob "florob"
+Mike Frysinger "vapier"
+Chris Gelatt "kreeblah"
+Jens Georg "phako"
+Nicolas George "cigaes"
+Jonathan Gevaryahu "lord_nightmare"
+Tobias Gruetzmacher "tobig"
+Damien Guard "damienguard"
+Tobias Gunkel "tobigun"
+Matti Hamalainen "ccrtnsp"
+Matt Hargett "matt_hargett"
+Stefan Haubenthal "polluks"
+Alexander Holler "holler"
+Falk Hueffner "mellum"
+Casey Hutchinson "nnooiissee"
+Gregor Jasny "gjasny"
+Jellby "jellby"
+Joerg "macdrega"
+Matt Johnson "mattjon"
+Nicolas Joly "njoly"
+KeithS "keithscr"
+Sam Kenny "sam_k"
+Koen Kooi "koenkooi"
+Zygmunt Krynicki "zygoon"
+Janne Kujanpaa "jukuja"
+Jay Lanagan "r0ni"
+Norbert Lange "nolange"
+Manuel Lauss "mlau2"
+Duncan Lock "dflock"
+Mark Lodato "itsr0y"
+Fridvin Logi "phillip_j_fry"
+Georg Lukas "ge0rg"
+Markus "meist3r"
+Connor McLeod "mcleod2032"
+Mickey McMurray "metafox"
+Vladimir Menshakov "megath"
+Frank Meyering "frank_m24"
+Gael Le Migno "kilobug"
+Alyssa Anne Milburn "fuzzie"
+Andy Molloy "maloi"
+Armin Mueller "arm_in"
+Andrea Musuruane "musuruan"
+Peter Naulls "pnaulls"
+Christian Neumair "mannythegnome"
+Nicos "anarxia"
+Juha Niemimaki "capehill"
+Markus Niemisto "niemisto"
+Chris Paras "paras_rasmatazz"
+Aubin Paul "outlyer"
+Thomas Fach Pedersen "madm00se"
+Carsten Pohl "carstenpohl"
+Markus Pyykko "mankeli"
+Richard "trinity78"
+Felix Riemann "kirschsaft"
+Timo Roehling "t1m0"
+Andreas Roever "roever"
+Jonathan Rogers "jonner"
+Marek Roth "logicdeluxe"
+Simon Sawatzki "simsaw"
+Daniel Schepler "dschepler"
+Florian Schmitt "fatpenguin"
+Mark Schreiber "mark7"
+Ben Shadwick "benshadwick"
+Jean-Yves Simon "lethalwp"
+Andrej Sinicyn "andrej4000"
+Andre Souza "luke_br"
+Steve Stavropoulos "isnothere"
+Daniel Steinberger "amorphousshape"
+Sven Strothoff "dataslayer"
+Andrea Suatoni "mrhandler"
+Luigi Toscano "ltosky"
+Xavier Trochu "xtrochu"
+Michael Udaltsov "cccp99"
+Kristof Vansant "lupusbe"
+Jordi Vilalta "jvprat"
+Tim Walters "realmz"
+David Weinehall "weine"
+Eric A. Welsh "eweish42"
+Yudhi Widyatama "yudhi97"
+Robert Wohlrab "moshroum"
+Benjamin W. Zale "junior_aepi"
+the rara avis "theraraavis"
+dewt "mncl"
+dubsdj
+exo "exofreeze"
+dc france "erwan2004"
+j0tt
+glo kidd "glo_kidd"
+ole
+phi1
+spookypeanut "spookypeanut"
+tbcarey
Modified: scummvm/branches/gsoc2007-fsnode/Makefile
===================================================================
--- scummvm/branches/gsoc2007-fsnode/Makefile 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/Makefile 2007-06-23 18:51:33 UTC (rev 27681)
@@ -56,7 +56,7 @@
$(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/pixmaps/"
$(INSTALL) -c -m 644 "$(srcdir)/icons/scummvm.xpm" "$(DESTDIR)$(PREFIX)/share/pixmaps/scummvm.xpm"
$(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
- $(INSTALL) -c -m 644 "$(srcdir)/AUTHORS" "$(srcdir)/COPYING" "$(srcdir)/NEWS" "$(srcdir)/README" "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
+ $(INSTALL) -c -m 644 "$(srcdir)/AUTHORS" "$(srcdir)/COPYING" "$(srcdir)/COPYRIGHT" "$(srcdir)/NEWS" "$(srcdir)/README" "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
$(INSTALL) -d "$(DESTDIR)$(DATADIR)/scummvm/"
$(INSTALL) -c -m 644 "$(srcdir)/gui/themes/modern.ini" "$(srcdir)/gui/themes/modern.zip" "$(srcdir)/gui/themes/classic080.ini" "$(DESTDIR)$(DATADIR)/scummvm/"
@@ -90,6 +90,10 @@
cp $(srcdir)/icons/scummvm.icns $(bundle_name)/Contents/Resources/
cp $(srcdir)/gui/themes/modern.ini $(bundle_name)/Contents/Resources/
cp $(srcdir)/gui/themes/modern.zip $(bundle_name)/Contents/Resources/
+ cp $(srcdir)/dists/pred.dic $(bundle_name)/Contents/Resources/
+ cp $(srcdir)/../../engine-data/trunk/kyra.dat $(bundle_name)/Contents/Resources/KYRA.DAT
+ cp $(srcdir)/../../engine-data/trunk/queen.tbl $(bundle_name)/Contents/Resources/
+ cp $(srcdir)/../../engine-data/trunk/sky.cpt $(bundle_name)/Contents/Resources/
cp scummvm-static $(bundle_name)/Contents/MacOS/scummvm
$(srcdir)/tools/credits.pl --rtf > $(bundle_name)/Contents/Resources/Credits.rtf
strip $(bundle_name)/Contents/MacOS/scummvm
@@ -136,6 +140,7 @@
mkdir ScummVM-snapshot
cp AUTHORS ./ScummVM-snapshot/Authors
cp COPYING ./ScummVM-snapshot/License
+ cp COPYRIGHT ./ScummVM-snapshot/Copyright\ Holders
cp NEWS ./ScummVM-snapshot/News
cp README ./ScummVM-snapshot/ScummVM\ ReadMe
/Developer/Tools/SetFile -t ttro -c ttxt ./ScummVM-snapshot/*
@@ -154,10 +159,12 @@
win32dist: scummvm$(EXEEXT)
mkdir -p $(WIN32PATH)
strip scummvm.exe -o $(WIN32PATH)/scummvm$(EXEEXT)
+ cp dists/pred.dic $(WIN32PATH)
cp gui/themes/modern.ini $(WIN32PATH)
cp gui/themes/modern.zip $(WIN32PATH)
cp AUTHORS $(WIN32PATH)/AUTHORS.txt
cp COPYING $(WIN32PATH)/COPYING.txt
+ cp COPYRIGHT $(WIN32PATH)/COPYRIGHT.txt
cp NEWS $(WIN32PATH)/NEWS.txt
cp README $(WIN32PATH)/README.txt
cp /usr/local/README-SDL.txt $(WIN32PATH)
@@ -173,6 +180,7 @@
cp gui/themes/modern.zip $(AOS4PATH)
cp AUTHORS $(AOS4PATH)/AUTHORS.txt
cp COPYING $(AOS4PATH)/COPYING.txt
+ cp COPYRIGHT $(AOS4PATH)/COPYRIGHT.txt
cp NEWS $(AOS4PATH)/NEWS.txt
cp README $(AOS4PATH)/README.txt
cp /sdk/local/documentation/SDL-1.2.9/README-SDL.txt $(AOS4PATH)
Modified: scummvm/branches/gsoc2007-fsnode/Makefile.common
===================================================================
--- scummvm/branches/gsoc2007-fsnode/Makefile.common 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/Makefile.common 2007-06-23 18:51:33 UTC (rev 27681)
@@ -3,7 +3,7 @@
# a list of common object files etc.
######################################################################
-# The defaul build target: just build the scummvm executable
+# The default build target: just build the scummvm executable
######################################################################
all: $(EXECUTABLE) plugins
@@ -15,7 +15,7 @@
# Files that are to be included in the archive built by "make dist"
DISTFILES := \
Makefile Makefile.common \
- AUTHORS NEWS README COPYING
+ AUTHORS NEWS README COPYING COPYRIGHT
# The dist file name
ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip
Modified: scummvm/branches/gsoc2007-fsnode/NEWS
===================================================================
--- scummvm/branches/gsoc2007-fsnode/NEWS 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/NEWS 2007-06-23 18:51:33 UTC (rev 27681)
@@ -1,7 +1,11 @@
For a more comprehensive changelog for the latest experimental SVN code, see:
http://scummvm.sourceforge.net/daily/ChangeLog
-0.10.0 (????-??-??)
+0.11.0 (????-??-??)
+ Broken Sword 1:
+ - Added support for FLAC encoded music.
+
+0.10.0 (2007-06-20)
New Games:
- Added Cinematique evo 1 engine. Currently only Future Wars is supported.
- Added Touche: The Adventures of the Fifth Musketeer engine.
@@ -16,7 +20,7 @@
General:
- Added dialog which allows the user to select the GUI theme on runtime.
- Added 'Mass Add' feature to the Launcher, which allows you to scan for
- all games in all subfolders of a given directory (to use it, press
+ all games in all subdirectories of a given directory (to use it, press
shift then click on "Add Game").
- Improved the way the auto detector generates target names, it now takes
a game's variant, language and platform into account.
@@ -59,11 +63,26 @@
LINC space and terminals, particularly in non-English languages.
Nintendo DS Port:
- - TOOO: Mention DLDI support
+ - New engines supported: AGI, CINE, and SAGA
+ - Option to show the mouse cursor
+ - Word completion on keyboard for AGI games
+ - Plenty of optimisations
+ Symbian Port:
+ - Added support for MP3 to S60v3 and UIQ3 versions.
+ - Switched to SDL 1.2.11 for bug fixes and improvements
+ - 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 :-)
+ The included fixes are too numerous to mention here.
+ Most of the updates in this version have concentrated on infrastructure.
+ This leads to faster execution, greatly increased compatibility and
+ OS friendliness - especially for keyboard/mouse input and display
+ handling (f.ex. no more popups during gameplay) -.
Windows Port:
- The default location of the config file changed, to support multi-user
Modified: scummvm/branches/gsoc2007-fsnode/README
===================================================================
--- scummvm/branches/gsoc2007-fsnode/README 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/README 2007-06-23 18:51:33 UTC (rev 27681)
@@ -29,7 +29,8 @@
* 3.12 Simon the Sorcerer notes
* 3.13 The Feeble Files notes
* 3.14 The Legend of Kyrandia notes
- * 3.15 Known Problems
+ * 3.15 Sierra AGI games Predictive Input Dialog notes
+ * 3.16 Known Problems
4.0) Supported Platforms
5.0) Running ScummVM
* 5.1 Command Line Options
@@ -137,15 +138,26 @@
The Dig [dig]
The Curse of Monkey Island [comi]
-Other Games:
- Beneath a Steel Sky [sky]
- Broken Sword 1: The Shadow of the Templars [sword1]
- Broken Sword 2: The Smoking Mirror [sword2]
- Flight of the Amazon Queen [queen]
- Future Wars [fw]
- Gobliiins [gob1]
- Gobliins 2 [gob2]
- Inherit the Earth: Quest for the Orb [ite]
+AGI Games by Sierra:
+ The Black Cauldron [bc]
+ Gold Rush! [goldrush]
+ King's Quest I [kq1]
+ King's Quest II [kq2]
+ King's Quest III [kq3]
+ King's Quest IV [kq4]
+ 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
+ Angel [pq1]
+ Space Quest I: The Sarien Encounter [sq1]
+ Space Quest II: Vohaul's Revenge [sq2]
+ Fanmade Games [agi-fanmade]
+
+AGOS Games by Adventuresoft / Horrorsoft:
+ Elvira - Mistress of the Dark [elvira1]
Simon the Sorcerer 1 [simon1]
Simon the Sorcerer 2 [simon2]
Simon the Sorcerer's Puzzle Pack
@@ -157,6 +169,22 @@
Simon the Sorcerer's Puzzle Pack
- Swampy Adventures [swampy]
The Feeble Files [feeble]
+
+GOB Games by Cocktel Vision:
+ Bargon Attack [bargon]
+ Gobliiins [gob1]
+ Gobliins 2 [gob2]
+ Goblins 3 [gob3]
+ Ween: The Prophecy [ween]
+
+Other Games:
+ Beneath a Steel Sky [sky]
+ Broken Sword 1: The Shadow of the Templars [sword1]
+ Broken Sword 2: The Smoking Mirror [sword2]
+ Flight of the Amazon Queen [queen]
+ Future Wars [fw]
+ Inherit the Earth: Quest for the Orb [ite]
+ Nippon Safes Inc. [nippon]
The Legend of Kyrandia [kyra1]
Touche: The Adventures of the Fifth
Musketeer [touche]
@@ -212,6 +240,7 @@
Backyard Soccer [soccer]
Blue's ABC Time [BluesABCTime]
Blue's Birthday Adventure [BluesBirthday]
+ Elvira II - The Jaws of Cerberus [elvira2]
SPY Fox 3: Operation Ozone [spyozon]
The following games are based on the SCUMM engine, but NOT supported
@@ -361,20 +390,22 @@
3.7) Broken Sword notes:
---- -------------------
Broken Sword 1 and 2 both come with in-game cutscenes compressed using
-RAD Game Tools legacy Smacker(tm) format. As RAD is unwilling to open
+RAD Game Tools' legacy Smacker(tm) format. As RAD is unwilling to open
the older legacy versions of this format to us, and have requested we not
reverse engineer it, Revolution Software has kindly allowed us to provide
re-encoded Broken Sword cutscenes for download on our website:
http://www.scummvm.org/downloads.php
-These cutscenes are provided in MPEG2 format with OGG Vorbis audio.
-Viewing these cutscenes thus requires a version of ScummVM compiled
-with both libmpeg2 (preferably 0.4.0 or greater) and libVorbis support.
+These cutscenes are provided in DXA format with FLAC audio. Their quality
+is equal to the original games due to the use of lossless compression.
+Viewing these cutscenes requires a version of ScummVM compiled with both
+FLAC and zLib support.
-TODO
-TODO: What about DXA??? Mention it here, too???
-TODO
+For systems that are too slow to handle the decoding of FLAC audio,
+the audio for these cutscenes is provided separately as OGG Vorbis audio
+too. Viewing these cutscenes with OGG Vorbis audio requires a version of
+ScummVM 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
@@ -493,11 +524,6 @@
which is the format used by the cutscenes in the Amiga and Macintosh versions.
See the tools README for a brief guide on converting the cutscenes.
-TODO
-TODO: Maybe we should add a section dedicated to Smacker and DXA, and refer
-TODO to it from here, and also from section 3.7 (Broken Sword) ?
-TODO
-
To use the speech files with ScummVM, they need to be renamed as follows:
Rename voices.wav on CD1 to voices1.wav
Rename voices.wav on CD2 to voices2.wav
@@ -511,7 +537,58 @@
which can be found on the 'Downloads' page of the ScummVM website.
-3.15) Known Problems:
+3.15) Sierra AGI games Predictive Input Dialog notes:
+----- -----------------------------------------------
+The Predictive Input Dialog is a ScummVM aid for running AGI engines games
+(which notoriously require command line input) on devices with limited keyboard
+support. In these situations since typing with emulated keyboards is quite
+tedious, commands can be entered quickly and easily via the Predictive Input
+Dialog.
+
+In order to enable predictive input in AGI games, you need to copy the pred.dic
+file in the ScummVM extras folder or the folder of the game you wish to play.
+This dictionary has been created by parsing through all known AGI games and
+contains the maximum set of common words.
+
+If the dictionary is detected, the Predictive Input Dialog is displayed either
+when you click on the command line area (wherever keyboard input is required,
+even in dialog boxes), or in some ports by pressing a designated hot key.
+
+The predictive input dialog operates in three modes, switchable by the
+(*)Pre/123/Abc button. The primary input method is the predictive mode (Pre)
+which resembles the way "fast typing" is performed at phones. The alphabet is
+divided into 9 sets which naturally map to the 9 number keys of the numeric
+keypad (0 is space). To type in a word, you press once the number of the set
+which contains the letter of the word you intend to type, then move on to the
+next. For example, to type the command 'look', you should press 5665. As you
+gradually type the intended word's numeric code, the dictionary is accessed for
+known words matching your input up to that point. As you press more keys, the
+prediction converges to the correct word. This is why the printed word may
+change dramatically between key presses. There exist situations though where
+more than one words share the same numeric representation. For example the
+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.
+
+The second input method (123) is the numeric input: Each key you press is
+entered verbatim as a number.
+
+The third input method (Abc) is the Multi-tap Alpha input mode. This mode is
+intended for entering free text, without assistance from the dictionary scheme
+of predictive (Pre) mode. The text is entered one letter at the time. For each
+letter first press the number of the set which contains the letter you want,
+then use the (#)next button to cycle through the letters and repeat with
+another number. For example, to enter the word 'look' you must press the
+following: 5##6##6##5#
+
+The dialog is fully usable with the mouse, but a few provisions have been made
+in some ScummVM ports to make its use more comfortable by naturally mapping the
+functionality to the numeric keypad. Also, the dialog's buttons can be
+navigated with the arrow and the enter keys.
+
+
+3.16) Known Problems:
----- ---------------
This release has the following known problems. There is no need to report them,
although patches to fix them are welcome. If you discover a bug that is not
@@ -578,7 +655,6 @@
The Legend of Kyrandia:
- Amiga versions aren't supported
- - FM-Towns version isn't supported
Humongous Entertainment games:
- No support for printing images
@@ -595,7 +671,7 @@
UNIX (Linux, Solaris, IRIX, *BSD)
Windows
- Windows Mobile (iPAQ and other handheld devices)
+ Windows CE and Windows Mobile (including Smartphones and PocketPCs)
Mac OS X
AmigaOS
BeOS
@@ -870,7 +946,6 @@
Cmd-q - Quit (Mac OS X)
Ctrl-q - Quit (other unices including Linux)
Ctrl-z OR Alt-x - Quit (other platforms)
- Ctrl-f - Toggle fast mode
Ctrl-m - Toggle mouse capture
Ctrl-Alt 1-8 - Switch between graphics filters
Ctrl-Alt + and - - Increase/Decrease the scale factor
@@ -886,6 +961,7 @@
SCUMM:
Ctrl 0-9 and Alt 0-9 - Load and save game state
Ctrl-d - Starts the debugger
+ Ctrl-f - Toggle fast mode
Ctrl-g - Runs in really REALLY fast mode
Ctrl-t - Switch between 'Speech only',
'Speech and Subtitles' and 'Subtitles only'
@@ -908,13 +984,14 @@
Beneath a Steel Sky:
Ctrl-d - Starts the debugger
+ Ctrl-f - Toggle fast mode
Ctrl-g - Runs in really REALLY fast mode
F5 - Displays a save/load box
Escape - Skips the game intro
Period (.) - Skips current line of text
Broken Sword 1:
- F5 or ESC - Displays save/load box
+ F5 or Escape - Displays save/load box
Broken Sword 2:
Ctrl-d - Starts the debugger
@@ -924,18 +1001,37 @@
Flight of the Amazon Queen:
Ctrl-d - Starts the debugger
+ Ctrl-f - Toggle fast mode
F1 - Use Journal (saving/loading)
F11 - Quicksave
F12 - Quickload
Escape - Skips cutscenes
Space - Skips current line of text
+ Future Wars
+ F1 - Examine
+ F2 - Take
+ F3 - Inventory
+ F4 - Use
+ F5 - Activate
+ F6 - Speak
+ F9 - "Activate" menu
+ F10 - "Use" menu
+ Escape - Bring on command menu
+
+ Nippon Safes
+ Ctrl-d - Starts the debugger
+ l - Load game
+ s - Save game
+
Simon the Sorcerer 1 and 2:
Ctrl 0-9 and Alt 0-9 - Load and save game state
Ctrl-d - Starts the debugger
+ Ctrl-f - Toggle fast mode
F1 - F3 - Text speed, faster - slower
F10 - Shows all characters and objects you can
interact with
+ Escape - Skip cutscenes
- and + - Music volume, down/up
m - Music on/off
s - Sound effects on/off
@@ -946,8 +1042,18 @@
combined speech and subtitles
[Simon the Sorcerer 2 only]
+ Simon the Sorcerer's Puzzle Pack
+ Ctrl-d - Starts the debugger
+ Ctrl-f - Toggle fast mode
+ F12 - High speed mode on/off in Swampy Adventures
+ - and + - Music volume, down/up
+ m - Music on/off
+ s - Sound effects on/off
+ p - Pauses
+
The Feeble Files
Ctrl-d - Starts the debugger
+ Ctrl-f - Toggle fast mode
F7 - Switch characters
F9 - Hitbox names on/off
s - Sound effects on/off
@@ -961,11 +1067,20 @@
Ctrl 0-9 and Alt 0-9 - Load and save game state
Ctrl-d - Starts the debugger
+ Touche: The Adventures of the Fifth Musketeer:
+ Ctrl-d - Starts the debugger
+ Ctrl-f - Toggle fast mode
+ F5 - Displays options
+ F9 - Turn fast walk mode on
+ F10 - Turn fast walk mode off
+ Escape - Quit
+ Space - Skips current line of text
+ t - Switch between 'Voice only',
+ 'Voice and Text' and 'Text only'
+
Note that using ctrl-f or ctrl-g is not recommended: games can crash when
being run faster than their normal speed, as scripts will lose synchronisation.
-Ctrl-f is not supported by the Broken Sword games.
-
Note for WinCE users: Due to the limited keyboard input in most devices, a
small subset of these hot keys are supported via key remapping and/or panel
actions. Please consult the README-WinCE.txt file.
@@ -1259,7 +1374,7 @@
to read the encoder documentation before you use other values.
-7.7.6) Compressing sfx/speech in Simon the Sorcerer and The Feeble Files
+7.7.6) Compressing music/sfx/speech in AGOS games
------ -----------------------------------------------------------------
Use our compress_agos utility from the scummvm-tools package to perform this
task. You can choose between multiple target formats, but note that you can
@@ -1280,6 +1395,8 @@
compress_agos voices3.wav (For Windows 4CD version of Feeble)
compress_agos voices4.wav (For Windows 4CD version of Feeble)
+ compress_agos Music (For Windows version of Puzzle Pack)
+
For Ogg Vorbis add --vorbis to the options, i.e.
compress_agos --vorbis
@@ -1531,38 +1648,36 @@
On Win9x/NT/XP you can define USE_WINDBG and attach WinDbg to browse debug
messages (see http://www.sysinternals.com/ntw2k/freeware/debugview.shtml).
-TODO
-TODO: The following lists is partially outdated, and incomplete.
-TODO We could either try to update it, and/or refer to the relevant
-TODO Wiki pages...
-TODO
- GCC:
- * Type ./configure
- * Type make (or gmake, or gnumake, depending on what GNU make is
+ GCC and MinGW32:
+ * Type "./configure"
+ * Type "make" (or "gmake", or "gnumake", depending on what GNU make is
called on your system) and hopefully ScummVM will compile for you.
+ * For more information refer to:
+ http://wiki.scummvm.org/index.php/Compiling_ScummVM/GCC
+ respectively
+ http://wiki.scummvm.org/index.php/Compiling_ScummVM/MinGW
Microsoft Visual C++ 6.0:
- * Open the workspace, scummwm.dsw
+ * Open the workspace file "scummwm.dsw" in the "dists\msvc6" folder.
* Enter the path to the needed libraries and includes in
- Tools|Options|Directories
+ "Tools|Options|Directories".
* Now it should compile successfully.
+ * For more information refer to:
+ http://wiki.scummvm.org/index.php/Compiling_ScummVM/VS2005
- Microsoft Visual C++ 7.0:
- * Open the solution file scummwm.sln
+ Microsoft Visual C++ 7.0/8.0:
+ * Open the solution file "scummwm.sln" in the "dists\msvc7"
+ respectively "dists\msvc8" folder.
* Enter the path to the needed libraries and includes in
- Tools|Options|Projects|VC++ Directories
+ Tools|Options|Projects|VC++ Directories".
* Now it should compile successfully.
+ * For more information refer to:
+ http://wiki.scummvm.org/index.php/Compiling_ScummVM/VS2005
- Windows Mobile with Microsoft eMbedded Visual C++ 3 or 4 :
- * Download SDL with additional Windows Mobile tweaks:
- http://arisme.free.fr/ports/SDL.php
- * Download additional third party libraries:
- http://arisme.free.fr/ports
- * Modify your include and library paths accordingly in EVC3/EVC4.
- * Open the ScummVM project dists\msevc4\PocketSCUMM.vcw
- * Modify the libraries and config parameters if necessary.
- * Now it should compile successfully.
+ Windows Mobile:
+ * Please refer to:
+ http://wiki.scummvm.org/index.php/Compiling_ScummVM/Windows_CE
Debian GNU/Linux:
* Install the packages 'build-essential', 'fakeroot', 'debhelper',
@@ -1581,12 +1696,14 @@
way to get that is to install SDL via Fink (http://fink.sf.net).
Alternatively you could compile SDL manually from source using its
unix build system (configure && make).
- * Type ./configure in the ScummVM directory
+ * Type "./configure" in the ScummVM directory.
* You can now type 'make' to create a command line binary.
* To get a version you can run from Finder, type 'make bundle' which
will create ScummVM.app (this only works out of the box if you
installed SDL into /sw (as happens if you are using Fink). If you
have installed SDL in another way, you will have to edit the Makefile).
+ * For more information refer to:
+ http://wiki.scummvm.org/index.php/Compiling_ScummVM/MacOS_X_Crosscompiling
AmigaOS 4 (Cross-compiling with Cygwin):
* Make sure that you have SDL installed, you may also need
Modified: scummvm/branches/gsoc2007-fsnode/backends/events/default/default-events.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/events/default/default-events.cpp 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/events/default/default-events.cpp 2007-06-23 18:51:33 UTC (rev 27681)
@@ -106,7 +106,7 @@
event.type = Common::EVENT_KEYDOWN;
event.synthetic = true;
event.kbd.ascii = _currentKeyDown.ascii;
- event.kbd.keycode = _currentKeyDown.keycode;
+ event.kbd.keycode = (Common::KeyCode)_currentKeyDown.keycode;
event.kbd.flags = _currentKeyDown.flags;
_keyRepeatTime = time + kKeyRepeatSustainDelay;
result = true;
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/base_event.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/base_event.cpp 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/base_event.cpp 2007-06-23 18:51:33 UTC (rev 27681)
@@ -93,72 +93,136 @@
sound_handler();
for(;;) {
+ // check for hardkey repeat for mouse emulation
+ keyCurrentState = KeyCurrentState();
+
// if it was a key pressed, let the keyup event raise
- if (_wasKey) {
- // check for hardkey repeat for mouse emulation
- keyCurrentState = KeyCurrentState();
+ if (_keyExtraPressed) {
+ if (gVars->arrowKeys) {
+ if (_keyExtraPressed & _keyExtra.bitLeft) {
+ if (!(keyCurrentState & _keyExtra.bitLeft)) {
+ _keyExtraPressed &= ~_keyExtra.bitLeft;
- if (!(keyCurrentState & _keyExtraMask)) {
- _lastKeyRepeat = 0;
+ event.type = Common::EVENT_KEYUP;
+ event.kbd.keycode = Common::KEYCODE_LEFT;
+ event.kbd.ascii = event.kbd.keycode;
+ event.kbd.flags = 0;
+ return true;
+ }
+ }
+ if (_keyExtraPressed & _keyExtra.bitRight) {
+ if (!(keyCurrentState & _keyExtra.bitRight)) {
+ _keyExtraPressed &= ~_keyExtra.bitRight;
- } else if (getMillis() >= (_keyExtraRepeat + _keyExtraDelay)) {
- _keyExtraRepeat = getMillis();
+ event.type = Common::EVENT_KEYUP;
+ event.kbd.keycode = Common::KEYCODE_RIGHT;
+ event.kbd.ascii = event.kbd.keycode;
+ event.kbd.flags = 0;
+ return true;
+ }
+ }
+ if (_keyExtraPressed & _keyExtra.bitUp) {
+ if (!(keyCurrentState & _keyExtra.bitUp)) {
+ _keyExtraPressed &= ~_keyExtra.bitUp;
- if (gVars->arrowKeys) {
-/* if HARD_KEY(Up, chrUpArrow)
- else if HARD_KEY(Down, chrDownArrow)
- else if HARD_KEY(Left, chrLeftArrow)
- else if HARD_KEY(Right, chrRightArrow)
-*/
- } else {
- // button released ?
- if (_keyExtraPressed) {
- if (_keyExtraPressed & _keyExtra.bitActionA) {
- if (!(keyCurrentState & _keyExtra.bitActionA)) {
- _keyExtraPressed &= ~_keyExtra.bitActionA;
+ event.type = Common::EVENT_KEYUP;
+ event.kbd.keycode = Common::KEYCODE_UP;
+ event.kbd.ascii = event.kbd.keycode;
+ event.kbd.flags = 0;
+ return true;
+ }
+ }
+ if (_keyExtraPressed & _keyExtra.bitDown) {
+ if (!(keyCurrentState & _keyExtra.bitDown)) {
+ _keyExtraPressed &= ~_keyExtra.bitDown;
- event.type = Common::EVENT_LBUTTONUP;
- event.mouse.x = _mouseCurState.x;
- event.mouse.y = _mouseCurState.y;
- return true;
- }
- }
+ event.type = Common::EVENT_KEYUP;
+ event.kbd.keycode = Common::KEYCODE_DOWN;
+ event.kbd.ascii = event.kbd.keycode;
+ event.kbd.flags = 0;
+ return true;
+ }
+ }
+ }
- if (_keyExtraPressed & _keyExtra.bitActionB) {
- if (!(keyCurrentState & _keyExtra.bitActionB)) {
- _keyExtraPressed &= ~_keyExtra.bitActionB;
+ if (_keyExtraPressed & _keyExtra.bitActionA) {
+ if (!(keyCurrentState & _keyExtra.bitActionA)) {
+ _keyExtraPressed &= ~_keyExtra.bitActionA;
- event.type = Common::EVENT_RBUTTONUP;
- event.mouse.x = _mouseCurState.x;
- event.mouse.y = _mouseCurState.y;
- return true;
- }
- }
- }
+ event.type = Common::EVENT_LBUTTONUP;
+ event.mouse.x = _mouseCurState.x;
+ event.mouse.y = _mouseCurState.y;
+ return true;
+ }
+ }
- Int8 sx = 0;
- Int8 sy = 0;
+ if (_keyExtraPressed & _keyExtra.bitActionB) {
+ if (!(keyCurrentState & _keyExtra.bitActionB)) {
+ _keyExtraPressed &= ~_keyExtra.bitActionB;
- if (keyCurrentState & _keyExtra.bitUp)
- sy = -1;
- else if (keyCurrentState & _keyExtra.bitDown)
- sy = +1;
-
- if (keyCurrentState & _keyExtra.bitLeft)
- sx = -1;
- else if (keyCurrentState & _keyExtra.bitRight)
- sx = +1;
+ event.type = Common::EVENT_RBUTTONUP;
+ event.mouse.x = _mouseCurState.x;
+ event.mouse.y = _mouseCurState.y;
+ return true;
+ }
+ }
- if (sx || sy) {
- simulate_mouse(event, sx, sy, &x, &y);
- event.type = Common::EVENT_MOUSEMOVE;
- event.mouse.x = x;
- event.mouse.y = y;
- warpMouse(x, y);
+ // no more event till up is raised
+ return false;
+ }
- return true;
- }
+ if (!(keyCurrentState & _keyExtraMask)) {
+ _lastKeyRepeat = 0;
+
+ } else if (getMillis() >= (_keyExtraRepeat + _keyExtraDelay)) {
+ _keyExtraRepeat = getMillis();
+
+ if (gVars->arrowKeys) {
+ if (keyCurrentState & _keyExtra.bitLeft) {
+ _keyExtraPressed |= _keyExtra.bitLeft;
+ event.kbd.keycode = Common::KEYCODE_LEFT;
+
+ } else if (keyCurrentState & _keyExtra.bitRight) {
+ _keyExtraPressed |= _keyExtra.bitRight;
+ event.kbd.keycode = Common::KEYCODE_RIGHT;
+
+ } else if (keyCurrentState & _keyExtra.bitUp) {
+ _keyExtraPressed |= _keyExtra.bitUp;
+ event.kbd.keycode = Common::EVENT_KEYUP;
+
+ } else if (keyCurrentState & _keyExtra.bitDown) {
+ _keyExtraPressed |= _keyExtra.bitDown;
+ event.kbd.keycode = Common::KEYCODE_DOWN;
}
+
+ event.type = Common::EVENT_KEYDOWN;
+ event.kbd.ascii = event.kbd.keycode;
+ event.kbd.flags = 0;
+ return true;
+
+ } else {
+ Int8 sx = 0;
+ Int8 sy = 0;
+
+ if (keyCurrentState & _keyExtra.bitUp)
+ sy = -1;
+ else if (keyCurrentState & _keyExtra.bitDown)
+ sy = +1;
+
+ if (keyCurrentState & _keyExtra.bitLeft)
+ sx = -1;
+ else if (keyCurrentState & _keyExtra.bitRight)
+ sx = +1;
+
+ if (sx || sy) {
+ simulate_mouse(event, sx, sy, &x, &y);
+ event.type = Common::EVENT_MOUSEMOVE;
+ event.mouse.x = x;
+ event.mouse.y = y;
+ warpMouse(x, y);
+
+ return true;
+ }
}
}
@@ -174,13 +238,13 @@
// arrow keys
case chrUpArrow:
- k = 273; break;
+ k = Common::KEYCODE_UP; break;
case chrDownArrow:
- k = 274; break;
+ k = Common::KEYCODE_DOWN; break;
+ case chrRightArrow:
+ k = Common::KEYCODE_RIGHT; break;
case chrLeftArrow:
- k = 275; break;
- case chrRightArrow:
- k = 276; break;
+ k = Common::KEYCODE_LEFT; break;
}
if (k) {
@@ -197,16 +261,16 @@
// ESC key
case vchrLaunch:
event.type = Common::EVENT_KEYDOWN;
- event.kbd.keycode = 27;
- event.kbd.ascii = 27;
+ event.kbd.keycode = Common::KEYCODE_ESCAPE;
+ event.kbd.ascii = Common::ASCII_ESCAPE;
event.kbd.flags = 0;
return true;
// F5 = menu
case vchrMenu:
event.type = Common::EVENT_KEYDOWN;
- event.kbd.keycode = 319;
- event.kbd.ascii = 319;
+ event.kbd.keycode = Common::KEYCODE_F5;
+ event.kbd.ascii = Common::ASCII_F5;
event.kbd.flags = 0;
return true;
@@ -222,13 +286,13 @@
// arrow keys
case chrUpArrow:
- k = 273; break;
+ k = Common::KEYCODE_UP; break;
case chrDownArrow:
- k = 274; break;
+ k = Common::KEYCODE_DOWN; break;
+ case chrRightArrow:
+ k = Common::KEYCODE_RIGHT; break;
case chrLeftArrow:
- k = 275; break;
- case chrRightArrow:
- k = 276; break;
+ k = Common::KEYCODE_LEFT; break;
}
if (k) {
@@ -249,13 +313,11 @@
((ev.data.keyDown.chr == vchrAttnStateChanged) ||
(ev.data.keyDown.chr == vchrAttnUnsnooze)));
-
// graffiti strokes, auto-off, etc...
if (!handled)
if (SysHandleEvent(&ev))
continue;
-
switch(ev.eType) {
case penMoveEvent:
get_coordinates(&ev, x, y);
@@ -349,8 +411,13 @@
// F1 -> F10 key
if (key >= '0' && key <= '9' && mask == (Common::KBD_CTRL|Common::KBD_ALT)) {
- key = (key == '0') ? 324 : (315 + key - '1');
- mask = 0;
+ key = (key - '0' + 10 - 1) % 10; // '0' -> 9, '1' -> 0, '2' -> 1, ...
+ _wasKey = true;
+ event.type = Common::EVENT_KEYDOWN;
+ event.kbd.keycode = Common::KEYCODE_F1 + key;
+ event.kbd.ascii = Common::ASCII_F1 + key;
+ event.kbd.flags = 0;
+ return true;
#ifdef STDLIB_TRACE_MEMORY
// print memory
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/be_os5.h
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/be_os5.h 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/be_os5.h 2007-06-23 18:51:33 UTC (rev 27681)
@@ -110,6 +110,8 @@
typedef void (OSystem_PalmOS5::*RendererProc)(RectangleType &r, PointType &p);
RendererProc _render;
+ Graphics::Surface _framebuffer;
+
OverlayColor *_overlayP;
WinHandle _overlayH, _workScreenH;
int16 *_workScreenP;
@@ -131,8 +133,7 @@
void calc_scale();
void render_landscapeAny(RectangleType &r, PointType &p);
- void render_landscape(RectangleType &r, PointType &p);
- void render_portrait(RectangleType &r, PointType &p);
+ void render_landscape15x(RectangleType &r, PointType &p);
void render_1x(RectangleType &r, PointType &p);
WinHandle alloc_screen(Coord w, Coord h);
virtual void draw_osd(UInt16 id, Int32 x, Int32 y, Boolean show, UInt8 color = 0);
@@ -169,7 +170,8 @@
void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h);
void clearScreen();
- bool grabRawScreen(Graphics::Surface *surf);
+ virtual Graphics::Surface *lockScreen();
+ virtual void unlockScreen();
void setCursorPalette(const byte *colors, uint start, uint num);
void disableCursorPalette(bool disable);
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/launcher/forms/formSelect.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/launcher/forms/formSelect.cpp 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/launcher/forms/formSelect.cpp 2007-06-23 18:51:33 UTC (rev 27681)
@@ -28,8 +28,9 @@
#include "formUtil.h"
#include "games.h"
#include "start.h"
-#include "common/util.h"
+#define ARRAYSIZE(x) ((int)(sizeof(x) / sizeof(x[0])))
+
static Char **items = NULL;
Int16 selectedEngine = -1;
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/launcher/games.h
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/launcher/games.h 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/launcher/games.h 2007-06-23 18:51:33 UTC (rev 27681)
@@ -186,14 +186,14 @@
{ "cine", "Delphine Cinematique v1.0" },
{ "queen", "Flight of the Amazon Queen" },
{ "lure", "Lure of the Tempress" },
- { "gob", "Gobliiins, Bargon Attack and more ..." },
+ { "gob", "Gobliiins, Bargon Attack and more" },
{ "kyra", "Kyrandia" },
{ "parallaction", "Parallaction" },
{ "saga", "SAGA Engine" },
{ "scumm", "Scumm Games" },
{ "agi", "Sierra AGI" },
{ "touche", "Touche: The Adventures of the Fifth Musketeer" },
- { "cruise", "Cruise for a Corpse" },
+ { "cruise", "Beta -> Cruise for a Corpse" },
};
// protos
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/os5_gfx.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/os5_gfx.cpp 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/os5_gfx.cpp 2007-06-23 18:51:33 UTC (rev 27681)
@@ -137,9 +137,13 @@
}
if (_stretched) {
- calc_scale();
OPTIONS_SET(kOptDisableOnScrDisp);
- _render = &OSystem_PalmOS5::render_landscapeAny;
+ if (_screenHeight == 200 && _screenDest.h == 300) {
+ _render = &OSystem_PalmOS5::render_landscape15x;
+ } else {
+ _render = &OSystem_PalmOS5::render_landscapeAny;
+ calc_scale();
+ }
} else {
OPTIONS_RST(kOptDisableOnScrDisp);
_render = &OSystem_PalmOS5::render_1x;
@@ -215,15 +219,20 @@
}
}
-bool OSystem_PalmOS5::grabRawScreen(Graphics::Surface *surf) {
- assert(surf);
+Graphics::Surface *OSystem_PalmOS5::lockScreen() {
+ _framebuffer.pixels = _offScreenP;
+ _framebuffer.w = _screenWidth;
+ _framebuffer.h = _screenHeight;
+ _framebuffer.pitch = _screenWidth;
+ _framebuffer.bytesPerPixel = 1;
- surf->create(_screenWidth, _screenHeight, 1);
- MemMove(surf->pixels, _offScreenP, _screenWidth * _screenHeight);
-
- return true;
+ return &_framebuffer;
}
+void OSystem_PalmOS5::unlockScreen() {
+ // The screen is always completely update anyway, so we don't have to force a full update here.
+}
+
void OSystem_PalmOS5::int_updateScreen() {
RectangleType r;
PointType p;
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/os5_renderer.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/os5_renderer.cpp 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/os5_renderer.cpp 2007-06-23 18:51:33 UTC (rev 27681)
@@ -76,3 +76,43 @@
p.y = _screenOffset.y + o;
RctSetRectangle(&r, 0, 0, _screenDest.w, _screenDest.h - o);
}
+
+void OSystem_PalmOS5::render_landscape15x(RectangleType &r, PointType &p) {
+ Coord x, y, o = 0;
+ int16 *dst = _workScreenP;
+
+ if (_overlayVisible) {
+ int16 *src = _overlayP;
+
+ for (y = 0; y < 100; y++) {
+ // draw 2 lines
+ for (x = 0; x < 320; x++) {
+ *dst++ = *src++;
+ *dst++ = *src;
+ *dst++ = *src++;
+ }
+ // copy the second to the next line
+ MemMove(dst, dst - 480, 480 * 2);
+ dst += 480;
+ }
+ } else {
+ byte *src = _offScreenP;
+ o = _current_shake_pos;
+
+ for (y = 0; y < 100; y++) {
+ // draw 2 lines
+ for (x = 0; x < 320; x++) {
+ *dst++ = _nativePal[*src++];
+ *dst++ = _nativePal[*src];
+ *dst++ = _nativePal[*src++];
+ }
+ // copy the second to the next line
+ MemMove(dst, dst - 480, 480 * 2);
+ dst += 480;
+ }
+ }
+
+ p.x = _screenOffset.x;
+ p.y = _screenOffset.y + o;
+ RctSetRectangle(&r, 0, 0, 480, 300 - o);
+}
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/zodiac_event.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/zodiac_event.cpp 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/PalmOS/Src/zodiac_event.cpp 2007-06-23 18:51:33 UTC (rev 27681)
@@ -46,8 +46,8 @@
// F5 = menu
case vchrThumbWheelBack:
event.type = Common::EVENT_KEYDOWN;
- event.kbd.keycode = 319;
- event.kbd.ascii = 319;
+ event.kbd.keycode = Common::KEYCODE_F5;
+ event.kbd.ascii = Common::ASCII_F5;
event.kbd.flags = 0;
return true;
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/dc/dc.h
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/dc/dc.h 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/dc/dc.h 2007-06-23 18:51:33 UTC (rev 27681)
@@ -81,8 +81,8 @@
// The screen will not be updated to reflect the new bitmap
void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h);
- // Copies the current screen contents to a new surface.
- bool grabRawScreen(Graphics::Surface *surf);
+ virtual Graphics::Surface *lockScreen();
+ virtual void unlockScreen();
// Clear the screen to black.
void clearScreen();
@@ -213,6 +213,8 @@
void *ovl_tx[NUM_BUFFERS];
unsigned short palette[256], cursor_palette[256];
+ Graphics::Surface _framebuffer;
+
int temp_sound_buffer[RING_BUFFER_SAMPLES>>SOUND_BUFFER_SHIFT];
void checkSound();
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/dc/display.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/dc/display.cpp 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/dc/display.cpp 2007-06-23 18:51:33 UTC (rev 27681)
@@ -609,21 +609,26 @@
return 0;
}
-bool OSystem_Dreamcast::grabRawScreen(Graphics::Surface *surf)
+Graphics::Surface *OSystem_Dreamcast::lockScreen()
{
- if(!screen || !surf)
- return false;
+ if (!screen)
+ return 0;
- surf->create(_screen_w, _screen_h, 1);
- unsigned char *src = screen, *dst = (unsigned char *)surf->pixels;
- for(int h = _screen_h; h>0; --h) {
- memcpy(dst, src, _screen_w);
- src += SCREEN_W;
- dst += _screen_w;
- }
- return true;
+ _framebuffer.pixels = screen;
+ _framebuffer.w = _screen_w;
+ _framebuffer.h = _screen_h;
+ _framebuffer.pitch = SCREEN_W;
+ _framebuffer.bytesPerPixel = 1;
+
+ return &_framebuffer;
}
+void OSystem_Dreamcast::unlockScreen()
+{
+ // Force screen update
+ _screen_dirty = true;
+}
+
void OSystem_Dreamcast::clearScreen()
{
memset(screen, 0, SCREEN_W*SCREEN_H);
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/dc/input.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/dc/input.cpp 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/dc/input.cpp 2007-06-23 18:51:33 UTC (rev 27681)
@@ -48,7 +48,7 @@
if(!(buttons & 4)) lmb++;
if(!(buttons & 2)) rmb++;
- if(!(buttons & 8)) newkey = 319;
+ if(!(buttons & 8)) newkey = Common::ASCII_F5;
else if(!(buttons & 512)) newkey = ' ';
else if(!(buttons & 1024)) newkey = numpadmap[(buttons>>4)&15];
@@ -69,7 +69,7 @@
if(!(buttons & 4)) lmb++;
if(!(buttons & 2)) rmb++;
- if(!(buttons & 8)) newkey = 319;
+ if(!(buttons & 8)) newkey = Common::ASCII_F5;
mouse_x += pad->cond.mouse.axis1;
mouse_y += pad->cond.mouse.axis2;
@@ -101,22 +101,22 @@
"=\xAF`{ }+*\xBD<>?" :
"-^@[ ];:\xA7,./")[key - 0x2d];
else if(key >= 0x3a && key <= 0x43)
- newkey = key+(315-0x3a);
+ newkey = key+(Common::ASCII_F1-0x3a);
else if(key >= 0x54 && key <= 0x57)
newkey = "/*-+"[key-0x54];
else switch(key) {
case 0x27: case 0x62:
newkey = ((shift & 0x22)? '~' : '0'); break;
case 0x28: case 0x58:
- newkey = 13; break;
+ newkey = Common::KEYCODE_RETURN; break;
case 0x29:
- newkey = 27; break;
+ newkey = Common::KEYCODE_ESCAPE; break;
case 0x2a:
- newkey = 8; break;
+ newkey = Common::KEYCODE_BACKSPACE; break;
case 0x2b:
- newkey = 9; break;
+ newkey = Common::KEYCODE_TAB; break;
case 0x2c:
- newkey = ' '; break;
+ newkey = Common::KEYCODE_SPACE; break;
case 0x4c:
if((shift & 0x11) && (shift & 0x44))
exit(0);
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/dc/selector.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/dc/selector.cpp 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/dc/selector.cpp 2007-06-23 18:51:33 UTC (rev 27681)
@@ -364,7 +364,7 @@
event = handleInput(locked_get_pads(), mousex, mousey, shiftFlags);
setimask(mask);
- if(event==-Common::EVENT_LBUTTONDOWN || event==13 || event==319) {
+ if(event==-Common::EVENT_LBUTTONDOWN || event==13 || event==Common::ASCII_F5) {
int selected_game = top_game + selector_pos;
for(int fade=0; fade<=256; fade+=4) {
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/dc/softkbd.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/dc/softkbd.cpp 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/dc/softkbd.cpp 2007-06-23 18:51:33 UTC (rev 27681)
@@ -52,7 +52,7 @@
static const short key_codes[] =
{
- 27, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324,
+ Common::KEYCODE_ESCAPE, Common::ASCII_F1, Common::ASCII_F2, Common::ASCII_F3, Common::ASCII_F4, Common::ASCII_F5, Common::ASCII_F6, Common::ASCII_F7, Common::ASCII_F8, Common::ASCII_F9, Common::ASCII_F10,
K('1','!'), K('2','"'), K('3','#'), K('4','$'), K('5','%'),
K('6','&'), K('7','\''), K('8','('), K('9',')'), K('0','~'), K('-','='),
K('q','Q'), K('w','W'), K('e','E'), K('r','R'), K('t','T'),
@@ -61,7 +61,7 @@
K('h','H'), K('j','J'), K('k','K'), K('l','L'), K(';','+'), K(':','*'),
K('z','Z'), K('x','X'), K('c','C'), K('v','V'), K('b','B'),
K('n','N'), K('m','M'), K(',','<'), K('.','>'), K('/','?'), K('\\','_'),
- ~Common::KBD_SHIFT, ~Common::KBD_CTRL, ~Common::KBD_ALT, ' ', 8, 13
+ ~Common::KBD_SHIFT, ~Common::KBD_CTRL, ~Common::KBD_ALT, ' ', Common::KEYCODE_BACKSPACE, Common::KEYCODE_RETURN
};
SoftKeyboard::SoftKeyboard(const OSystem_Dreamcast *_os)
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/makefile
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/makefile 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/makefile 2007-06-23 18:51:33 UTC (rev 27681)
@@ -333,8 +333,8 @@
#---------------------------------------------------------------------------------
%.nds: %.bin
- @echo ndstool -c $@ -9 scummvm.bin $(ARM7BIN) -b ../../$(LOGO) "$(shell basename $@);ScummVM 0.9.0;DS Port"
- ndstool -c $@ -9 scummvm.bin $(ARM7BIN) -b ../../$(LOGO) "$(shell basename $@);ScummVM 0.9.1;DS Port"
+ @echo ndstool -c $@ -9 scummvm.bin $(ARM7BIN) -b ../../$(LOGO) "$(shell basename $@);ScummVM 0.11.0svn;DS Port"
+ ndstool -c $@ -9 scummvm.bin $(ARM7BIN) -b ../../$(LOGO) "$(shell basename $@);ScummVM 0.11.0svn;DS Port"
dsbuild $@ -l ../ndsloader.bin
padbin 16 $(basename $@).ds.gba
Property changes on: scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/makefile
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/source/dsmain.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/source/dsmain.cpp 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/source/dsmain.cpp 2007-06-23 18:51:33 UTC (rev 27681)
@@ -333,27 +333,25 @@
void saveGameBackBuffer() {
#ifdef DISABLE_SCUMM
if (savedBuffer == NULL) savedBuffer = new u8[gameWidth * gameHeight];
- for (int r = 0; r < 200; r++) {
+ for (int r = 0; r < gameHeight; r++) {
memcpy(savedBuffer + (r * gameWidth), ((u8 *) (get8BitBackBuffer())) + (r * 512), gameWidth);
- }
#endif
}
void restoreGameBackBuffer() {
#ifdef DISABLE_SCUMM
if (savedBuffer) {
- for (int r = 0; r < 200; r++) {
- memcpy(((u8 *) (BG_GFX_SUB)) + (r * 512), savedBuffer + (r * gameWidth), gameWidth);
- memcpy(((u8 *) (get8BitBackBuffer())) + (r * 512), savedBuffer + (r * gameWidth), gameWidth);
- }
+ for (int r = 0; r < gameHeight; r++) {
+ memcpy(((u8 *) (BG_GFX_SUB)) + (r * 512), savedBuffer + (r * gameWidth), gameWidth);
+ memcpy(((u8 *) (get8BitBackBuffer())) + (r * 512), savedBuffer + (r * gameWidth), gameWidth);
+ }
+
delete savedBuffer;
savedBuffer = NULL;
}
-#endif
-
-#ifndef DISABLE_SCUMM
- memset(get8BitBackBuffer(), 0, 512 * 256);
- memset(BG_GFX_SUB, 0, 512 * 256);
+#else
+ memset(get8BitBackBuffer(), 0, 512 * 256);
+ memset(BG_GFX_SUB, 0, 512 * 256);
if (Scumm::g_scumm) {
Scumm::g_scumm->markRectAsDirty(Scumm::kMainVirtScreen, 0, gameWidth - 1, 0, gameHeight - 1, 1);
Scumm::g_scumm->markRectAsDirty(Scumm::kTextVirtScreen, 0, gameWidth - 1, 0, gameHeight - 1, 1);
@@ -996,11 +994,10 @@
// Copy the sub screen VRAM from the top screen - they should always be
// the same.
u16* buffer = get8BitBackBuffer();
-
- for (int r = 0; r < (512 * 256) >> 1; r++) {
- BG_GFX_SUB[r] = buffer[r];
- }
-
+
+ for (int r = 0; r < (512 * 256) >> 1; r++)
+ BG_GFX_SUB[r] = buffer[r];
+
SUB_DISPLAY_CR &= ~DISPLAY_BG1_ACTIVE; // Turn off keyboard layer
SUB_DISPLAY_CR |= DISPLAY_BG3_ACTIVE; // Turn on game layer
} else {
@@ -1229,7 +1226,7 @@
if (leftHandedSwap(getKeysChanged()) & KEY_UP) {
event.type = getKeyEvent(leftHandedSwap(KEY_UP));
- event.kbd.keycode = SDLK_UP;
+ event.kbd.keycode = Common::KEYCODE_UP;
event.kbd.ascii = 0;
event.kbd.flags = 0;
system->addEvent(event);
@@ -1237,7 +1234,7 @@
if (leftHandedSwap(getKeysChanged()) & KEY_DOWN) {
event.type = getKeyEvent(leftHandedSwap(KEY_DOWN));
- event.kbd.keycode = SDLK_DOWN;
+ event.kbd.keycode = Common::KEYCODE_DOWN;
event.kbd.ascii = 0;
event.kbd.flags = 0;
system->addEvent(event);
@@ -1245,7 +1242,7 @@
if (leftHandedSwap(getKeysDown()) & KEY_A) {
event.type = getKeyEvent(leftHandedSwap(KEY_A));
- event.kbd.keycode = SDLK_RETURN;
+ event.kbd.keycode = Common::KEYCODE_RETURN;
event.kbd.ascii = 0;
event.kbd.flags = 0;
system->addEvent(event);
@@ -1256,8 +1253,8 @@
if ((getKeysChanged() & KEY_START)) {
event.type = getKeyEvent(KEY_START);
- event.kbd.keycode = 319; // F5
- event.kbd.ascii = 319;
+ event.kbd.keycode = Common::KEYCODE_F5;
+ event.kbd.ascii = Common::ASCII_F5;
event.kbd.flags = 0;
system->addEvent(event);
}
@@ -2315,6 +2312,8 @@
consolePrintf("-------------------------------\n");
consolePrintf("ScummVM DS\n");
consolePrintf("Ported by Neil Millstone\n");
+ FIXME: Change this code to make use of base/internal_version.h
+ resp. uses gScummVMVersion from base/version.h
consolePrintf("Version 0.10.0SVN ");
#if defined(DS_BUILD_A)
consolePrintf("build A\n");
@@ -2483,4 +2482,3 @@
int main() {
DS::main();
}
-
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/source/dsoptions.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/source/dsoptions.cpp 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/source/dsoptions.cpp 2007-06-23 18:51:33 UTC (rev 27681)
@@ -158,8 +158,8 @@
Common::Event event;
event.type = Common::EVENT_KEYDOWN;
- event.kbd.ascii = SDLK_DOWN;
- event.kbd.keycode = SDLK_DOWN;
+ event.kbd.ascii = 0;
+ event.kbd.keycode = Common::KEYCODE_DOWN;
OSystem_DS::instance()->addEvent(event);
event.type = Common::EVENT_KEYUP;
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/source/osystem_ds.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/source/osystem_ds.cpp 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/source/osystem_ds.cpp 2007-06-23 18:51:33 UTC (rev 27681)
@@ -173,8 +173,8 @@
u16* src = (u16 *) buf;
if (DS::getKeyboardEnable()) {
-
- for (int dy = y; dy < y + h; dy++) {
+ for (int dy = y; dy < y + h; dy++)
+ {
u16* dest = bg + (dy << 8) + (x >> 1);
DC_FlushRange(src, w << 1);
@@ -185,7 +185,8 @@
}
} else {
- for (int dy = y; dy < y + h; dy++) {
+ for (int dy = y; dy < y + h; dy++)
+ {
u16* dest1 = bg + (dy << 8) + (x >> 1);
u16* dest2 = bgSub + (dy << 8) + (x >> 1);
@@ -473,24 +474,38 @@
}
}
-bool OSystem_DS::grabRawScreen(Graphics::Surface* surf) {
- surf->create(DS::getGameWidth(), DS::getGameHeight(), 1);
+Graphics::Surface *OSystem_DS::lockScreen() {
+ // For now, we create a full temporary screen surface, to which we copy the
+ // the screen content. Later unlockScreen will copy everything back.
+ // Not very nice nor efficient, but at least works, and is not worse
+ // than in the bad old times where we used grabRawScreen + copyRectToScreen.
+
+ _framebuffer.create(DS::getGameWidth(), DS::getGameHeight(), 1);
// Ensure we copy using 16 bit quantities due to limitation of VRAM addressing
- // TODO: Change this to work with the software scalar (hint: video ram format is different)
+
+
u16* image = (u16 *) DS::get8BitBackBuffer();
for (int y = 0; y < DS::getGameHeight(); y++)
{
- DC_FlushRange((image + (y * 512)), DS::getGameWidth());
+ DC_FlushRange(image + (y << 8), DS::getGameWidth());
for (int x = 0; x < DS::getGameWidth() >> 1; x++)
{
- *(((u16 *) (surf->pixels)) + y * (DS::getGameWidth() >> 1) + x) = *(image + y * 256 + x);
+ *(((u16 *) (_framebuffer.pixels)) + y * (DS::getGameWidth() >> 1) + x) = image[y << 8 + x];
}
}
- return true;
+ return &_framebuffer;
}
+void OSystem_DS::unlockScreen() {
+ // Copy temp framebuffer back to screen
+ copyRectToScreen((byte *)_framebuffer.pixels, _framebuffer.pitch, 0, 0, _framebuffer.w, _framebuffer.h);
+
+ // Free memory
+ _framebuffer.free();
+}
+
void OSystem_DS::setFocusRectangle(const Common::Rect& rect) {
DS::setTalkPos(rect.left + rect.width() / 2, rect.top + rect.height() / 2);
}
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/source/osystem_ds.h
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/source/osystem_ds.h 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/source/osystem_ds.h 2007-06-23 18:51:33 UTC (rev 27681)
@@ -53,6 +53,8 @@
DSAudioMixer* _mixer;
DSTimerManager* _timer;
+ Graphics::Surface _framebuffer;
+
static OSystem_DS* _instance;
typedef void (*SoundProc)(void *param, byte *buf, int len);
@@ -127,7 +129,8 @@
void addEvent(Common::Event& e);
bool isEventQueueEmpty() { return queuePos == 0; }
- virtual bool grabRawScreen(Graphics::Surface* surf);
+ virtual Graphics::Surface *lockScreen();
+ virtual void unlockScreen();
virtual void setFocusRectangle(const Common::Rect& rect);
@@ -159,4 +162,9 @@
//consolePrintf("coltorgb\n");
}
+namespace DS
+{
+bool isCpuScalerEnabled();
+}
+
#endif
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/source/touchkeyboard.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/source/touchkeyboard.cpp 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/source/touchkeyboard.cpp 2007-06-23 18:51:33 UTC (rev 27681)
@@ -56,9 +56,9 @@
{35, 17, 0, '8'},
{36, 19, 0, '9'},
{27, 21, 0, '0'},
- {45, 23, 0, SDLK_MINUS},
- {50, 25, 0, SDLK_EQUALS},
- {52, 27, 0, SDLK_BACKSPACE},
+ {45, 23, 0, Common::KEYCODE_MINUS},
+ {50, 25, 0, Common::KEYCODE_EQUALS},
+ {52, 27, 0, Common::KEYCODE_BACKSPACE},
// Top row
{'Q'-'A' + 1, 4, 2, 'Q'},
@@ -71,8 +71,8 @@
{'I'-'A' + 1, 18, 2, 'I'},
{'O'-'A' + 1, 20, 2, 'O'},
{'P'-'A' + 1, 22, 2, 'P'},
- {43, 24, 2, SDLK_LEFTBRACKET},
- {44, 26, 2, SDLK_RIGHTBRACKET},
+ {43, 24, 2, Common::KEYCODE_LEFTBRACKET},
+ {44, 26, 2, Common::KEYCODE_RIGHTBRACKET},
// Middle row
{55, 3, 4, DS_CAPSLOCK},
@@ -85,9 +85,9 @@
{'J'-'A' + 1, 17, 4, 'J'},
{'K'-'A' + 1, 19, 4, 'K'},
{'L'-'A' + 1, 21, 4, 'L'},
- {42, 23, 4, SDLK_SEMICOLON},
- {41, 25, 4, SDLK_QUOTE},
- {46, 27, 4, SDLK_RETURN},
+ {42, 23, 4, Common::KEYCODE_SEMICOLON},
+ {41, 25, 4, Common::KEYCODE_QUOTE},
+ {46, 27, 4, Common::KEYCODE_RETURN},
// Bottom row
{51, 4, 6, DS_SHIFT},
@@ -98,26 +98,26 @@
{'B'-'A' + 1, 14, 6, 'B'},
{'N'-'A' + 1, 16, 6, 'N'},
{'M'-'A' + 1, 18, 6, 'M'},
- {38, 20, 6, SDLK_COMMA},
- {39, 22, 6, SDLK_PERIOD},
- {40, 24, 6, SDLK_SLASH},
+ {38, 20, 6, Common::KEYCODE_COMMA},
+ {39, 22, 6, Common::KEYCODE_PERIOD},
+ {40, 24, 6, Common::KEYCODE_SLASH},
// Space bar
- {47, 9, 8, SDLK_SPACE},
- {48, 11, 8, SDLK_SPACE},
- {48, 13, 8, SDLK_SPACE},
- {48, 15, 8, SDLK_SPACE},
- {48, 17, 8, SDLK_SPACE},
- {49, 19, 8, SDLK_SPACE},
+ {47, 9, 8, Common::KEYCODE_SPACE},
+ {48, 11, 8, Common::KEYCODE_SPACE},
+ {48, 13, 8, Common::KEYCODE_SPACE},
+ {48, 15, 8, Common::KEYCODE_SPACE},
+ {48, 17, 8, Common::KEYCODE_SPACE},
+ {49, 19, 8, Common::KEYCODE_SPACE},
// Cursor arrows
- {52, 27, 8, SDLK_LEFT},
- {54, 29, 8, SDLK_DOWN},
- {53, 31, 8, SDLK_RIGHT},
- {51, 29, 6, SDLK_UP},
+ {52, 27, 8, Common::KEYCODE_LEFT},
+ {54, 29, 8, Common::KEYCODE_DOWN},
+ {53, 31, 8, Common::KEYCODE_RIGHT},
+ {51, 29, 6, Common::KEYCODE_UP},
// Close button
- {56, 30, 0, SDLK_UNKNOWN},
+ {56, 30, 0, Common::KEYCODE_INVALID},
};
@@ -237,7 +237,7 @@
Common::Event event;
// consolePrintf("Key: %d\n", r);
- if ((keys[r].character == SDLK_UNKNOWN)) {
+ if ((keys[r].character == Common::KEYCODE_INVALID)) {
// Close button
DS::closed = true;
} else if ((keys[r].character >= '0') && (keys[r].character <= '9')) {
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/source/touchkeyboard.h
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/source/touchkeyboard.h 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/ds/arm9/source/touchkeyboard.h 2007-06-23 18:51:33 UTC (rev 27681)
@@ -25,75 +25,6 @@
namespace DS {
-enum SDLKey {
- SDLK_UNKNOWN = 0, SDLK_FIRST = 0, SDLK_BACKSPACE = 8, SDLK_TAB = 9,
- SDLK_CLEAR = 12, SDLK_RETURN = 13, SDLK_PAUSE = 19, SDLK_ESCAPE = 27,
- SDLK_SPACE = 32, SDLK_EXCLAIM = 33, SDLK_QUOTEDBL = 34, SDLK_HASH = 35,
- SDLK_DOLLAR = 36, SDLK_AMPERSAND = 38, SDLK_QUOTE = 39, SDLK_LEFTPAREN = 40,
- SDLK_RIGHTPAREN = 41, SDLK_ASTERISK = 42, SDLK_PLUS = 43, SDLK_COMMA = 44,
- SDLK_MINUS = 45, SDLK_PERIOD = 46, SDLK_SLASH = 47, SDLK_0 = 48,
- SDLK_1 = 49, SDLK_2 = 50, SDLK_3 = 51, SDLK_4 = 52,
- SDLK_5 = 53, SDLK_6 = 54, SDLK_7 = 55, SDLK_8 = 56,
- SDLK_9 = 57, SDLK_COLON = 58, SDLK_SEMICOLON = 59, SDLK_LESS = 60,
- SDLK_EQUALS = 61, SDLK_GREATER = 62, SDLK_QUESTION = 63, SDLK_AT = 64,
- SDLK_LEFTBRACKET = 91, SDLK_BACKSLASH = 92, SDLK_RIGHTBRACKET = 93, SDLK_CARET = 94,
- SDLK_UNDERSCORE = 95, SDLK_BACKQUOTE = 96, SDLK_a = 97, SDLK_b = 98,
- SDLK_c = 99, SDLK_d = 100, SDLK_e = 101, SDLK_f = 102,
- SDLK_g = 103, SDLK_h = 104, SDLK_i = 105, SDLK_j = 106,
- SDLK_k = 107, SDLK_l = 108, SDLK_m = 109, SDLK_n = 110,
- SDLK_o = 111, SDLK_p = 112, SDLK_q = 113, SDLK_r = 114,
- SDLK_s = 115, SDLK_t = 116, SDLK_u = 117, SDLK_v = 118,
- SDLK_w = 119, SDLK_x = 120, SDLK_y = 121, SDLK_z = 122,
- SDLK_DELETE = 127, SDLK_WORLD_0 = 160, SDLK_WORLD_1 = 161, SDLK_WORLD_2 = 162,
- SDLK_WORLD_3 = 163, SDLK_WORLD_4 = 164, SDLK_WORLD_5 = 165, SDLK_WORLD_6 = 166,
- SDLK_WORLD_7 = 167, SDLK_WORLD_8 = 168, SDLK_WORLD_9 = 169, SDLK_WORLD_10 = 170,
- SDLK_WORLD_11 = 171, SDLK_WORLD_12 = 172, SDLK_WORLD_13 = 173, SDLK_WORLD_14 = 174,
- SDLK_WORLD_15 = 175, SDLK_WORLD_16 = 176, SDLK_WORLD_17 = 177, SDLK_WORLD_18 = 178,
- SDLK_WORLD_19 = 179, SDLK_WORLD_20 = 180, SDLK_WORLD_21 = 181, SDLK_WORLD_22 = 182,
- SDLK_WORLD_23 = 183, SDLK_WORLD_24 = 184, SDLK_WORLD_25 = 185, SDLK_WORLD_26 = 186,
- SDLK_WORLD_27 = 187, SDLK_WORLD_28 = 188, SDLK_WORLD_29 = 189, SDLK_WORLD_30 = 190,
- SDLK_WORLD_31 = 191, SDLK_WORLD_32 = 192, SDLK_WORLD_33 = 193, SDLK_WORLD_34 = 194,
- SDLK_WORLD_35 = 195, SDLK_WORLD_36 = 196, SDLK_WORLD_37 = 197, SDLK_WORLD_38 = 198,
- SDLK_WORLD_39 = 199, SDLK_WORLD_40 = 200, SDLK_WORLD_41 = 201, SDLK_WORLD_42 = 202,
- SDLK_WORLD_43 = 203, SDLK_WORLD_44 = 204, SDLK_WORLD_45 = 205, SDLK_WORLD_46 = 206,
- SDLK_WORLD_47 = 207, SDLK_WORLD_48 = 208, SDLK_WORLD_49 = 209, SDLK_WORLD_50 = 210,
- SDLK_WORLD_51 = 211, SDLK_WORLD_52 = 212, SDLK_WORLD_53 = 213, SDLK_WORLD_54 = 214,
- SDLK_WORLD_55 = 215, SDLK_WORLD_56 = 216, SDLK_WORLD_57 = 217, SDLK_WORLD_58 = 218,
- SDLK_WORLD_59 = 219, SDLK_WORLD_60 = 220, SDLK_WORLD_61 = 221, SDLK_WORLD_62 = 222,
- SDLK_WORLD_63 = 223, SDLK_WORLD_64 = 224, SDLK_WORLD_65 = 225, SDLK_WORLD_66 = 226,
- SDLK_WORLD_67 = 227, SDLK_WORLD_68 = 228, SDLK_WORLD_69 = 229, SDLK_WORLD_70 = 230,
- SDLK_WORLD_71 = 231, SDLK_WORLD_72 = 232, SDLK_WORLD_73 = 233, SDLK_WORLD_74 = 234,
- SDLK_WORLD_75 = 235, SDLK_WORLD_76 = 236, SDLK_WORLD_77 = 237, SDLK_WORLD_78 = 238,
- SDLK_WORLD_79 = 239, SDLK_WORLD_80 = 240, SDLK_WORLD_81 = 241, SDLK_WORLD_82 = 242,
- SDLK_WORLD_83 = 243, SDLK_WORLD_84 = 244, SDLK_WORLD_85 = 245, SDLK_WORLD_86 = 246,
- SDLK_WORLD_87 = 247, SDLK_WORLD_88 = 248, SDLK_WORLD_89 = 249, SDLK_WORLD_90 = 250,
- SDLK_WORLD_91 = 251, SDLK_WORLD_92 = 252, SDLK_WORLD_93 = 253, SDLK_WORLD_94 = 254,
- SDLK_WORLD_95 = 255, SDLK_KP0 = 256, SDLK_KP1 = 257, SDLK_KP2 = 258,
- SDLK_KP3 = 259, SDLK_KP4 = 260, SDLK_KP5 = 261, SDLK_KP6 = 262,
- SDLK_KP7 = 263, SDLK_KP8 = 264, SDLK_KP9 = 265, SDLK_KP_PERIOD = 266,
- SDLK_KP_DIVIDE = 267, SDLK_KP_MULTIPLY = 268, SDLK_KP_MINUS = 269, SDLK_KP_PLUS = 270,
- SDLK_KP_ENTER = 271, SDLK_KP_EQUALS = 272, SDLK_UP = 273, SDLK_DOWN = 274,
- SDLK_RIGHT = 275, SDLK_LEFT = 276, SDLK_INSERT = 277, SDLK_HOME = 278,
- SDLK_END = 279, SDLK_PAGEUP = 280, SDLK_PAGEDOWN = 281, SDLK_F1 = 282,
- SDLK_F2 = 283, SDLK_F3 = 284, SDLK_F4 = 285, SDLK_F5 = 286,
- SDLK_F6 = 287, SDLK_F7 = 288, SDLK_F8 = 289, SDLK_F9 = 290,
- SDLK_F10 = 291, SDLK_F11 = 292, SDLK_F12 = 293, SDLK_F13 = 294,
- SDLK_F14 = 295, SDLK_F15 = 296, SDLK_NUMLOCK = 300, SDLK_CAPSLOCK = 301,
- SDLK_SCROLLOCK = 302, SDLK_RSHIFT = 303, SDLK_LSHIFT = 304, SDLK_RCTRL = 305,
- SDLK_LCTRL = 306, SDLK_RALT = 307, SDLK_LALT = 308, SDLK_RMETA = 309,
- SDLK_LMETA = 310, SDLK_LSUPER = 311, SDLK_RSUPER = 312, SDLK_MODE = 313,
- SDLK_COMPOSE = 314, SDLK_HELP = 315, SDLK_PRINT = 316, SDLK_SYSREQ = 317,
- SDLK_BREAK = 318, SDLK_MENU = 319, SDLK_POWER = 320, SDLK_EURO = 321,
- SDLK_UNDO = 322, SDLK_LAST
-};
-
-enum SDLMod {
- KMOD_NONE = 0x0000, KMOD_LSHIFT = 0x0001, KMOD_RSHIFT = 0x0002, KMOD_LCTRL = 0x0040,
- KMOD_RCTRL = 0x0080, KMOD_LALT = 0x0100, KMOD_RALT = 0x0200, KMOD_LMETA = 0x0400,
- KMOD_RMETA = 0x0800, KMOD_NUM = 0x1000, KMOD_CAPS = 0x2000, KMOD_MODE = 0x4000,
- KMOD_RESERVED = 0x8000
-};
-
void drawKeyboard(int tileBase, int mapBase, u16* saveSpace);
void restoreVRAM(int tileBase, int mapBase, u16* saveSpace);
void addKeyboardEvents();
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/gp2x/build/bundle.sh
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/gp2x/build/bundle.sh 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/gp2x/build/bundle.sh 2007-06-23 18:51:33 UTC (rev 27681)
@@ -23,6 +23,7 @@
cp ../../../../AUTHORS ./scummvm-gp2x-`date '+%Y-%m-%d'`/
cp ../../../../README ./scummvm-gp2x-`date '+%Y-%m-%d'`/
cp ../../../../COPYING ./scummvm-gp2x-`date '+%Y-%m-%d'`/
+cp ../../../../COPYRIGHT ./scummvm-gp2x-`date '+%Y-%m-%d'`/
cp ../../../../NEWS ./scummvm-gp2x-`date '+%Y-%m-%d'`/
cp ../../../../gui/themes/modern.ini ./scummvm-gp2x-`date '+%Y-%m-%d'`/
cp ../../../../gui/themes/modern.zip ./scummvm-gp2x-`date '+%Y-%m-%d'`/
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/gp2x/events.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/gp2x/events.cpp 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/gp2x/events.cpp 2007-06-23 18:51:33 UTC (rev 27681)
@@ -65,7 +65,7 @@
static int mapKey(SDLKey key, SDLMod mod, Uint16 unicode)
{
if (key >= SDLK_F1 && key <= SDLK_F9) {
- return key - SDLK_F1 + 315;
+ return key - SDLK_F1 + Common::ASCII_F1;
} else if (key >= SDLK_KP0 && key <= SDLK_KP9) {
return key - SDLK_KP0 + '0';
} else if (key >= SDLK_UP && key <= SDLK_PAGEDOWN) {
@@ -468,10 +468,10 @@
break;
case GP2X_BUTTON_R:
if (GP2X_BUTTON_STATE_L == TRUE) {
- event.kbd.keycode = SDLK_0;
+ event.kbd.keycode = Common::KEYCODE_0;
event.kbd.ascii = mapKey(SDLK_0, ev.key.keysym.mod, 0);
} else {
- event.kbd.keycode = SDLK_F5;
+ event.kbd.keycode = Common::KEYCODE_F5;
event.kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0);
}
break;
@@ -479,28 +479,28 @@
if (GP2X_BUTTON_STATE_L == TRUE) {
event.type = Common::EVENT_QUIT;
} else {
- event.kbd.keycode = SDLK_ESCAPE;
+ event.kbd.keycode = Common::KEYCODE_ESCAPE;
event.kbd.ascii = mapKey(SDLK_ESCAPE, ev.key.keysym.mod, 0);
}
break;
case GP2X_BUTTON_A:
- event.kbd.keycode = SDLK_PERIOD;
+ event.kbd.keycode = Common::KEYCODE_PERIOD;
event.kbd.ascii = mapKey(SDLK_PERIOD, ev.key.keysym.mod, 0);
break;
case GP2X_BUTTON_Y:
if (GP2X_BUTTON_STATE_L == TRUE) {
setZoomOnMouse();
} else {
- event.kbd.keycode = SDLK_SPACE;
+ event.kbd.keycode = Common::KEYCODE_SPACE;
event.kbd.ascii = mapKey(SDLK_SPACE, ev.key.keysym.mod, 0);
}
break;
case JOY_BUT_RETURN:
- event.kbd.keycode = SDLK_RETURN;
+ event.kbd.keycode = Common::KEYCODE_RETURN;
event.kbd.ascii = mapKey(SDLK_RETURN, ev.key.keysym.mod, 0);
break;
case JOY_BUT_ZERO:
- event.kbd.keycode = SDLK_0;
+ event.kbd.keycode = Common::KEYCODE_0;
event.kbd.ascii = mapKey(SDLK_0, ev.key.keysym.mod, 0);
break;
@@ -514,7 +514,7 @@
// displayMessageOnOSD("Left Trigger Pressed");
// break;
// } else if ((ev.jbutton.button == GP2X_BUTTON_R) && (ev.jbutton.button != GP2X_BUTTON_L)) {
- // event.kbd.keycode = SDLK_F5;
+ // event.kbd.keycode = Common::KEYCODE_F5;
// event.kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0);
// break;
// } else {
@@ -525,7 +525,7 @@
if (GP2X_BUTTON_STATE_L == TRUE) {
displayMessageOnOSD("Setting CPU Speed at 230MHz");
GP2X_setCpuspeed(200);
- //event.kbd.keycode = SDLK_PLUS;
+ //event.kbd.keycode = Common::KEYCODE_PLUS;
//event.kbd.ascii = mapKey(SDLK_PLUS, ev.key.keysym.mod, 0);
} else {
GP2X_mixer_move_volume(1);
@@ -536,7 +536,7 @@
if (GP2X_BUTTON_STATE_L == TRUE) {
displayMessageOnOSD("Setting CPU Speed at 60MHz");
GP2X_setCpuspeed(60);
- //event.kbd.keycode = SDLK_MINUS;
+ //event.kbd.keycode = Common::KEYCODE_MINUS;
//event.kbd.ascii = mapKey(SDLK_MINUS, ev.key.keysym.mod, 0);
} else {
GP2X_mixer_move_volume(0);
@@ -564,26 +564,26 @@
event.kbd.flags = 0;
switch (ev.jbutton.button) {
case GP2X_BUTTON_SELECT:
- event.kbd.keycode = SDLK_ESCAPE;
+ event.kbd.keycode = Common::KEYCODE_ESCAPE;
event.kbd.ascii = mapKey(SDLK_ESCAPE, ev.key.keysym.mod, 0);
break;
case GP2X_BUTTON_A:
- event.kbd.keycode = SDLK_PERIOD;
+ event.kbd.keycode = Common::KEYCODE_PERIOD;
event.kbd.ascii = mapKey(SDLK_PERIOD, ev.key.keysym.mod, 0);
break;
case GP2X_BUTTON_Y:
-// event.kbd.keycode = SDLK_SPACE;
+// event.kbd.keycode = Common::KEYCODE_SPACE;
// event.kbd.ascii = mapKey(SDLK_SPACE, ev.key.keysym.mod, 0);
break;
case GP2X_BUTTON_START:
- event.kbd.keycode = SDLK_RETURN;
+ event.kbd.keycode = Common::KEYCODE_RETURN;
event.kbd.ascii = mapKey(SDLK_RETURN, ev.key.keysym.mod, 0);
break;
case GP2X_BUTTON_L:
GP2X_BUTTON_STATE_L = FALSE;
break;
case GP2X_BUTTON_R:
- event.kbd.keycode = SDLK_F5;
+ event.kbd.keycode = Common::KEYCODE_F5;
event.kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0);
break;
case GP2X_BUTTON_VOLUP:
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/gp2x/gp2x-common.h
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/gp2x/gp2x-common.h 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/gp2x/gp2x-common.h 2007-06-23 18:51:33 UTC (rev 27681)
@@ -90,12 +90,9 @@
// The screen will not be updated to reflect the new bitmap
void copyRectToScreen(const byte *src, int pitch, int x, int y, int w, int h);
- // Copies the screen to a buffer
- bool grabRawScreen(Graphics::Surface *surf);
+ virtual Graphics::Surface *lockScreen();
+ virtual void unlockScreen();
- // Clear the screen
- void clearScreen();
-
// Update the dirty areas of the screen
void updateScreen();
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/gp2x/graphics.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/gp2x/graphics.cpp 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/gp2x/graphics.cpp 2007-06-23 18:51:33 UTC (rev 27681)
@@ -687,22 +687,6 @@
}
}
-void OSystem_GP2X::clearScreen() {
- assert (_transactionMode == kTransactionNone);
-
- // Try to lock the screen surface
- if (SDL_LockSurface(_screen) == -1)
- error("SDL_LockSurface failed: %s", SDL_GetError());
-
- byte *dst = (byte *)_screen->pixels;
-
- // Clear the screen
- memset(dst, 0, _screenWidth * _screenHeight);
-
- // Unlock the screen surface
- SDL_UnlockSurface(_screen);
-}
-
void OSystem_GP2X::copyRectToScreen(const byte *src, int pitch, int x, int y, int w, int h) {
assert (_transactionMode == kTransactionNone);
assert(src);
@@ -772,15 +756,19 @@
SDL_UnlockSurface(_screen);
}
-// TIDY: DIRTY HACK: Try a REALLY simple version of grabRawScreen to
-// debug why it will not work on the GP2X.
-bool OSystem_GP2X::grabRawScreen(Graphics::Surface *surf) {
- assert(surf);
+Graphics::Surface *OSystem_GP2X::lockScreen() {
+ _framebuffer.pixels = _screen->pixels;
+ _framebuffer.w = _screen->w;
+ _framebuffer.h = _screen->h;
+ _framebuffer.pitch = _screen->pitch;
+ _framebuffer.bytesPerPixel = 1;
- surf->create(_screenWidth, _screenHeight, 1);
- memcpy(surf->pixels, _screen->pixels, _screenWidth * _screenHeight);
+ return &_framebuffer;
+}
- return true;
+void OSystem_GP2X::unlockScreen() {
+ // Force screen update
+ _forceFull = true;
}
void OSystem_GP2X::addDirtyRect(int x, int y, int w, int h, bool realCoordinates) {
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/gp32/gp32_osys.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/gp32/gp32_osys.cpp 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/gp32/gp32_osys.cpp 2007-06-23 18:51:33 UTC (rev 27681)
@@ -209,14 +209,18 @@
}
}
-bool OSystem_GP32::grabRawScreen(Graphics::Surface *surf) {
- assert(surf);
+Graphics::Surface *OSystem_GP32::lockScreen() {
+ _framebuffer.pixels = _gameScreen;
+ _framebuffer.w = _screenWidth;
+ _framebuffer.h = _screenHeight;
+ _framebuffer.pitch = _screenWidth;
+ _framebuffer.bytesPerPixel = 1;
- surf->create(_screenWidth, _screenHeight, 1);
+ return &_framebuffer;
+}
- memcpy(surf->pixels, _gameScreen, _screenWidth * _screenHeight);
-
- return true;
+void OSystem_GP32::unlockScreen() {
+ // The screen is always completely update anyway, so we don't have to force a full update here.
}
//TODO: Implement Dirty rect?
@@ -524,8 +528,10 @@
event.type = Common::EVENT_KEYDOWN;
if (_overlayVisible)
event.kbd.keycode = event.kbd.ascii = 13;
- else
- event.kbd.keycode = event.kbd.ascii = 319;
+ else {
+ event.kbd.keycode = Common::KEYCODE_F5;
+ event.kbd.ascii = Common::ASCII_F5;
+ }
return true;
}
if (ev.button == GPC_VK_SELECT) { // SELECT = pause
@@ -596,8 +602,10 @@
event.type = Common::EVENT_KEYUP;
if (_overlayVisible)
event.kbd.keycode = event.kbd.ascii = 13;
- else
- event.kbd.keycode = event.kbd.ascii = 319;
+ else {
+ event.kbd.keycode = Common::KEYCODE_F5;
+ event.kbd.ascii = Common::ASCII_F5;
+ }
return true;
}
if (ev.button == GPC_VK_SELECT) {
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/gp32/gp32_osys.h
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/gp32/gp32_osys.h 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/gp32/gp32_osys.h 2007-06-23 18:51:33 UTC (rev 27681)
@@ -49,6 +49,8 @@
uint16 *_tmpScreen, *_hwScreen;
OverlayColor *_overlayBuffer;
+ Graphics::Surface _framebuffer;
+
int _overlayWidth, _overlayHeight;
bool _overlayVisible;
uint32 _shakePos;
@@ -111,7 +113,8 @@
void grabOverlay(OverlayColor *buf, int pitch);
void copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h);
- bool grabRawScreen(Graphics::Surface *surf);
+ virtual Graphics::Surface *lockScreen();
+ virtual void unlockScreen();
int16 getOverlayHeight();
int16 getOverlayWidth();
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/maemo/hildon.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/maemo/hildon.cpp 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/maemo/hildon.cpp 2007-06-23 18:51:33 UTC (rev 27681)
@@ -26,9 +26,10 @@
#include <hildon-widgets/hildon-app.h>
#include <gtk/gtk.h>
#include <libosso.h>
+#include "base/internal_version.h"
#define OSSO_APP_NAME "scummvm"
-#define OSSO_APP_VERSION "0.9.0CVS"
+#define OSSO_APP_VERSION SCUMMVM_VERSION
#define OSSO_APP_SERVICE "org.scummvm."OSSO_APP_NAME
#define OSSO_APP_OBJECT "/org/scummvm/"OSSO_APP_NAME
#define OSSO_APP_IFACE "org.scummvm."OSSO_APP_NAME
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/maemo/main.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/maemo/main.cpp 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/maemo/main.cpp 2007-06-23 18:51:33 UTC (rev 27681)
@@ -33,6 +33,7 @@
#include "backends/platform/maemo/maemo-sdl.h"
#include "base/main.h"
+#include "base/internal_version.h"
#include <hildon-widgets/hildon-app.h>
#include <gtk/gtk.h>
#include <libosso.h>
@@ -41,7 +42,7 @@
#include <sys/resource.h>
#define OSSO_APP_NAME "scummvm"
-#define OSSO_APP_VERSION "0.9.0CVS"
+#define OSSO_APP_VERSION SCUMMVM_VERSION
void set_doubling(unsigned char enable) {
return;
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/morphos/morphos.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/morphos/morphos.cpp 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/morphos/morphos.cpp 2007-06-23 18:51:33 UTC (rev 27681)
@@ -838,7 +838,7 @@
/*
* Function key
*/
- event.kbd.ascii = (ScummMsg->Code-RAWKEY_F1)+315;
+ event.kbd.ascii = (ScummMsg->Code-RAWKEY_F1)+Common::ASCII_F1;
event.kbd.keycode = 0;
}
else if (ScummMsg->Code == RAWKEY_F11 || ScummMsg->Code == RAWKEY_F12)
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/null/null.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/null/null.cpp 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/null/null.cpp 2007-06-23 18:51:33 UTC (rev 27681)
@@ -63,7 +63,8 @@
virtual void grabPalette(byte *colors, uint start, uint num);
virtual void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h);
virtual void updateScreen();
- virtual bool grabRawScreen(Graphics::Surface *surf);
+ virtual Graphics::Surface *lockScreen();
+ virtual void unlockScreen();
virtual void setShakePos(int shakeOffset);
virtual void showOverlay();
@@ -189,10 +190,13 @@
void OSystem_NULL::updateScreen() {
}
-bool OSystem_NULL::grabRawScreen(Graphics::Surface *surf) {
- return false;
+Graphics::Surface *OSystem_NULL::lockScreen() {
+ return 0;
}
+void OSystem_NULL::unlockScreen() {
+}
+
void OSystem_NULL::setShakePos(int shakeOffset) {
}
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/ps2/Gs2dScreen.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/ps2/Gs2dScreen.cpp 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/ps2/Gs2dScreen.cpp 2007-06-23 18:51:33 UTC (rev 27681)
@@ -364,13 +364,6 @@
}
}
-void Gs2dScreen::clearScreen(void) {
- WaitSema(g_DmacSema);
- memset(_screenBuf, 0, _width * _height);
- _screenChanged = true;
- SignalSema(g_DmacSema);
-}
-
void Gs2dScreen::setPalette(const uint32 *pal, uint8 start, uint16 num) {
assert(start + num <= 256);
@@ -393,11 +386,20 @@
}
}
-void Gs2dScreen::grabScreen(Graphics::Surface *surf) {
- assert(surf);
+Graphics::Surface *Gs2dScreen::lockScreen() {
WaitSema(g_DmacSema);
- surf->create(_width, _height, 1);
- memcpy(surf->pixels, _screenBuf, _width * _height);
+
+ _framebuffer.pixels = _screen->pixels;
+ _framebuffer.w = _screen->w;
+ _framebuffer.h = _screen->h;
+ _framebuffer.pitch = _screen->pitch;
+ _framebuffer.bytesPerPixel = 1;
+
+ return &_framebuffer;
+}
+
+void Gs2dScreen::unlockScreen() {
+ _screenChanged = true;
SignalSema(g_DmacSema);
}
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/ps2/Gs2dScreen.h
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/ps2/Gs2dScreen.h 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/ps2/Gs2dScreen.h 2007-06-23 18:51:33 UTC (rev 27681)
@@ -56,13 +56,13 @@
void copyPrintfOverlay(const uint8* buf);
void clearPrintfOverlay(void);
- void clearScreen(void);
void copyScreenRect(const uint8 *buf, int pitch, int x, int y, int w, int h);
void setPalette(const uint32 *pal, uint8 start, uint16 num);
void updateScreen(void);
void grabPalette(uint32 *pal, uint8 start, uint16 num);
- void grabScreen(Graphics::Surface *surf);
+ Graphics::Surface *lockScreen();
+ void unlockScreen();
//- overlay routines
void copyOverlayRect(const uint16 *buf, uint16 pitch, uint16 x, uint16 y, uint16 w, uint16 h);
void grabOverlay(uint16 *buf, uint16 pitch);
@@ -99,6 +99,8 @@
uint32 _mouseScaleX, _mouseScaleY;
uint8 _mTraCol;
+ Graphics::Surface _framebuffer;
+
int _shakePos;
bool _showMouse, _showOverlay, _screenChanged, _overlayChanged, _clutChanged;
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/ps2/ps2input.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/ps2/ps2input.cpp 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/ps2/ps2input.cpp 2007-06-23 18:51:33 UTC (rev 27681)
@@ -31,7 +31,6 @@
#include "backends/platform/ps2/ps2input.h"
#include "backends/platform/ps2/ps2pad.h"
#include "backends/platform/ps2/systemps2.h"
-#include "backends/platform/ps2/sdlkeys.h"
#include "common/events.h"
#include "common/system.h"
@@ -96,15 +95,15 @@
#define PAD_CHECK_TIME 20
int Ps2Input::mapKey(int key, int mod) { // copied from sdl backend
- if (key >= SDLK_F1 && key <= SDLK_F9) {
- return key - SDLK_F1 + 315;
- } else if (key >= SDLK_KP0 && key <= SDLK_KP9) {
- return key - SDLK_KP0 + '0';
- } else if (key >= SDLK_UP && key <= SDLK_PAGEDOWN) {
+ if (key >= Common::KEYCODE_F1 && key <= Common::KEYCODE_F9) {
+ return key - Common::KEYCODE_F1 + Common::ASCII_F1;
+ } else if (key >= Common::KEYCODE_KP0 && key <= Common::KEYCODE_KP9) {
+ return key - Common::KEYCODE_KP0 + '0';
+ } else if (key >= Common::KEYCODE_UP && key <= Common::KEYCODE_PAGEDOWN) {
return key;
} else if (key >= 'a' && key <= 'z' && mod & Common::KBD_SHIFT) {
return key & ~0x20;
- } else if (key >= SDLK_NUMLOCK && key <= SDLK_EURO) {
+ } else if (key >= Common::KEYCODE_NUMLOCK && key <= Common::KEYCODE_EURO) {
return 0;
}
return key;
@@ -142,17 +141,17 @@
PS2KbdRawKey key;
if (PS2KbdReadRaw(&key) == 1) {
if (_usbToSdlk[key.key]) {
- if ((_usbToSdlk[key.key] == SDLK_LSHIFT) || (_usbToSdlk[key.key] == SDLK_RSHIFT)) {
+ if ((_usbToSdlk[key.key] == Common::KEYCODE_LSHIFT) || (_usbToSdlk[key.key] == Common::KEYCODE_RSHIFT)) {
if (key.state & 1)
_keyFlags |= Common::KBD_SHIFT;
else
_keyFlags &= ~Common::KBD_SHIFT;
- } else if ((_usbToSdlk[key.key] == SDLK_LCTRL) || (_usbToSdlk[key.key] == SDLK_RCTRL)) {
+ } else if ((_usbToSdlk[key.key] == Common::KEYCODE_LCTRL) || (_usbToSdlk[key.key] == Common::KEYCODE_RCTRL)) {
if (key.state & 1)
_keyFlags |= Common::KBD_CTRL;
else
_keyFlags &= ~Common::KBD_CTRL;
- } else if ((_usbToSdlk[key.key] == SDLK_LALT) || (_usbToSdlk[key.key] == SDLK_RALT)) {
+ } else if ((_usbToSdlk[key.key] == Common::KEYCODE_LALT) || (_usbToSdlk[key.key] == Common::KEYCODE_RALT)) {
if (key.state & 1)
_keyFlags |= Common::KBD_ALT;
else
@@ -256,106 +255,106 @@
/* 01 */ 0,
/* 02 */ 0,
/* 03 */ 0,
- /* 04 */ SDLK_a,
- /* 05 */ SDLK_b,
- /* 06 */ SDLK_c,
- /* 07 */ SDLK_d,
- /* 08 */ SDLK_e,
- /* 09 */ SDLK_f,
- /* 0A */ SDLK_g,
- /* 0B */ SDLK_h,
- /* 0C */ SDLK_i,
- /* 0D */ SDLK_j,
- /* 0E */ SDLK_k,
- /* 0F */ SDLK_l,
- /* 10 */ SDLK_m,
- /* 11 */ SDLK_n,
- /* 12 */ SDLK_o,
- /* 13 */ SDLK_p,
- /* 14 */ SDLK_q,
- /* 15 */ SDLK_r,
- /* 16 */ SDLK_s,
- /* 17 */ SDLK_t,
- /* 18 */ SDLK_u,
- /* 19 */ SDLK_v,
- /* 1A */ SDLK_w,
- /* 1B */ SDLK_x,
- /* 1C */ SDLK_y,
- /* 1D */ SDLK_z,
- /* 1E */ SDLK_1,
- /* 1F */ SDLK_2,
- /* 20 */ SDLK_3,
- /* 21 */ SDLK_4,
- /* 22 */ SDLK_5,
- /* 23 */ SDLK_6,
- /* 24 */ SDLK_7,
- /* 25 */ SDLK_8,
- /* 26 */ SDLK_9,
- /* 27 */ SDLK_0,
- /* 28 */ SDLK_RETURN,
- /* 29 */ SDLK_ESCAPE,
- /* 2A */ SDLK_BACKSPACE,
- /* 2B */ SDLK_TAB,
- /* 2C */ SDLK_SPACE,
- /* 2D */ SDLK_MINUS,
- /* 2E */ SDLK_EQUALS,
- /* 2F */ SDLK_LEFTBRACKET,
- /* 30 */ SDLK_RIGHTBRACKET,
- /* 31 */ SDLK_BACKSLASH,
- /* 32 */ SDLK_HASH,
- /* 33 */ SDLK_SEMICOLON,
- /* 34 */ SDLK_QUOTE,
- /* 35 */ SDLK_BACKQUOTE,
- /* 36 */ SDLK_COMMA,
- /* 37 */ SDLK_PERIOD,
- /* 38 */ SDLK_SLASH,
- /* 39 */ SDLK_CAPSLOCK,
- /* 3A */ SDLK_F1,
- /* 3B */ SDLK_F2,
- /* 3C */ SDLK_F3,
- /* 3D */ SDLK_F4,
- /* 3E */ SDLK_F5,
- /* 3F */ SDLK_F6,
- /* 40 */ SDLK_F7,
- /* 41 */ SDLK_F8,
- /* 42 */ SDLK_F9,
- /* 43 */ SDLK_F10,
- /* 44 */ SDLK_F11,
- /* 45 */ SDLK_F12,
- /* 46 */ SDLK_PRINT,
- /* 47 */ SDLK_SCROLLOCK,
- /* 48 */ SDLK_PAUSE,
- /* 49 */ SDLK_INSERT,
- /* 4A */ SDLK_HOME,
- /* 4B */ SDLK_PAGEUP,
- /* 4C */ SDLK_DELETE,
- /* 4D */ SDLK_END,
- /* 4E */ SDLK_PAGEDOWN,
- /* 4F */ SDLK_RIGHT,
- /* 50 */ SDLK_LEFT,
- /* 51 */ SDLK_DOWN,
- /* 52 */ SDLK_UP,
- /* 53 */ SDLK_NUMLOCK,
- /* 54 */ SDLK_KP_DIVIDE,
- /* 55 */ SDLK_KP_MULTIPLY,
- /* 56 */ SDLK_KP_MINUS,
- /* 57 */ SDLK_KP_PLUS,
- /* 58 */ SDLK_KP_ENTER,
- /* 59 */ SDLK_KP1,
- /* 5A */ SDLK_KP2,
- /* 5B */ SDLK_KP3,
- /* 5C */ SDLK_KP4,
- /* 5D */ SDLK_KP5,
- /* 5E */ SDLK_KP6,
- /* 5F */ SDLK_KP7,
- /* 60 */ SDLK_KP8,
- /* 61 */ SDLK_KP9,
- /* 62 */ SDLK_KP0,
- /* 63 */ SDLK_KP_PERIOD,
+ /* 04 */ Common::KEYCODE_a,
+ /* 05 */ Common::KEYCODE_b,
+ /* 06 */ Common::KEYCODE_c,
+ /* 07 */ Common::KEYCODE_d,
+ /* 08 */ Common::KEYCODE_e,
+ /* 09 */ Common::KEYCODE_f,
+ /* 0A */ Common::KEYCODE_g,
+ /* 0B */ Common::KEYCODE_h,
+ /* 0C */ Common::KEYCODE_i,
+ /* 0D */ Common::KEYCODE_j,
+ /* 0E */ Common::KEYCODE_k,
+ /* 0F */ Common::KEYCODE_l,
+ /* 10 */ Common::KEYCODE_m,
+ /* 11 */ Common::KEYCODE_n,
+ /* 12 */ Common::KEYCODE_o,
+ /* 13 */ Common::KEYCODE_p,
+ /* 14 */ Common::KEYCODE_q,
+ /* 15 */ Common::KEYCODE_r,
+ /* 16 */ Common::KEYCODE_s,
+ /* 17 */ Common::KEYCODE_t,
+ /* 18 */ Common::KEYCODE_u,
+ /* 19 */ Common::KEYCODE_v,
+ /* 1A */ Common::KEYCODE_w,
+ /* 1B */ Common::KEYCODE_x,
+ /* 1C */ Common::KEYCODE_y,
+ /* 1D */ Common::KEYCODE_z,
+ /* 1E */ Common::KEYCODE_1,
+ /* 1F */ Common::KEYCODE_2,
+ /* 20 */ Common::KEYCODE_3,
+ /* 21 */ Common::KEYCODE_4,
+ /* 22 */ Common::KEYCODE_5,
+ /* 23 */ Common::KEYCODE_6,
+ /* 24 */ Common::KEYCODE_7,
+ /* 25 */ Common::KEYCODE_8,
+ /* 26 */ Common::KEYCODE_9,
+ /* 27 */ Common::KEYCODE_0,
+ /* 28 */ Common::KEYCODE_RETURN,
+ /* 29 */ Common::KEYCODE_ESCAPE,
+ /* 2A */ Common::KEYCODE_BACKSPACE,
+ /* 2B */ Common::KEYCODE_TAB,
+ /* 2C */ Common::KEYCODE_SPACE,
+ /* 2D */ Common::KEYCODE_MINUS,
+ /* 2E */ Common::KEYCODE_EQUALS,
+ /* 2F */ Common::KEYCODE_LEFTBRACKET,
+ /* 30 */ Common::KEYCODE_RIGHTBRACKET,
+ /* 31 */ Common::KEYCODE_BACKSLASH,
+ /* 32 */ Common::KEYCODE_HASH,
+ /* 33 */ Common::KEYCODE_SEMICOLON,
+ /* 34 */ Common::KEYCODE_QUOTE,
+ /* 35 */ Common::KEYCODE_BACKQUOTE,
+ /* 36 */ Common::KEYCODE_COMMA,
+ /* 37 */ Common::KEYCODE_PERIOD,
+ /* 38 */ Common::KEYCODE_SLASH,
+ /* 39 */ Common::KEYCODE_CAPSLOCK,
+ /* 3A */ Common::KEYCODE_F1,
+ /* 3B */ Common::KEYCODE_F2,
+ /* 3C */ Common::KEYCODE_F3,
+ /* 3D */ Common::KEYCODE_F4,
+ /* 3E */ Common::KEYCODE_F5,
+ /* 3F */ Common::KEYCODE_F6,
+ /* 40 */ Common::KEYCODE_F7,
+ /* 41 */ Common::KEYCODE_F8,
+ /* 42 */ Common::KEYCODE_F9,
+ /* 43 */ Common::KEYCODE_F10,
+ /* 44 */ Common::KEYCODE_F11,
+ /* 45 */ Common::KEYCODE_F12,
+ /* 46 */ Common::KEYCODE_PRINT,
+ /* 47 */ Common::KEYCODE_SCROLLOCK,
+ /* 48 */ Common::KEYCODE_PAUSE,
+ /* 49 */ Common::KEYCODE_INSERT,
+ /* 4A */ Common::KEYCODE_HOME,
+ /* 4B */ Common::KEYCODE_PAGEUP,
+ /* 4C */ Common::KEYCODE_DELETE,
+ /* 4D */ Common::KEYCODE_END,
+ /* 4E */ Common::KEYCODE_PAGEDOWN,
+ /* 4F */ Common::KEYCODE_RIGHT,
+ /* 50 */ Common::KEYCODE_LEFT,
+ /* 51 */ Common::KEYCODE_DOWN,
+ /* 52 */ Common::KEYCODE_UP,
+ /* 53 */ Common::KEYCODE_NUMLOCK,
+ /* 54 */ Common::KEYCODE_KP_DIVIDE,
+ /* 55 */ Common::KEYCODE_KP_MULTIPLY,
+ /* 56 */ Common::KEYCODE_KP_MINUS,
+ /* 57 */ Common::KEYCODE_KP_PLUS,
+ /* 58 */ Common::KEYCODE_KP_ENTER,
+ /* 59 */ Common::KEYCODE_KP1,
+ /* 5A */ Common::KEYCODE_KP2,
+ /* 5B */ Common::KEYCODE_KP3,
+ /* 5C */ Common::KEYCODE_KP4,
+ /* 5D */ Common::KEYCODE_KP5,
+ /* 5E */ Common::KEYCODE_KP6,
+ /* 5F */ Common::KEYCODE_KP7,
+ /* 60 */ Common::KEYCODE_KP8,
+ /* 61 */ Common::KEYCODE_KP9,
+ /* 62 */ Common::KEYCODE_KP0,
+ /* 63 */ Common::KEYCODE_KP_PERIOD,
/* 64 */ 0,
/* 65 */ 0,
/* 66 */ 0,
- /* 67 */ SDLK_KP_EQUALS,
+ /* 67 */ Common::KEYCODE_KP_EQUALS,
/* 68 */ 0,
/* 69 */ 0,
/* 6A */ 0,
@@ -476,13 +475,13 @@
/* DD */ 0,
/* DE */ 0,
/* DF */ 0,
- /* E0 */ SDLK_LCTRL,
- /* E1 */ SDLK_LSHIFT,
- /* E2 */ SDLK_LALT,
+ /* E0 */ Common::KEYCODE_LCTRL,
+ /* E1 */ Common::KEYCODE_LSHIFT,
+ /* E2 */ Common::KEYCODE_LALT,
/* E3 */ 0,
- /* E4 */ SDLK_RCTRL,
- /* E5 */ SDLK_RSHIFT,
- /* E6 */ SDLK_RALT,
+ /* E4 */ Common::KEYCODE_RCTRL,
+ /* E5 */ Common::KEYCODE_RSHIFT,
+ /* E6 */ Common::KEYCODE_RALT,
/* E7 */ 0,
/* E8 */ 0,
/* E9 */ 0,
@@ -511,22 +510,22 @@
};
const int Ps2Input::_padCodes[16] = {
- SDLK_1, // Select
+ Common::KEYCODE_1, // Select
0, // L3
0, // R3
- SDLK_F5, // Start
+ Common::KEYCODE_F5, // Start
0, // Up
0, // Right
0, // Down
0, // Left
- SDLK_KP0, // L2
+ Common::KEYCODE_KP0, // L2
0, // R2
- SDLK_n, // L1
- SDLK_y, // R1
- SDLK_ESCAPE, // Triangle
+ Common::KEYCODE_n, // L1
+ Common::KEYCODE_y, // R1
+ Common::KEYCODE_ESCAPE, // Triangle
0, // Circle => Right mouse button
0, // Cross => Left mouse button
- SDLK_RETURN // Square
+ Common::KEYCODE_RETURN // Square
};
const int Ps2Input::_padFlags[16] = {
Deleted: scummvm/branches/gsoc2007-fsnode/backends/platform/ps2/sdlkeys.h
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/ps2/sdlkeys.h 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/ps2/sdlkeys.h 2007-06-23 18:51:33 UTC (rev 27681)
@@ -1,264 +0,0 @@
-/* copied from SDK_keysym.h */
-
-#ifndef __SDLKEYS_H__
-#define __SDLKEYS_H__
-
-enum SdlKeyCodes {
- SDLK_UNKNOWN = 0,
- SDLK_FIRST = 0,
- SDLK_BACKSPACE = 8,
- SDLK_TAB = 9,
- SDLK_CLEAR = 12,
- SDLK_RETURN = 13,
- SDLK_PAUSE = 19,
- SDLK_ESCAPE = 27,
- SDLK_SPACE = 32,
- SDLK_EXCLAIM = 33,
- SDLK_QUOTEDBL = 34,
- SDLK_HASH = 35,
- SDLK_DOLLAR = 36,
- SDLK_AMPERSAND = 38,
- SDLK_QUOTE = 39,
- SDLK_LEFTPAREN = 40,
- SDLK_RIGHTPAREN = 41,
- SDLK_ASTERISK = 42,
- SDLK_PLUS = 43,
- SDLK_COMMA = 44,
- SDLK_MINUS = 45,
- SDLK_PERIOD = 46,
- SDLK_SLASH = 47,
- SDLK_0 = 48,
- SDLK_1 = 49,
- SDLK_2 = 50,
- SDLK_3 = 51,
- SDLK_4 = 52,
- SDLK_5 = 53,
- SDLK_6 = 54,
- SDLK_7 = 55,
- SDLK_8 = 56,
- SDLK_9 = 57,
- SDLK_COLON = 58,
- SDLK_SEMICOLON = 59,
- SDLK_LESS = 60,
- SDLK_EQUALS = 61,
- SDLK_GREATER = 62,
- SDLK_QUESTION = 63,
- SDLK_AT = 64,
- /*
- Skip uppercase letters
- */
- SDLK_LEFTBRACKET = 91,
- SDLK_BACKSLASH = 92,
- SDLK_RIGHTBRACKET = 93,
- SDLK_CARET = 94,
- SDLK_UNDERSCORE = 95,
- SDLK_BACKQUOTE = 96,
- SDLK_a = 97,
- SDLK_b = 98,
- SDLK_c = 99,
- SDLK_d = 100,
- SDLK_e = 101,
- SDLK_f = 102,
- SDLK_g = 103,
- SDLK_h = 104,
- SDLK_i = 105,
- SDLK_j = 106,
- SDLK_k = 107,
- SDLK_l = 108,
- SDLK_m = 109,
- SDLK_n = 110,
- SDLK_o = 111,
- SDLK_p = 112,
- SDLK_q = 113,
- SDLK_r = 114,
- SDLK_s = 115,
- SDLK_t = 116,
- SDLK_u = 117,
- SDLK_v = 118,
- SDLK_w = 119,
- SDLK_x = 120,
- SDLK_y = 121,
- SDLK_z = 122,
- SDLK_DELETE = 127,
- /* End of ASCII mapped keysyms */
-
- /* International keyboard syms */
- SDLK_WORLD_0 = 160, /* 0xA0 */
- SDLK_WORLD_1 = 161,
- SDLK_WORLD_2 = 162,
- SDLK_WORLD_3 = 163,
- SDLK_WORLD_4 = 164,
- SDLK_WORLD_5 = 165,
- SDLK_WORLD_6 = 166,
- SDLK_WORLD_7 = 167,
- SDLK_WORLD_8 = 168,
- SDLK_WORLD_9 = 169,
- SDLK_WORLD_10 = 170,
- SDLK_WORLD_11 = 171,
- SDLK_WORLD_12 = 172,
- SDLK_WORLD_13 = 173,
- SDLK_WORLD_14 = 174,
- SDLK_WORLD_15 = 175,
- SDLK_WORLD_16 = 176,
- SDLK_WORLD_17 = 177,
- SDLK_WORLD_18 = 178,
- SDLK_WORLD_19 = 179,
- SDLK_WORLD_20 = 180,
- SDLK_WORLD_21 = 181,
- SDLK_WORLD_22 = 182,
- SDLK_WORLD_23 = 183,
- SDLK_WORLD_24 = 184,
- SDLK_WORLD_25 = 185,
- SDLK_WORLD_26 = 186,
- SDLK_WORLD_27 = 187,
- SDLK_WORLD_28 = 188,
- SDLK_WORLD_29 = 189,
- SDLK_WORLD_30 = 190,
- SDLK_WORLD_31 = 191,
- SDLK_WORLD_32 = 192,
- SDLK_WORLD_33 = 193,
- SDLK_WORLD_34 = 194,
- SDLK_WORLD_35 = 195,
- SDLK_WORLD_36 = 196,
- SDLK_WORLD_37 = 197,
- SDLK_WORLD_38 = 198,
- SDLK_WORLD_39 = 199,
- SDLK_WORLD_40 = 200,
- SDLK_WORLD_41 = 201,
- SDLK_WORLD_42 = 202,
- SDLK_WORLD_43 = 203,
- SDLK_WORLD_44 = 204,
- SDLK_WORLD_45 = 205,
- SDLK_WORLD_46 = 206,
- SDLK_WORLD_47 = 207,
- SDLK_WORLD_48 = 208,
- SDLK_WORLD_49 = 209,
- SDLK_WORLD_50 = 210,
- SDLK_WORLD_51 = 211,
- SDLK_WORLD_52 = 212,
- SDLK_WORLD_53 = 213,
- SDLK_WORLD_54 = 214,
- SDLK_WORLD_55 = 215,
- SDLK_WORLD_56 = 216,
- SDLK_WORLD_57 = 217,
- SDLK_WORLD_58 = 218,
- SDLK_WORLD_59 = 219,
- SDLK_WORLD_60 = 220,
- SDLK_WORLD_61 = 221,
- SDLK_WORLD_62 = 222,
- SDLK_WORLD_63 = 223,
- SDLK_WORLD_64 = 224,
- SDLK_WORLD_65 = 225,
- SDLK_WORLD_66 = 226,
- SDLK_WORLD_67 = 227,
- SDLK_WORLD_68 = 228,
- SDLK_WORLD_69 = 229,
- SDLK_WORLD_70 = 230,
- SDLK_WORLD_71 = 231,
- SDLK_WORLD_72 = 232,
- SDLK_WORLD_73 = 233,
- SDLK_WORLD_74 = 234,
- SDLK_WORLD_75 = 235,
- SDLK_WORLD_76 = 236,
- SDLK_WORLD_77 = 237,
- SDLK_WORLD_78 = 238,
- SDLK_WORLD_79 = 239,
- SDLK_WORLD_80 = 240,
- SDLK_WORLD_81 = 241,
- SDLK_WORLD_82 = 242,
- SDLK_WORLD_83 = 243,
- SDLK_WORLD_84 = 244,
- SDLK_WORLD_85 = 245,
- SDLK_WORLD_86 = 246,
- SDLK_WORLD_87 = 247,
- SDLK_WORLD_88 = 248,
- SDLK_WORLD_89 = 249,
- SDLK_WORLD_90 = 250,
- SDLK_WORLD_91 = 251,
- SDLK_WORLD_92 = 252,
- SDLK_WORLD_93 = 253,
- SDLK_WORLD_94 = 254,
- SDLK_WORLD_95 = 255, /* 0xFF */
-
- /* Numeric keypad */
- SDLK_KP0 = 256,
- SDLK_KP1 = 257,
- SDLK_KP2 = 258,
- SDLK_KP3 = 259,
- SDLK_KP4 = 260,
- SDLK_KP5 = 261,
- SDLK_KP6 = 262,
- SDLK_KP7 = 263,
- SDLK_KP8 = 264,
- SDLK_KP9 = 265,
- SDLK_KP_PERIOD = 266,
- SDLK_KP_DIVIDE = 267,
- SDLK_KP_MULTIPLY = 268,
- SDLK_KP_MINUS = 269,
- SDLK_KP_PLUS = 270,
- SDLK_KP_ENTER = 271,
- SDLK_KP_EQUALS = 272,
-
- /* Arrows + Home/End pad */
- SDLK_UP = 273,
- SDLK_DOWN = 274,
- SDLK_RIGHT = 275,
- SDLK_LEFT = 276,
- SDLK_INSERT = 277,
- SDLK_HOME = 278,
- SDLK_END = 279,
- SDLK_PAGEUP = 280,
- SDLK_PAGEDOWN = 281,
-
- /* Function keys */
- SDLK_F1 = 282,
- SDLK_F2 = 283,
- SDLK_F3 = 284,
- SDLK_F4 = 285,
- SDLK_F5 = 286,
- SDLK_F6 = 287,
- SDLK_F7 = 288,
- SDLK_F8 = 289,
- SDLK_F9 = 290,
- SDLK_F10 = 291,
- SDLK_F11 = 292,
- SDLK_F12 = 293,
- SDLK_F13 = 294,
- SDLK_F14 = 295,
- SDLK_F15 = 296,
-
- /* Key state modifier keys */
- SDLK_NUMLOCK = 300,
- SDLK_CAPSLOCK = 301,
- SDLK_SCROLLOCK = 302,
- SDLK_RSHIFT = 303,
- SDLK_LSHIFT = 304,
- SDLK_RCTRL = 305,
- SDLK_LCTRL = 306,
- SDLK_RALT = 307,
- SDLK_LALT = 308,
- SDLK_RMETA = 309,
- SDLK_LMETA = 310,
- SDLK_LSUPER = 311, /* Left "Windows" key */
- SDLK_RSUPER = 312, /* Right "Windows" key */
- SDLK_MODE = 313, /* "Alt Gr" key */
- SDLK_COMPOSE = 314, /* Multi-key compose key */
-
- /* Miscellaneous function keys */
- SDLK_HELP = 315,
- SDLK_PRINT = 316,
- SDLK_SYSREQ = 317,
- SDLK_BREAK = 318,
- SDLK_MENU = 319,
- SDLK_POWER = 320, /* Power Macintosh power key */
- SDLK_EURO = 321, /* Some european keyboards */
- SDLK_UNDO = 322, /* Atari keyboard has Undo */
-
- /* Add any other keys here */
-
- SDLK_LAST
-};
-
-#endif
-
-
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/ps2/systemps2.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/ps2/systemps2.cpp 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/ps2/systemps2.cpp 2007-06-23 18:51:33 UTC (rev 27681)
@@ -326,7 +326,7 @@
}
_screen->wantAnim(false);
- _screen->clearScreen();
+ clearScreen();
}
OSystem_PS2::~OSystem_PS2(void) {
@@ -510,11 +510,14 @@
_screen->copyScreenRect((const uint8*)buf, pitch, x, y, w, h);
}
-bool OSystem_PS2::grabRawScreen(Graphics::Surface *surf) {
- _screen->grabScreen(surf);
- return true;
+Graphics::Surface *OSystem_PS2::lockScreen() {
+ return _screen->lockScreen();
}
+void OSystem_PS2::unlockScreen() {
+ _screen->unlockScreen();
+}
+
void OSystem_PS2::updateScreen(void) {
if (_msgClearTime && (_msgClearTime < getMillis())) {
_screen->clearPrintfOverlay();
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/ps2/systemps2.h
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/platform/ps2/systemps2.h 2007-06-23 17:15:36 UTC (rev 27680)
+++ scummvm/branches/gsoc2007-fsnode/backends/platform/ps2/systemps2.h 2007-06-23 18:51:33 UTC (rev 27681)
@@ -56,7 +56,8 @@
virtual void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h);
virtual void setShakePos(int shakeOffset);
virtual void grabPalette(byte *colors, uint start, uint num);
- virtual bool grabRawScreen(Graphics::Surface *surf);
+ virtual Graphics::Surface *lockScreen();
+ virtual void unlockScreen();
virtual void updateScreen();
virtual void showOverlay();
Modified: scummvm/branches/gsoc2007-fsnode/backends/platform/psp/osys_psp.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