[Scummvm-cvs-logs] SF.net SVN: scummvm: [28815] scummvm/branches/gsoc2007-mixer
dogmatixman at users.sourceforge.net
dogmatixman at users.sourceforge.net
Sun Sep 2 11:52:08 CEST 2007
Revision: 28815
http://scummvm.svn.sourceforge.net/scummvm/?rev=28815&view=rev
Author: dogmatixman
Date: 2007-09-02 02:52:06 -0700 (Sun, 02 Sep 2007)
Log Message:
-----------
Merging trunk changes into the branch (revisions 28163:28814)
Modified Paths:
--------------
scummvm/branches/gsoc2007-mixer/NEWS
scummvm/branches/gsoc2007-mixer/README
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/base_event.cpp
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/base_gfx.cpp
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/be_base.h
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/globals.h
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/modules.cpp
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/native/oscalls.cpp
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/native/oscalls.h
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/os5_gfx.cpp
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/os5_overlay.cpp
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/os5_sound.cpp
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/compile.h
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/native_scumm.h
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/zodiac_event.cpp
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/zodiac_gfx.cpp
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/zodiac_overlay.cpp
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/scummvm.mcp
scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/makefile
scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/source/blitters.cpp
scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/source/dsmain.cpp
scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/source/dsoptions.cpp
scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/source/osystem_ds.cpp
scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/source/osystem_ds.h
scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/source/touchkeyboard.cpp
scummvm/branches/gsoc2007-mixer/backends/platform/sdl/events.cpp
scummvm/branches/gsoc2007-mixer/backends/platform/sdl/graphics.cpp
scummvm/branches/gsoc2007-mixer/backends/platform/sdl/module.mk
scummvm/branches/gsoc2007-mixer/backends/platform/sdl/sdl.cpp
scummvm/branches/gsoc2007-mixer/base/main.cpp
scummvm/branches/gsoc2007-mixer/common/advancedDetector.h
scummvm/branches/gsoc2007-mixer/common/list.h
scummvm/branches/gsoc2007-mixer/common/scummsys.h
scummvm/branches/gsoc2007-mixer/common/system.cpp
scummvm/branches/gsoc2007-mixer/common/system.h
scummvm/branches/gsoc2007-mixer/common/util.cpp
scummvm/branches/gsoc2007-mixer/common/util.h
scummvm/branches/gsoc2007-mixer/dists/msvc8/agi.vcproj
scummvm/branches/gsoc2007-mixer/dists/msvc8/drascula.vcproj
scummvm/branches/gsoc2007-mixer/dists/msvc8/gob.vcproj
scummvm/branches/gsoc2007-mixer/dists/msvc8/kyra.vcproj
scummvm/branches/gsoc2007-mixer/dists/msvc8/parallaction.vcproj
scummvm/branches/gsoc2007-mixer/dists/msvc8/scumm.vcproj
scummvm/branches/gsoc2007-mixer/dists/msvc8/scummvm.vcproj
scummvm/branches/gsoc2007-mixer/engines/agi/agi.cpp
scummvm/branches/gsoc2007-mixer/engines/agi/agi.h
scummvm/branches/gsoc2007-mixer/engines/agi/console.h
scummvm/branches/gsoc2007-mixer/engines/agi/detection.cpp
scummvm/branches/gsoc2007-mixer/engines/agi/font.h
scummvm/branches/gsoc2007-mixer/engines/agi/graphics.cpp
scummvm/branches/gsoc2007-mixer/engines/agi/graphics.h
scummvm/branches/gsoc2007-mixer/engines/agi/module.mk
scummvm/branches/gsoc2007-mixer/engines/agi/picture.cpp
scummvm/branches/gsoc2007-mixer/engines/agi/picture.h
scummvm/branches/gsoc2007-mixer/engines/agi/saveload.cpp
scummvm/branches/gsoc2007-mixer/engines/agi/sound.cpp
scummvm/branches/gsoc2007-mixer/engines/agi/sound.h
scummvm/branches/gsoc2007-mixer/engines/agi/text.cpp
scummvm/branches/gsoc2007-mixer/engines/agos/agos.cpp
scummvm/branches/gsoc2007-mixer/engines/agos/agos.h
scummvm/branches/gsoc2007-mixer/engines/agos/charset.cpp
scummvm/branches/gsoc2007-mixer/engines/agos/cursor.cpp
scummvm/branches/gsoc2007-mixer/engines/agos/detection.cpp
scummvm/branches/gsoc2007-mixer/engines/agos/detection_tables.h
scummvm/branches/gsoc2007-mixer/engines/agos/draw.cpp
scummvm/branches/gsoc2007-mixer/engines/agos/input.cpp
scummvm/branches/gsoc2007-mixer/engines/agos/intern.h
scummvm/branches/gsoc2007-mixer/engines/agos/items.cpp
scummvm/branches/gsoc2007-mixer/engines/agos/res_snd.cpp
scummvm/branches/gsoc2007-mixer/engines/agos/saveload.cpp
scummvm/branches/gsoc2007-mixer/engines/agos/zones.cpp
scummvm/branches/gsoc2007-mixer/engines/drascula/drascula.cpp
scummvm/branches/gsoc2007-mixer/engines/drascula/drascula.h
scummvm/branches/gsoc2007-mixer/engines/gob/cdrom.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/cdrom.h
scummvm/branches/gsoc2007-mixer/engines/gob/dataio.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/dataio.h
scummvm/branches/gsoc2007-mixer/engines/gob/detection.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/draw.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/draw.h
scummvm/branches/gsoc2007-mixer/engines/gob/draw_v2.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/driver_vga.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/game.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/game.h
scummvm/branches/gsoc2007-mixer/engines/gob/game_v1.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/game_v2.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/global.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/gob.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/gob.h
scummvm/branches/gsoc2007-mixer/engines/gob/goblin.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/goblin_v2.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/goblin_v3.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/init.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/inter.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/inter.h
scummvm/branches/gsoc2007-mixer/engines/gob/inter_bargon.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/inter_v1.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/inter_v2.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/inter_v3.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/map.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/map.h
scummvm/branches/gsoc2007-mixer/engines/gob/map_v1.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/map_v2.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/module.mk
scummvm/branches/gsoc2007-mixer/engines/gob/mult.h
scummvm/branches/gsoc2007-mixer/engines/gob/mult_v1.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/mult_v2.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/saveload.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/saveload.h
scummvm/branches/gsoc2007-mixer/engines/gob/saveload_v2.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/saveload_v3.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/scenery.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/util.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/video.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/debugger.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/debugger.h
scummvm/branches/gsoc2007-mixer/engines/kyra/detection.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/kyra.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/kyra.h
scummvm/branches/gsoc2007-mixer/engines/kyra/kyra_v1.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/kyra_v1.h
scummvm/branches/gsoc2007-mixer/engines/kyra/kyra_v2.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/kyra_v2.h
scummvm/branches/gsoc2007-mixer/engines/kyra/kyra_v3.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/kyra_v3.h
scummvm/branches/gsoc2007-mixer/engines/kyra/module.mk
scummvm/branches/gsoc2007-mixer/engines/kyra/resource.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/resource.h
scummvm/branches/gsoc2007-mixer/engines/kyra/screen.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/screen.h
scummvm/branches/gsoc2007-mixer/engines/kyra/script.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/script.h
scummvm/branches/gsoc2007-mixer/engines/kyra/script_v1.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/seqplayer.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/seqplayer.h
scummvm/branches/gsoc2007-mixer/engines/kyra/sequences_v1.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/sequences_v2.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/sound.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/sprites.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/sprites.h
scummvm/branches/gsoc2007-mixer/engines/kyra/staticres.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/text.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/wsamovie.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/wsamovie.h
scummvm/branches/gsoc2007-mixer/engines/lure/animseq.cpp
scummvm/branches/gsoc2007-mixer/engines/lure/disk.cpp
scummvm/branches/gsoc2007-mixer/engines/lure/fights.cpp
scummvm/branches/gsoc2007-mixer/engines/lure/game.cpp
scummvm/branches/gsoc2007-mixer/engines/lure/game.h
scummvm/branches/gsoc2007-mixer/engines/lure/hotspots.cpp
scummvm/branches/gsoc2007-mixer/engines/lure/hotspots.h
scummvm/branches/gsoc2007-mixer/engines/lure/lure.h
scummvm/branches/gsoc2007-mixer/engines/lure/luredefs.h
scummvm/branches/gsoc2007-mixer/engines/lure/res.cpp
scummvm/branches/gsoc2007-mixer/engines/lure/res.h
scummvm/branches/gsoc2007-mixer/engines/lure/res_struct.cpp
scummvm/branches/gsoc2007-mixer/engines/lure/res_struct.h
scummvm/branches/gsoc2007-mixer/engines/lure/room.cpp
scummvm/branches/gsoc2007-mixer/engines/lure/screen.cpp
scummvm/branches/gsoc2007-mixer/engines/lure/screen.h
scummvm/branches/gsoc2007-mixer/engines/lure/scripts.cpp
scummvm/branches/gsoc2007-mixer/engines/lure/scripts.h
scummvm/branches/gsoc2007-mixer/engines/lure/sound.cpp
scummvm/branches/gsoc2007-mixer/engines/lure/sound.h
scummvm/branches/gsoc2007-mixer/engines/lure/surface.cpp
scummvm/branches/gsoc2007-mixer/engines/lure/surface.h
scummvm/branches/gsoc2007-mixer/engines/parallaction/debug.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/detection.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/dialogue.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/disk.h
scummvm/branches/gsoc2007-mixer/engines/parallaction/font.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/graphics.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/graphics.h
scummvm/branches/gsoc2007-mixer/engines/parallaction/inventory.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/inventory.h
scummvm/branches/gsoc2007-mixer/engines/parallaction/menu.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/module.mk
scummvm/branches/gsoc2007-mixer/engines/parallaction/parallaction.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/parallaction.h
scummvm/branches/gsoc2007-mixer/engines/parallaction/parser.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/parser.h
scummvm/branches/gsoc2007-mixer/engines/parallaction/saveload.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/sound.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/sound.h
scummvm/branches/gsoc2007-mixer/engines/parallaction/staticres.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/walk.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/walk.h
scummvm/branches/gsoc2007-mixer/engines/queen/display.cpp
scummvm/branches/gsoc2007-mixer/engines/queen/display.h
scummvm/branches/gsoc2007-mixer/engines/queen/graphics.cpp
scummvm/branches/gsoc2007-mixer/engines/queen/graphics.h
scummvm/branches/gsoc2007-mixer/engines/queen/musicdata.cpp
scummvm/branches/gsoc2007-mixer/engines/queen/resource.cpp
scummvm/branches/gsoc2007-mixer/engines/queen/resource.h
scummvm/branches/gsoc2007-mixer/engines/queen/restables.cpp
scummvm/branches/gsoc2007-mixer/engines/queen/sound.cpp
scummvm/branches/gsoc2007-mixer/engines/queen/sound.h
scummvm/branches/gsoc2007-mixer/engines/queen/talk.cpp
scummvm/branches/gsoc2007-mixer/engines/queen/talk.h
scummvm/branches/gsoc2007-mixer/engines/saga/actor.cpp
scummvm/branches/gsoc2007-mixer/engines/saga/actor.h
scummvm/branches/gsoc2007-mixer/engines/saga/animation.cpp
scummvm/branches/gsoc2007-mixer/engines/saga/animation.h
scummvm/branches/gsoc2007-mixer/engines/saga/detection.cpp
scummvm/branches/gsoc2007-mixer/engines/saga/detection_tables.h
scummvm/branches/gsoc2007-mixer/engines/saga/displayinfo.h
scummvm/branches/gsoc2007-mixer/engines/saga/events.cpp
scummvm/branches/gsoc2007-mixer/engines/saga/events.h
scummvm/branches/gsoc2007-mixer/engines/saga/font.cpp
scummvm/branches/gsoc2007-mixer/engines/saga/gfx.cpp
scummvm/branches/gsoc2007-mixer/engines/saga/gfx.h
scummvm/branches/gsoc2007-mixer/engines/saga/ihnm_introproc.cpp
scummvm/branches/gsoc2007-mixer/engines/saga/image.cpp
scummvm/branches/gsoc2007-mixer/engines/saga/interface.cpp
scummvm/branches/gsoc2007-mixer/engines/saga/interface.h
scummvm/branches/gsoc2007-mixer/engines/saga/isomap.cpp
scummvm/branches/gsoc2007-mixer/engines/saga/ite_introproc.cpp
scummvm/branches/gsoc2007-mixer/engines/saga/itedata.h
scummvm/branches/gsoc2007-mixer/engines/saga/list.h
scummvm/branches/gsoc2007-mixer/engines/saga/music.cpp
scummvm/branches/gsoc2007-mixer/engines/saga/music.h
scummvm/branches/gsoc2007-mixer/engines/saga/objectmap.cpp
scummvm/branches/gsoc2007-mixer/engines/saga/puzzle.h
scummvm/branches/gsoc2007-mixer/engines/saga/render.cpp
scummvm/branches/gsoc2007-mixer/engines/saga/rscfile.cpp
scummvm/branches/gsoc2007-mixer/engines/saga/rscfile.h
scummvm/branches/gsoc2007-mixer/engines/saga/saga.cpp
scummvm/branches/gsoc2007-mixer/engines/saga/saga.h
scummvm/branches/gsoc2007-mixer/engines/saga/sagaresnames.h
scummvm/branches/gsoc2007-mixer/engines/saga/saveload.cpp
scummvm/branches/gsoc2007-mixer/engines/saga/scene.cpp
scummvm/branches/gsoc2007-mixer/engines/saga/scene.h
scummvm/branches/gsoc2007-mixer/engines/saga/script.cpp
scummvm/branches/gsoc2007-mixer/engines/saga/script.h
scummvm/branches/gsoc2007-mixer/engines/saga/sfuncs.cpp
scummvm/branches/gsoc2007-mixer/engines/saga/sndres.cpp
scummvm/branches/gsoc2007-mixer/engines/saga/sprite.cpp
scummvm/branches/gsoc2007-mixer/engines/scumm/akos.cpp
scummvm/branches/gsoc2007-mixer/engines/scumm/base-costume.h
scummvm/branches/gsoc2007-mixer/engines/scumm/charset.cpp
scummvm/branches/gsoc2007-mixer/engines/scumm/costume.cpp
scummvm/branches/gsoc2007-mixer/engines/scumm/detection.cpp
scummvm/branches/gsoc2007-mixer/engines/scumm/detection_tables.h
scummvm/branches/gsoc2007-mixer/engines/scumm/dialogs.cpp
scummvm/branches/gsoc2007-mixer/engines/scumm/file.cpp
scummvm/branches/gsoc2007-mixer/engines/scumm/file.h
scummvm/branches/gsoc2007-mixer/engines/scumm/gfx.cpp
scummvm/branches/gsoc2007-mixer/engines/scumm/imuse_digi/dimuse.h
scummvm/branches/gsoc2007-mixer/engines/scumm/imuse_digi/dimuse_codecs.cpp
scummvm/branches/gsoc2007-mixer/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
scummvm/branches/gsoc2007-mixer/engines/scumm/imuse_digi/dimuse_tables.cpp
scummvm/branches/gsoc2007-mixer/engines/scumm/module.mk
scummvm/branches/gsoc2007-mixer/engines/scumm/player_v2.cpp
scummvm/branches/gsoc2007-mixer/engines/scumm/player_v2a.cpp
scummvm/branches/gsoc2007-mixer/engines/scumm/scumm-md5.h
scummvm/branches/gsoc2007-mixer/engines/scumm/scumm.cpp
scummvm/branches/gsoc2007-mixer/engines/scumm/smush/codec47.cpp
scummvm/branches/gsoc2007-mixer/engines/scumm/sound.cpp
scummvm/branches/gsoc2007-mixer/engines/scumm/string.cpp
scummvm/branches/gsoc2007-mixer/engines/scumm/thumbnail.cpp
scummvm/branches/gsoc2007-mixer/engines/sky/hufftext.cpp
scummvm/branches/gsoc2007-mixer/engines/sky/text.h
scummvm/branches/gsoc2007-mixer/engines/sword1/sound.h
scummvm/branches/gsoc2007-mixer/engines/sword1/staticres.cpp
scummvm/branches/gsoc2007-mixer/engines/touche/graphics.cpp
scummvm/branches/gsoc2007-mixer/engines/touche/midi.cpp
scummvm/branches/gsoc2007-mixer/engines/touche/midi.h
scummvm/branches/gsoc2007-mixer/engines/touche/opcodes.cpp
scummvm/branches/gsoc2007-mixer/engines/touche/resource.cpp
scummvm/branches/gsoc2007-mixer/engines/touche/saveload.cpp
scummvm/branches/gsoc2007-mixer/engines/touche/staticres.cpp
scummvm/branches/gsoc2007-mixer/engines/touche/touche.cpp
scummvm/branches/gsoc2007-mixer/engines/touche/touche.h
scummvm/branches/gsoc2007-mixer/graphics/colormasks.h
scummvm/branches/gsoc2007-mixer/graphics/dxa_player.cpp
scummvm/branches/gsoc2007-mixer/graphics/fonts/scummfont.cpp
scummvm/branches/gsoc2007-mixer/graphics/scaler/thumbnail.cpp
scummvm/branches/gsoc2007-mixer/sound/fmopl.cpp
scummvm/branches/gsoc2007-mixer/sound/mods/module.cpp
scummvm/branches/gsoc2007-mixer/sound/mods/module.h
scummvm/branches/gsoc2007-mixer/sound/mods/protracker.cpp
scummvm/branches/gsoc2007-mixer/sound/mods/protracker.h
scummvm/branches/gsoc2007-mixer/sound/softsynth/adlib.cpp
scummvm/branches/gsoc2007-mixer/tools/create_kyradat/create_kyradat.cpp
scummvm/branches/gsoc2007-mixer/tools/create_lure/create_lure_dat.cpp
scummvm/branches/gsoc2007-mixer/tools/create_lure/create_lure_dat.h
scummvm/branches/gsoc2007-mixer/tools/scumm-md5.txt
Added Paths:
-----------
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/native_drascula.h
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/arm.bat
scummvm/branches/gsoc2007-mixer/backends/platform/sdl/main.cpp
scummvm/branches/gsoc2007-mixer/backends/platform/sdl/sdl.h
scummvm/branches/gsoc2007-mixer/engines/agi/loader_preagi.cpp
scummvm/branches/gsoc2007-mixer/engines/agi/loader_v2.cpp
scummvm/branches/gsoc2007-mixer/engines/agi/loader_v3.cpp
scummvm/branches/gsoc2007-mixer/engines/agi/preagi.cpp
scummvm/branches/gsoc2007-mixer/engines/agi/preagi_input.cpp
scummvm/branches/gsoc2007-mixer/engines/agi/preagi_mickey.cpp
scummvm/branches/gsoc2007-mixer/engines/agi/preagi_mickey.h
scummvm/branches/gsoc2007-mixer/engines/drascula/texts.h
scummvm/branches/gsoc2007-mixer/engines/gob/coktelvideo.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/coktelvideo.h
scummvm/branches/gsoc2007-mixer/engines/gob/inter_v4.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/map_v4.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/videoplayer.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/videoplayer.h
scummvm/branches/gsoc2007-mixer/engines/kyra/animator_v1.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/animator_v1.h
scummvm/branches/gsoc2007-mixer/engines/kyra/animator_v2.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/gui_v1.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/gui_v2.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/items_v1.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/items_v2.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/saveload_v1.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/scene.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/scene_v1.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/scene_v2.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/screen_v1.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/screen_v1.h
scummvm/branches/gsoc2007-mixer/engines/kyra/screen_v2.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/screen_v2.h
scummvm/branches/gsoc2007-mixer/engines/kyra/script_v2.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/sound_v1.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/text_v1.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/timer.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/timer.h
scummvm/branches/gsoc2007-mixer/engines/kyra/timer_v1.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/timer_v2.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/util.h
scummvm/branches/gsoc2007-mixer/engines/parallaction/callables_br.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/callables_ns.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/disk_br.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/disk_ns.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/exec_br.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/exec_ns.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/objects.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/objects.h
scummvm/branches/gsoc2007-mixer/engines/parallaction/parallaction_br.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/parallaction_ns.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/parser_br.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/parser_ns.cpp
scummvm/branches/gsoc2007-mixer/engines/scumm/file_nes.cpp
scummvm/branches/gsoc2007-mixer/engines/scumm/file_nes.h
Removed Paths:
-------------
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Rsc/Resource.Frk/builder.rsrc
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Rsc/builder.rsrc
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/builder/
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/palm-scumm-md5.h
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_agi.h
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_agos.h
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_cine.h
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_gob.h
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_kyra.h
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_lure.h
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_queen.h
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_saga.h
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_scumm.h
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_sky.h
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_sword1.h
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_sword2.h
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/scumm_globals.cpp
scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/scumm_globals.h
scummvm/branches/gsoc2007-mixer/backends/platform/morphos/
scummvm/branches/gsoc2007-mixer/backends/platform/sdl/sdl-common.h
scummvm/branches/gsoc2007-mixer/engines/agi/agi_v2.cpp
scummvm/branches/gsoc2007-mixer/engines/agi/agi_v3.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/imd.cpp
scummvm/branches/gsoc2007-mixer/engines/gob/imd.h
scummvm/branches/gsoc2007-mixer/engines/kyra/animator.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/animator.h
scummvm/branches/gsoc2007-mixer/engines/kyra/gui.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/items.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/saveload.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/scene.cpp
scummvm/branches/gsoc2007-mixer/engines/kyra/timer.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/animation.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/archive.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/callables.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/commands.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/commands.h
scummvm/branches/gsoc2007-mixer/engines/parallaction/disk.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/intro.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/location.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/zone.cpp
scummvm/branches/gsoc2007-mixer/engines/parallaction/zone.h
Modified: scummvm/branches/gsoc2007-mixer/NEWS
===================================================================
--- scummvm/branches/gsoc2007-mixer/NEWS 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/NEWS 2007-09-02 09:52:06 UTC (rev 28815)
@@ -18,6 +18,7 @@
SCUMM:
- Added subtitle skipping (via '.' key) in older games which didn't have
this feature so far (e.g. Zak, MM, Indy3, Loom).
+ - Added support for Chinese COMI
SAGA:
- Added support for compressed sound effects, voices and music
Modified: scummvm/branches/gsoc2007-mixer/README
===================================================================
--- scummvm/branches/gsoc2007-mixer/README 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/README 2007-09-02 09:52:06 UTC (rev 28815)
@@ -170,7 +170,7 @@
- Swampy Adventures [swampy]
The Feeble Files [feeble]
-GOB Games by Cocktel Vision:
+GOB Games by Coktel Vision:
Bargon Attack [bargon]
Gobliiins [gob1]
Gobliins 2 [gob2]
@@ -296,7 +296,7 @@
should be able to automatically detect the game if you point it at the
right directory.
-Alternatively, you can use extract_mm_c64 from the tools package to
+Alternatively, you can use 'extract_mm_c64' from the tools package to
extract the data files. But then the game will not be properly
autodetected by ScummVM, and you must make sure that the platform is
set to Commodore64. We recommend using the much simpler approach
@@ -346,7 +346,7 @@
simply point ScummVM at the directory containing it, and it should work (just like
with every other supported game).
-We also provide a tool called 'rescumm' in the tools package to extract the
+We also provide a tool called 'extract_scumm_mac' in the tools package to extract the
data from these data files, but this is neither required nor recommended.
For further information on copying Macintosh game files to your hard disk see:
@@ -400,12 +400,12 @@
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.
+FLAC and zlib support.
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.
+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
@@ -790,10 +790,10 @@
Steel Sky and Flight of the Amazon Queen
--copy-protection Enable copy protection in games, when
ScummVM disables it by default.
+ --talkspeed=NUM Set talk speed for games (default: 60)
--demo-mode Start demo mode of Maniac Mansion (Classic version)
--tempo=NUM Set music tempo (in percent, 50-200) for SCUMM games
(default: 100)
- --talkspeed=NUM Set talk speed for games
The meaning of most long options (that is, those options starting with a
@@ -832,6 +832,10 @@
but rather is only used to select the appropriate font (e.g. for a German
version of a game, one containing umlauts).
+An exception are The Dig and The Curse of Monkey Island - non-English versions
+can be set to 'English.' This however only affects subtitles; game speech will
+remain the same.
+
Maniac Mansion and Zak McKracken
en - English (default)
de - German
@@ -933,7 +937,7 @@
---- ---------
TODO
TODO: Rework this section to clearly state which hotkeys are implemented in *all*
-TODO game (and for which backends).
+TODO games (and for which backends).
TODO: It would also be nice to add information about control on devices w/o a keyboard;
TODO I.e. document how input on DC, DS, PSP, PS2, PalmOS, WinCE, ... works for each game
TODO Or at the very least give points as to were one can read up on these.
@@ -1068,7 +1072,6 @@
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
@@ -1078,7 +1081,7 @@
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
+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.
Note for WinCE users: Due to the limited keyboard input in most devices, a
@@ -1190,7 +1193,7 @@
---- ----------------------------------
Some games (such as Sam & Max) only contain MIDI music data. This once
prevented music for these games from working on platforms that do not support
-MIDI, or soundcards that do not provide MIDI drivers (e.g, many soundcards will
+MIDI, or soundcards that do not provide MIDI drivers (e.g. many soundcards will
not play MIDI under Linux). ScummVM can now emulate MIDI mode using sampled
waves and Adlib, FluidSynth MIDI emulation or MT-32 emulation using the
-eadlib, -efluidsynth or -emt32 options respectively. However, if you are
@@ -1340,7 +1343,7 @@
7.7.3) Compressing MONSTER.SOU with MP3:
------ ---------------------------------
-You need LAME, and our compress_scumm_sou utility from the scummvm-tools
+You need LAME, and our 'compress_scumm_sou' utility from the scummvm-tools
package to perform this task, and ScummVM must be compiled with MAD support.
compress_scumm_sou monster.sou
@@ -1364,7 +1367,7 @@
------ ----------------------------------------
As above, but ScummVM must be compiled with Flac support. Run:
- compress_scumm_sou --flac --best -b 1152 monster.sou
+ compress_scumm_sou --flac monster.sou
This should produce a smaller monster.sof file, which you should copy to your
game directory. Remember that the quality is always the same, varying encoder
@@ -1376,7 +1379,7 @@
7.7.6) Compressing music/sfx/speech in AGOS games
------ -----------------------------------------------------------------
-Use our compress_agos utility from the scummvm-tools package to perform this
+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
only use each if ScummVM was compiled with the respective decoder support
enabled.
@@ -1403,7 +1406,7 @@
For Flac add --flac and optional parameters, i.e.
- compress_agos --flac --best -b 1152
+ compress_agos --flac
Eventually you will have a much smaller *.mp3, *.ogg or *.fla file, copy this
file to your game directory. You can safely remove the old file.
@@ -1411,7 +1414,7 @@
7.7.7) Compressing speech/music in Broken Sword 1
------ ------------------------------------------
-The compress_sword1 tool from the scummvm-tools package can encode music and
+The 'compress_sword1' tool from the scummvm-tools package can encode music and
speech to MP3 as well as Ogg Vorbis.
The easiest way to encode the files is simply copying the executable into your
BS1 directory (together with the lame encoder) and run it from there.
@@ -1430,7 +1433,7 @@
7.7.8) Compressing speech/music in Broken Sword 2
------ ------------------------------------------
-Use our compress_sword2 utility from the scummvm-tools package to perform this
+Use our 'compress_sword2' utility from the scummvm-tools package to perform this
task. You can choose between multiple target formats, but note that you can
only use each if ScummVM was compiled with the respective decoder support
enabled.
Deleted: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Rsc/Resource.Frk/builder.rsrc
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Rsc/Resource.Frk/builder.rsrc 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Rsc/Resource.Frk/builder.rsrc 2007-09-02 09:52:06 UTC (rev 28815)
@@ -1,59 +0,0 @@
- @| ?| |N\x80 N\x80 N\x80 |\xA6\x93\xE1\xFF\xFC\x93\xC1\xFF\xF8\x90 \x94!\xFF\xB0 Starter.rsrc/5/98 (print)syST!t PLobMWCP p \xAF\xA7pV \xDF\xF3x\xE4\xFBx\x81\x83 8\xA0 8\xC0 \x81\x8ClHm\xC1\x80A \xC3\xF3x\xE4\xFBx\x81\x83 \x81\x8CpHm\xA9\x80A \x80 X8! P|\xA6\x83\xE1\xFF\xFC\x83\xC1\xFF\xF8N\x80 |\xA6\x93\xE1\xFF\xFC\x93\xC1\xFF\xF8\x93\xA1\xFF\xF4\x90 \x94!\xFF\xB0|}x|\x9E#x\xA3\xEBx\x80\x9E \x81\x83 \x81\x8C`HmY \xE8 -\xE8 \xFF\xFF\xFF\xFFOptionsAbout Starter App Starter & \xA0 \xA0\xFF \xE8 \xE8 \xE8tTTL Builder pp 1.0 b System Incompatible System Version 2.0 or greater is required to run this application. OK About Starter > \x9C \x9C\xFF\xFF\xFF L LtTTLNtLBLOtLBLPtLBLQtBTN N = \xFFStarter [O 6\xFF Use this application as a
-starting point for your own
-exciting Palm applications! P 2 h\xFFVersion 1.0 Q : \x85 ( \xFF\xFF\xFF\xFF OK \xE2\xE2 \xFF \xFF\xFE G\xFB\xCD G\xFB\xCD \xA1\xF2 8BIM Gr\x89ph\x81\x81\xAF
- \x9A \xFF\x80x G\xFB\xCD G\xFB\xCD @\xF8\xFF\xFB\xAA\xF7\xFF\xFF \xF5\xFF\xFB\xAA\xF7\xFF\xFF \xF5\xFF\xFB\xAA\xF7\xFF\xFF \xFE\xFF#\xFA\xFF\xF7\xAA\xFA\xFF \xFF\xAA \xF8\xFF\xF7\xAA\xFA\xFF \xFF\xAA \xF8\xFF\xF7\xAA\xFA\xFF \xFF\xAA \xFF\xFF&\xFB\xFF\xF5\xAA\xFC\xFF \xFF\xAA \xF9\xFF\xF5\xAA\xFC\xFF \xFF\xAA \xF9\xFF\xF5\xAA\xFC\xFF \xFF\xAA \xFF\xFF&\xFC\xFF\xF3\xAA\xFE\xFF \xFF\xAAU \xF9\xFF\xF3\xAA\xFE\xFF \xFF\xAAU \xF9\xFF\xF3\xAA\xFE\xFF \xFF\xAAU \xFE\xFF#\xFD\xFF\xF1\xAA\xFF \xFF\xAAU \xF9\xFF\xF1\xAA\xFF \xFF\xAAU \xF9\xFF\xF1\xAA\xFF \xFF\xAAU \xFD\xFF \xFD\xFF\xF1\xAA \xFF\xAAU \xF8\xFF\xF1\xAA \xFF\xAAU \xF8\xFF\xF1\xAA \xFF\xAAU \xFC\xFF \xFE\xFF\xF1\xAA \xFF\xAAU \xF8\xFF\xF1\xAA \xFF\xAAU \xF8\xFF\xF1\xAA \xFF\xAAU \xFB\xFF \xFE\xFF\xF2\xAA \xFF\xAAU \xF7\xFF\xF2\xAA \xFF\xAAU \xF7\xFF\xF2\xAA \xFF\xAAU \xFA\xFF \xFE\xFF\xF3\xAA \xFF\xAAU \xF6\xFF\xF3\xAA \xFF\xAAU \xF6\xFF\xF3\xAA \xFF\xAAU \xF9\xFF \xFE\xFF\xF4\xAA \xFF\xAAU \xF5\xFF\xF4\xAA \xFF\xAAU \xF5\xFF\xF4\xAA \xFF\xAAU \xF8\xFF#\xFE\xFF\xF5\xAA \xFF\xAAU \xAA\xF5\xFF\xF5\xAA \xFF\xAAU \xAA\xF5\xFF\xF5\xAA \xFF\xAAU \xAA\xF8\xFF&\xFE\xFF\xF6\xAA \xFF\xAAU \xAA\xAA\xF5\xFF\xF6\xAA \xFF\xAAU \xAA\xAA\xF5\xFF\xF6\xAA \xFF\xAAU \xAA\xAA\xF8\xFF&\xFD\xFF\xF8\xAA \xFF\xAAU \xAA\xAA\xF3\xFF\xF8\xAA \xFF\xAAU \xAA\xAA\xF3\xFF\xF8\xAA \xFF\xAAU \xAA\xAA\xF7\xFF#\xFD\xFF\xF8\xAA \xFFU \xFE\xAA\xF3\xFF\xF8\xAA \xFFU \xFE\xAA\xF3\xFF\xF8\xAA \xFFU \xFE\xAA\xF7\xFF#\xFC\xFF\xFA\xAA \xFF \xFE\xAA\xF1\xFF\xFA\xAA \xFF \xFE\xAA\xF1\xFF\xFA\xAA \xFF \xFE\xAA\xF6\xFF\xFB\xFF\xFB\xAA\xFF \xFD\xAA\xEF\xFF\xFB\xAA\xFF \xFD\xAA\xEF\xFF\xFB\xAA\xFF \xFD\xAA\xF5\xFF\xFA\xFF\xF7\xAA\xED\xFF\xF7\xAA\xED\xFF\xF7\xAA\xF4\xFF\xF8\xFF\xFB\xAA\xE9\xFF\xFB\xAA\xE9\xFF\xFB\xAA\xF2\xFF \xFF \x80\x80 \xFF \xFF\xFE G\xFB\xCD G\xFB\xCD \xA1\xF2 8BIM Gr\x89ph\x81\x81\xAF
- \x9A \xFF\x80d G\xFB\xCD G\xFB\xCD @\xE8 \xE8\xFF\xE8 \xF8 \xFAf\xF8 \xF8\xFF\xFA\x99\xFF\xFF\xFE \xFD\xFF\xF8 \xFA\xCC\xF8 \xFA \xF6f \x88\xFC \xFA\xFF\xF6\x99 \x88 \xFD\xFF\xFA \xF6\xCC \x88\xFC \xFB \xF6f \xDDU\xFC \xFB\xFF\xF6\x99 \xDDU \xFD\xFF\xFB \xF6\xCC \xDDU\xFC \xFC \xF5f \x88\xFB \xFC\xFF\xF5\x99 \x88 \xFC\xFF\xFC \xF5\xCC \x88\xFB $\xFD \xF5f \xDDU 3\xFD \xFD\xFF\xF5\x99 \xDDU f\xFD\xFF\xFD \xF5\xCC \xDDU \x99\xFD '\xFE \xF4f \x88 33f\xFE \xFE\xFF\xF4\x99 \x88 ff\x99\xFE\xFF\xFE \xF4\xCC \x88 \x99\x99\xCC\xFE *\xFE \xF5f \xDDU 3ff\xFE \xFE\xFF\xF5\x99 \xDDU f\x99\x99\xFE\xFF\xFE \xF5\xCC \xDDU \x99\xCC\xCC\xFE *\xFF \xF4f \x88 33\xFEf\xFF \xFF\xFF\xF4\x99 \x88 ff\xFE\x99\xFF\xFF\xFF \xF4\xCC \x88 \x99\x99\xFE\xCC\xFF *\xFF \xF5f \xDDU 3\xFDf\xFF \xFF\xFF\xF5\x99 \xDDU f\xFD\x99\xFF\xFF\xFF \xF5\xCC \xDDU \x99\xFD\xCC\xFF *\xFF \xF5f \x88 33\xFDf\xFF \xFF\xFF\xF5\x99 \x88 ff\xFD\x99\xFF\xFF\xFF \xF5\xCC \x88 \x99\x99\xFD\xCC\xFF *\xFF \xF6f \xDDU 3\xFCf\xFF \xFF\xFF\xF6\x99 \xDDU f\xFC\x99\xFF\xFF\xFF \xF6\xCC \xDDU \x99\xFC\xCC\xFF *\xFF \xF6f \x88 33\xFCf\xFF \xFF\xFF\xF6\x99 \x88 ff\xFC\x99\xFF\xFF\xFF \xF6\xCC \x88 \x99\x99\xFC\xCC\xFF *\xFF \xF7f \xDDU 3\xFBf\xFF \xFF\xFF\xF7\x99 \xDDU f\xFB\x99\xFF\xFF\xFF \xF7\xCC \xDDU \x99\xFB\xCC\xFF *\xFF \xF7f \x88 33\xFBf\xFF \xFF\xFF\xF7\x99 \x88 ff\xFB\x99\xFF\xFF\xFF \xF7\xCC \x88 \x99\x99\xFB\xCC\xFF '\xFE \xF8f U 3\xFBf\xFE \xFE\xFF\xF8\x99 U f\xFB\x99\xFE\xFF\xFE \xF8\xCC U \x99\xFB\xCC\xFE $\xFE \xF8f\xFF \xFF3\xFBf\xFE \xFE\xFF\xF8\x99\xFF \xFFf\xFB\x99\xFE\xFF\xFE \xF8\xCC\xFF \xFF\x99\xFB\xCC\xFE $\xFD \xF9f 33\xFBf\xFD \xFD\xFF\xF9\x99 ff\xFB\x99\xFD\xFF\xFD \xF9\xCC \x99\x99\xFB\xCC\xFD \xFC \xFAf\xFF3\xFBf\xFC \xFC\xFF\xFA\x99\xFFf\xFB\x99\xFC\xFF\xFC \xFA\xCC\xFF\x99\xFB\xCC\xFC \xFB \xF4f\xFB \xFB\xFF\xF4\x99\xFB\xFF\xFB \xF4\xCC\xFB \xFA \xF6f\xFA \xFA\xFF\xF6\x99\xFA\xFF\xFA \xF6\xCC\xFA \xF8 \xFAf\xF8 \xF8\xFF\xFA\x99\xF8\xFF\xF8 \xFA\xCC\xF8 \xFF 66 \xFF \xFF\xFE G\xFB\xCD G\xFB\xCD \xA1\xF2 8BIM Gr\x89ph\x81\x81\xAF
- \x9A \xFF\x80d G\xFB\xCD G\xFB\xCD @\xB6\xFF\xF8\xFF\xFA \xFF\xFF\xFE \xF4\xFF\xFA \xFF\xFF\xFE \xF4\xFF\xFA \xFF\xFF\xFE \xFD\xFF\xFA\xFF\xF7 \xFF\xFE \xF6\xFF\xF7 \xFF\xFE \xF6\xFF\xF7 \xFF\xFE \xFD\xFF\xFB\xFF\xF7 \xFF\xFD \xF7\xFF\xF7 \xFF\xFD \xF7\xFF\xF7 \xFF\xFD \xFD\xFF\xFC\xFF\xF6 \xFF\xFE \xF7\xFF\xF6 \xFF\xFE \xF7\xFF\xF6 \xFF\xFE \xFC\xFF\xFD\xFF\xF6 \xFF\xFD \xF8\xFF\xF6 \xFF\xFD \xF8\xFF\xF6 \xFF\xFD \xFC\xFF&\xFE\xFF\xF5 \xFF\xFE \xFF \xFB\xFF\xF5 \xFF\xFE \xFF \xFB\xFF\xF5 \xFF\xFE \xFF \xFE\xFF&\xFE\xFF\xF6 \xFF\xFD \xFF \xFB\xFF\xF6 \xFF\xFD \xFF \xFB\xFF\xF6 \xFF\xFD \xFF \xFE\xFF&\xFF\xFF\xF5 \xFF\xFE \xFF\xFD \xFD\xFF\xF5 \xFF\xFE \xFF\xFD \xFD\xFF\xF5 \xFF\xFE \xFF\xFD \xFF\xFF&\xFF\xFF\xF6 \xFF\xFD \xFF\xFD \xFD\xFF\xF6 \xFF\xFD \xFF\xFD \xFD\xFF\xF6 \xFF\xFD \xFF\xFD \xFF\xFF&\xFF\xFF\xF6 \xFF\xFE \xFF\xFC \xFD\xFF\xF6 \xFF\xFE \xFF\xFC \xFD\xFF\xF6 \xFF\xFE \xFF\xFC \xFF\xFF&\xFF\xFF\xF7 \xFF\xFD \xFF\xFC \xFD\xFF\xF7 \xFF\xFD \xFF\xFC \xFD\xFF\xF7 \xFF\xFD \xFF\xFC \xFF\xFF&\xFF\xFF\xF7 \xFF\xFE \xFF\xFB \xFD\xFF\xF7 \xFF\xFE \xFF\xFB \xFD\xFF\xF7 \xFF\xFE \xFF\xFB \xFF\xFF&\xFF\xFF\xF8 \xFF\xFD \xFF\xFB \xFD\xFF\xF8 \xFF\xFD \xFF\xFB \xFD\xFF\xF8 \xFF\xFD \xFF\xFB \xFF\xFF&\xFF\xFF\xF8 \xFF\xFE \xFF\xFA \xFD\xFF\xF8 \xFF\xFE \xFF\xFA \xFD\xFF\xF8 \xFF\xFE \xFF\xFA \xFF\xFF&\xFE\xFF\xF9 \xFF\xFE \xFF\xFB \xFB\xFF\xF9 \xFF\xFE \xFF\xFB \xFB\xFF\xF9 \xFF\xFE \xFF\xFB \xFE\xFF#\xFE\xFF\xF9 \xFF \xFF\xFA \xFB\xFF\xF9 \xFF \xFF\xFA \xFB\xFF\xF9 \xFF \xFF\xFA \xFE\xFF \xFD\xFF\xFA \xFF \xFF\xFA \xF9\xFF\xFA \xFF \xFF\xFA \xF9\xFF\xFA \xFF \xFF\xFA \xFD\xFF\xFC\xFF\xFB \xFF\xFF\xFA \xF7\xFF\xFB \xFF\xFF\xFA \xF7\xFF\xFB \xFF\xFF\xFA \xFC\xFF\xFB\xFF\xF4 \xF5\xFF\xF4 \xF5\xFF\xF4 \xFB\xFF\xFA\xFF\xF6 \xF3\xFF\xF6 \xF3\xFF\xF6 \xFA\xFF\xF8\xFF\xFA \xEF\xFF\xFA \xEF\xFF\xFA \xF8\xFF \xFF 66 \xFF \xFF\xFE G\xFB\xCD G\xFB\xCD \xA1\xF2 8BIM Gr\x89ph\x81\x81\xAF
- \x9A \xFF\x80d G\xFB\xCD G\xFB\xCD @\xB6\xFF\xF8\xFF\xFA\xAA\xFF\xFF\xFE \xF4\xFF\xFA\xAA\xFF\xFF\xFE \xF4\xFF\xFA\xAA\xFF\xFF\xFE \xFD\xFF\xFA\xFF\xF6\xAA \xAA \xF6\xFF\xF6\xAA \xAA \xF6\xFF\xF6\xAA \xAA \xFD\xFF \xFB\xFF\xF6\xAA \xFFU \xF7\xFF\xF6\xAA \xFFU \xF7\xFF\xF6\xAA \xFFU \xFD\xFF\xFC\xFF\xF5\xAA \xAA \xF7\xFF\xF5\xAA \xAA \xF7\xFF\xF5\xAA \xAA \xFC\xFF \xFD\xFF\xF5\xAA \xFFU U\xF9\xFF\xF5\xAA \xFFU U\xF9\xFF\xF5\xAA \xFFU U\xFD\xFF#\xFE\xFF\xF4\xAA \xAA UU\xAA\xFB\xFF\xF4\xAA \xAA UU\xAA\xFB\xFF\xF4\xAA \xAA UU\xAA\xFE\xFF&\xFE\xFF\xF5\xAA \xFFU U\xAA\xAA\xFB\xFF\xF5\xAA \xFFU U\xAA\xAA\xFB\xFF\xF5\xAA \xFFU U\xAA\xAA\xFE\xFF&\xFF\xFF\xF4\xAA \xAA UU\xFE\xAA\xFD\xFF\xF4\xAA \xAA UU\xFE\xAA\xFD\xFF\xF4\xAA \xAA UU\xFE\xAA\xFF\xFF&\xFF\xFF\xF5\xAA \xFFU U\xFD\xAA\xFD\xFF\xF5\xAA \xFFU U\xFD\xAA\xFD\xFF\xF5\xAA \xFFU U\xFD\xAA\xFF\xFF&\xFF\xFF\xF5\xAA \xAA UU\xFD\xAA\xFD\xFF\xF5\xAA \xAA UU\xFD\xAA\xFD\xFF\xF5\xAA \xAA UU\xFD\xAA\xFF\xFF&\xFF\xFF\xF6\xAA \xFFU U\xFC\xAA\xFD\xFF\xF6\xAA \xFFU U\xFC\xAA\xFD\xFF\xF6\xAA \xFFU U\xFC\xAA\xFF\xFF&\xFF\xFF\xF6\xAA \xAA UU\xFC\xAA\xFD\xFF\xF6\xAA \xAA UU\xFC\xAA\xFD\xFF\xF6\xAA \xAA UU\xFC\xAA\xFF\xFF&\xFF\xFF\xF7\xAA \xFFU U\xFB\xAA\xFD\xFF\xF7\xAA \xFFU U\xFB\xAA\xFD\xFF\xF7\xAA \xFFU U\xFB\xAA\xFF\xFF&\xFF\xFF\xF7\xAA \xAA UU\xFB\xAA\xFD\xFF\xF7\xAA \xAA UU\xFB\xAA\xFD\xFF\xF7\xAA \xAA UU\xFB\xAA\xFF\xFF#\xFE\xFF\xF8\xAA U U\xFB\xAA\xFB\xFF\xF8\xAA U U\xFB\xAA\xFB\xFF\xF8\xAA U U\xFB\xAA\xFE\xFF \xFE\xFF\xF8\xAA\xFF \xFFU\xFB\xAA\xFB\xFF\xF8\xAA\xFF \xFFU\xFB\xAA\xFB\xFF\xF8\xAA\xFF \xFFU\xFB\xAA\xFE\xFF \xFD\xFF\xF9\xAA UU\xFB\xAA\xF9\xFF\xF9\xAA UU\xFB\xAA\xF9\xFF\xF9\xAA UU\xFB\xAA\xFD\xFF\xFC\xFF\xFA\xAA\xFFU\xFB\xAA\xF7\xFF\xFA\xAA\xFFU\xFB\xAA\xF7\xFF\xFA\xAA\xFFU\xFB\xAA\xFC\xFF\xFB\xFF\xF4\xAA\xF5\xFF\xF4\xAA\xF5\xFF\xF4\xAA\xFB\xFF\xFA\xFF\xF6\xAA\xF3\xFF\xF6\xAA\xF3\xFF\xF6\xAA\xFA\xFF\xF8\xFF\xFA\xAA\xEF\xFF\xFA\xAA\xEF\xFF\xFA\xAA\xF8\xFF \xFF \x82\x82 \xFF \xFF\xFE G\xFB\xCD G\xFB\xCD \xA1\xF2 8BIM Gr\x89ph\x81\x81\xAF
- \x9A \xFF\x80< G\xFB\xCD G\xFB\xCD @\xFD\xFF\xFB \xFE\xFF\xFF \xFD\xFF\xFB \xFE\xFF\xFF \xFD\xFF\xFB \xFE\xFF\xFF \xFE\xFF\xF9 \xFF\xFE \xFE\xFF\xF9 \xFF\xFE \xFE\xFF\xF9 \xFF\xFE \xFF\xFF\xF9 \xFF\xFE \xFE\xFF\xF9 \xFF\xFE \xFE\xFF\xF9 \xFF\xFE \xFF\xFF\xFF\xFA \xFF\xFE \xFD\xFF\xFA \xFF\xFE \xFD\xFF\xFA \xFF\xFE \xFF\xFF\xFF\xFF\xFB \xFF\xFE \xFC\xFF\xFB \xFF\xFE \xFC\xFF\xFB \xFF\xFE \xFE\xFF\xFF\xFF\xFC \xFF\xFE \xFB\xFF\xFC \xFF\xFE \xFB\xFF\xFC \xFF\xFE \xFD\xFF \xFF\xFF\xFC \xFF \xFF \xFC\xFF\xFC \xFF \xFF \xFC\xFF\xFC \xFF \xFF \xFE\xFF\xFE\xFF\xFD \xFE\xFF \xFA\xFF\xFD \xFE\xFF \xFA\xFF\xFD \xFE\xFF \xFD\xFF\xFD\xFF\xFB \xF8\xFF\xFB \xF8\xFF\xFB \xFC\xFF \xFF \x86\x86 \xFF \xFF\xFE G\xFB\xCD G\xFB\xCD \xA1\xF2 8BIM Gr\x89ph\x81\x81\xAF
- \x9A \xFF\x80< G\xFB\xCD G\xFB\xCD @\xFD\xFF\xFB\xAA\xFE\xFF\xFF \xFD\xFF\xFB\xAA\xFE\xFF\xFF \xFD\xFF\xFB\xAA\xFE\xFF\xFF \xFE\xFF\xF9\xAA\xFF U \xFE\xFF\xF9\xAA\xFF U \xFE\xFF\xF9\xAA\xFF U \xFF\xFF\xF8\xAA U \xFE\xFF\xF8\xAA U \xFE\xFF\xF8\xAA U \xFF\xFF\xFF\xF9\xAA U \xFD\xFF\xF9\xAA U \xFD\xFF\xF9\xAA U \xFF\xFF\xFF\xFF\xFA\xAA U \xFC\xFF\xFA\xAA U \xFC\xFF\xFA\xAA U \xFE\xFF \xFF\xFF\xFB\xAA U \xAA\xFC\xFF\xFB\xAA U \xAA\xFC\xFF\xFB\xAA U \xAA\xFE\xFF \xFF\xFF\xFC\xAA U \xAA\xAA\xFC\xFF\xFC\xAA U \xAA\xAA\xFC\xFF\xFC\xAA U \xAA\xAA\xFE\xFF\xFE\xFF\xFD\xAA\xFF \xFF\xAA\xFA\xFF\xFD\xAA\xFF \xFF\xAA\xFA\xFF\xFD\xAA\xFF \xFF\xAA\xFD\xFF\xFD\xFF\xFB\xAA\xF8\xFF\xFB\xAA\xF8\xFF\xFB\xAA\xFC\xFF \xFF \x9E\x9E \xFF \xFF\xFE G\xFB\xCD G\xFB\xCD \xA1\xF2 8BIM Gr\x89ph\x81\x81\xAF
- \x9A \xFF\x80< G\xFB\xCD G\xFB\xCD @\xFE \xFBf\xFB \xFE\xFF\xFB\x99\xFE\xFF\xFF \xFF\xFE \xFB\xCC\xFB \xFF \xF9f\xFF U \xFF\xFF\xF9\x99\xFF U \xFF \xF9\xCC\xFF U \xF8f U\xFE \xFF\xF8\x99 U \xFF\xFF \xF8\xCC U\xFE \xF9f U\xFD \xFF\xF9\x99 U \xFE\xFF \xF9\xCC U\xFD \xFAf U\xFC \xFF\xFA\x99 U \xFD\xFF \xFA\xCC U\xFC ! \xFBf U f\xFD \xFF\xFB\x99 U \x99\xFD\xFF \xFB\xCC U \xCC\xFD $ \xFCf U ff\xFD \xFF\xFC\x99 U \x99\x99\xFD\xFF \xFC\xCC U \xCC\xCC\xFD \xFF \xFDf\xFF \xFFf\xFC \xFF\xFF\xFD\x99\xFF \xFF\x99\xFC\xFF\xFF \xFD\xCC\xFF \xFF\xCC\xFC \xFE \xFBf\xFB \xFE\xFF\xFB\x99\xFB\xFF\xFE \xFB\xCC\xFB \xFF \x80 \x80 , 2 \xFF \xFF\xFE G\xFB\xCD G\xFB\xCD , 2 \xA1\xF2 8BIM , 2Gr\x89ph\x81\x81\xAF
- , 2 \x9A \xFF\x80\xC8 , 2 G\xFB\xCD G\xFB\xCD , 2 , 2 @\x81\xFF\xEB\xFF \xED\xFF\xF7 \xF9\xFF\xFE \xE4\xFF\xF7 \xF9\xFF\xFE \xE4\xFF\xF9 \xFF \xF9\xFF\xFE \xF8\xFF(\xF0\xFF\xFE \xF7\xFF\xFE \xFD\xFF\xFC \xE8\xFF\xFE \xF7\xFF\xFE \xFD\xFF\xFC \xE8\xFF\xFE \xF9\xFF\xFF\xFF\xFE \xFD\xFF\xFC \xF9\xFF(\xF2\xFF\xFF \xF1\xFF\xFF \xFF\xFF\xFC \xEA\xFF\xFF \xF1\xFF\xFF \xFF\xFF\xFC \xEA\xFF\xFF \xF6\xFF\xFC\xFF\xFF \xFF\xFF\xFC \xF9\xFF(\xF4\xFF\xFF \xFC\xFF\xF7 \xFC\xFF\xFA \xEC\xFF\xFF \xFC\xFF\xF7 \xFC\xFF\xFA \xEC\xFF\xFF \xFC\xFF\xF9 \xFF \xFC\xFF\xFA \xF9\xFF(\xF5\xFF \xFD\xFF\xF1 \xFE\xFF\xFC \xEC\xFF \xFD\xFF\xF1 \xFE\xFF\xFC \xEC\xFF \xFD\xFF\xF6 \xFC \xFE\xFF\xFC \xF8\xFF(\xF6\xFF \xFE\xFF\xEE \xFF\xFF\xFC \xED\xFF \xFE\xFF\xEE \xFF\xFF\xFC \xED\xFF \xFE\xFF\xF4 \xFB \xFF\xFF\xFC \xF8\xFF(\xF7\xFF \xFE\xFF\xEE \xFF\xFF\xFC \xED\xFF \xFE\xFF\xEE \xFF\xFF\xFC \xED\xFF \xFE\xFF\xF3 \xFC \xFF\xFF\xFC \xF7\xFF(\xF8\xFF \xFE\xFF\xED \xFF\xFF\xFB \xEF\xFF \xFE\xFF\xED \xFF\xFF\xFB \xEF\xFF \xFE\xFF\xF2 \xFC \xFF\xFF\xFB \xF8\xFF4\xF9\xFF \xFE\xFF\xED \xFF\xFF\xFC \xFF\xFF \xF1\xFF \xFE\xFF\xED \xFF\xFF\xFC \xFF\xFF \xF1\xFF \xFE\xFF\xF1 \xFD \xFF\xFF\xFC \xFF\xFF \xF9\xFF4\xFA\xFF \xFE\xFF\xEC \xFF\xFF\xFC \xFE\xFF \xF3\xFF \xFE\xFF\xEC \xFF\xFF\xFC \xFE\xFF \xF3\xFF \xFE\xFF\xF0 \xFD \xFF\xFF\xFC \xFE\xFF \xFA\xFF4\xFA\xFF \xFF\xFF\xEC \xFF\xFF\xFC \xFD\xFF \xF3\xFF \xFF\xFF\xEC \xFF\xFF\xFC \xFD\xFF \xF3\xFF \xFF\xFF\xEF \xFE \xFF\xFF\xFC \xFD\xFF \xFA\xFF=\xFB\xFF \xFF\xFF\xEB \xFF\xFF\xFC \xFF\xFF \xFF\xFF \xF5\xFF \xFF\xFF\xEB \xFF\xFF\xFC \xFF\xFF \xFF\xFF \xF5\xFF \xFF\xFF\xEE \xFE \xFF\xFF\xFC \xFF\xFF \xFF\xFF \xFB\xFF@\xFB\xFF \xFF\xFF\xEC \xFF\xFF\xFC \xFF\xFF\xFF \xFF\xFF \xF5\xFF \xFF\xFF\xEC \xFF\xFF\xFC \xFF\xFF\xFF \xFF\xFF \xF5\xFF \xFF\xFF\xEE \xFF \xFF\xFF\xFC \xFF\xFF\xFF \xFF\xFF \xFB\xFF@\xFC\xFF \xFF\xFF\xEB \xFF\xFF\xFC \xFF\xFF\xFE \xFF\xFF \xF7\xFF \xFF\xFF\xEB \xFF\xFF\xFC \xFF\xFF\xFE \xFF\xFF \xF7\xFF \xFF\xFF\xED \xFF \xFF\xFF\xFC \xFF\xFF\xFE \xFF\xFF \xFC\xFF@\xFC\xFF \xFF\xFF\xEC \xFF\xFF\xFC \xFF\xFF\xFD \xFF\xFF \xF7\xFF \xFF\xFF\xEC \xFF\xFF\xFC \xFF\xFF\xFD \xFF\xFF \xF7\xFF \xFF\xFF\xED \xFF\xFF\xFC \xFF\xFF\xFD \xFF\xFF \xFC\xFF@\xFC\xFF \xFF\xFF\xEC \xFF\xFF\xFC \xFF\xFF\xFD \xFF\xFF \xF7\xFF \xFF\xFF\xEC \xFF\xFF\xFC \xFF\xFF\xFD \xFF\xFF \xF7\xFF \xFF\xFF\xED \xFF\xFF\xFC \xFF\xFF\xFD \xFF\xFF \xFC\xFF>\xFD\xFF \xFF\xFF\xEC \xFF\xFF\xFC \xFF\xFF\xFB \xFF\xFF \xF9\xFF \xFF\xFF\xEC \xFF\xFF\xFC \xFF\xFF\xFB \xFF\xFF \xF9\xFF \xFF\xFF\xEC \xFF\xFF\xFC \xFF\xFF\xFB \xFF\xFF \xFD\xFF>\xFD\xFF \xFF\xFF\xEC \xFF\xFF\xFC \xFF\xFF\xFB \xFF\xFF \xF9\xFF \xFF\xFF\xEC \xFF\xFF\xFC \xFF\xFF\xFB \xFF\xFF \xF9\xFF \xFF\xFF\xEC \xFF\xFF\xFC \xFF\xFF\xFB \xFF\xFF \xFD\xFF@\xFD\xFF \xFF\xFF\xED \xFF\xFF\xFC \xFF\xFF\xFA \xFF\xFF \xF9\xFF \xFF\xFF\xED \xFF\xFF\xFC \xFF\xFF\xFA \xFF\xFF \xF9\xFF \xFF\xFF\xED \xFF \xFF\xFC \xFF\xFF\xFA \xFF\xFF \xFD\xFF@\xFD\xFF \xFF\xFF\xED \xFF\xFF\xFC \xFF\xFF\xFA \xFF\xFF \xF9\xFF \xFF\xFF\xED \xFF\xFF\xFC \xFF\xFF\xFA \xFF\xFF \xF9\xFF \xFF\xFF\xED \xFF \xFF\xFC \xFF\xFF\xFA \xFF\xFF \xFD\xFF>\xFD\xFF \xFF\xFF\xEE \xFF\xFF\xFC \xFF\xFF\xF9 \xFF\xFF \xF9\xFF \xFF\xFF\xEE \xFF\xFF\xFC \xFF\xFF\xF9 \xFF\xFF \xF9\xFF \xFF\xFF\xEE \xFF\xFF\xFC \xFF\xFF\xF9 \xFF\xFF \xFD\xFF>\xFD\xFF \xFF\xFF\xEE \xFF\xFF\xFC \xFF\xFF\xF9 \xFF\xFF \xF9\xFF \xFF\xFF\xEE \xFF\xFF\xFC \xFF\xFF\xF9 \xFF\xFF \xF9\xFF \xFF\xFF\xEE \xFF\xFF\xFC \xFF\xFF\xF9 \xFF\xFF \xFD\xFF@\xFD\xFF \xFF\xFF\xEF \xFF\xFF\xFC \xFF\xFF\xF8 \xFF\xFF \xF9\xFF \xFF\xFF\xEF \xFF\xFF\xFC \xFF\xFF\xF8 \xFF\xFF \xF9\xFF \xFF\xFF\xEF \xFF\xFF \xFD \xFF\xFF\xF8 \xFF\xFF \xFD\xFF@\xFD\xFF \xFF\xFF\xEF \xFF\xFF\xFC \xFF\xFF\xF8 \xFF\xFF \xF9\xFF \xFF\xFF\xEF \xFF\xFF\xFC \xFF\xFF\xF8 \xFF\xFF \xF9\xFF \xFF\xFF\xEF \xFF\xFF \xFD \xFF\xFF\xF8 \xFF\xFF \xFD\xFF@\xFD\xFF \xFF\xFF\xF0 \xFF\xFF\xFC \xFF\xFF\xF7 \xFF\xFF \xF9\xFF \xFF\xFF\xF0 \xFF\xFF\xFC \xFF\xFF\xF7 \xFF\xFF \xF9\xFF \xFF\xFF\xF0 \xFF\xFF\xFF \xFE \xFF\xFF\xF7 \xFF\xFF \xFD\xFF@\xFD\xFF \xFF\xFF\xF0 \xFF\xFF\xFC \xFF\xFF\xF7 \xFF\xFF \xF9\xFF \xFF\xFF\xF0 \xFF\xFF\xFC \xFF\xFF\xF7 \xFF\xFF \xF9\xFF \xFF\xFF\xF0 \xFF\xFF\xFF \xFE \xFF\xFF\xF7 \xFF\xFF \xFD\xFF@\xFC\xFF \xFF\xFF\xF2 \xFF\xFF\xFC \xFF\xFF\xF7 \xFF\xFF \xF7\xFF \xFF\xFF\xF2 \xFF\xFF\xFC \xFF\xFF\xF7 \xFF\xFF \xF7\xFF \xFF\xFF\xF2 \xFF\xFF\xFE \xFF \xFF\xFF\xF7 \xFF\xFF \xFC\xFF@\xFC\xFF \xFF\xFF\xF2 \xFF\xFF\xFC \xFF\xFF\xF7 \xFF\xFF \xF7\xFF \xFF\xFF\xF2 \xFF\xFF\xFC \xFF\xFF\xF7 \xFF\xFF \xF7\xFF \xFF\xFF\xF2 \xFF\xFF\xFE \xFF \xFF\xFF\xF7 \xFF\xFF \xFC\xFF@\xFC\xFF \xFF\xFF\xF3 \xFF\xFF\xFC \xFF\xFF\xF6 \xFF\xFF \xF7\xFF \xFF\xFF\xF3 \xFF\xFF\xFC \xFF\xFF\xF6 \xFF\xFF \xF7\xFF \xFF\xFF\xF3 \xFF\xFF\xFD \xFF\xFF\xF6 \xFF\xFF \xFC\xFF@\xFB\xFF \xFF\xFF\xF4 \xFF\xFF\xFC \xFF\xFF\xF7 \xFF\xFF \xF5\xFF \xFF\xFF\xF4 \xFF\xFF\xFC \xFF\xFF\xF7 \xFF\xFF \xF5\xFF \xFF\xFF\xF4 \xFF\xFF\xFD \xFF\xFF\xF7 \xFF\xFF \xFB\xFF>\xFB\xFF \xFF\xFF\xF4 \xFF\xFF\xFD \xFF\xFF\xF6 \xFF\xFF \xF5\xFF \xFF\xFF\xF4 \xFF\xFF\xFD \xFF\xFF\xF6 \xFF\xFF \xF5\xFF \xFF\xFF\xF4 \xFF\xFF\xFD \xFF\xFF\xF6 \xFF\xFF \xFB\xFF@\xFA\xFF \xFF\xFF\xF5 \xFF\xFF\xFE \xFF\xFF\xF6 \xFF\xFF \xF3\xFF \xFF\xFF\xF5 \xFF\xFF\xFE \xFF\xFF\xF6 \xFF\xFF \xF3\xFF \xFF\xFF\xF5 \xFF\xFF\xFE \xFF \xFF\xF6 \xFF\xFF \xFA\xFF>\xFA\xFF \xFE\xFF\xF6 \xFF\xFF\xFF \xFF\xFF\xF6 \xFE\xFF \xF3\xFF \xFE\xFF\xF6 \xFF\xFF\xFF \xFF\xFF\xF6 \xFE\xFF \xF3\xFF \xFE\xFF\xF6 \xFF\xFF\xFF \xFF\xFF\xF6 \xFE\xFF \xFA\xFF?\xF9\xFF \xFE\xFF\xF7 \xFF\xFF \xFF\xFF\xF6 \xFE\xFF \xF1\xFF \xFE\xFF\xF7 \xFF\xFF \xFF\xFF\xF6 \xFE\xFF \xF1\xFF \xFE\xFF\xF7 \xFF\xFF \xFF\xFF \xF7 \xFE\xFF \xF9\xFF4\xF8\xFF \xFE\xFF\xF8 \xFD\xFF\xF6 \xFE\xFF \xEF\xFF \xFE\xFF\xF8 \xFD\xFF\xF6 \xFE\xFF \xEF\xFF \xFE\xFF\xF8 \xFD\xFF\xFF \xF8 \xFE\xFF \xF8\xFF4\xF7\xFF \xFE\xFF\xF9 \xFE\xFF\xF6 \xFE\xFF \xED\xFF \xFE\xFF\xF9 \xFE\xFF\xF6 \xFE\xFF \xED\xFF \xFE\xFF\xF9 \xFE\xFF\xFE \xF9 \xFE\xFF \xF7\xFF4\xF6\xFF \xFE\xFF\xFA \xFF\xFF\xF6 \xFE\xFF \xEB\xFF \xFE\xFF\xFA \xFF\xFF\xF6 \xFE\xFF \xEB\xFF \xFE\xFF\xFA \xFF\xFF\xFD \xFA \xFE\xFF \xF6\xFF(\xF5\xFF \xFD\xFF\xF1 \xFD\xFF \xE9\xFF \xFD\xFF\xF1 \xFD\xFF \xE9\xFF \xFD\xFF\xF6 \xFC \xFD\xFF \xF5\xFF(\xF4\xFF\xFF \xFC\xFF\xF7 \xFC\xFF\xFF \xE7\xFF\xFF \xFC\xFF\xF7 \xFC\xFF\xFF \xE7\xFF\xFF \xFC\xFF\xF9 \xFF \xFC\xFF\xFF \xF4\xFF \xF2\xFF\xFF \xF1\xFF\xFF \xE3\xFF\xFF \xF1\xFF\xFF \xE3\xFF\xFF \xF6\xFF\xFC\xFF\xFF \xF2\xFF \xF0\xFF\xFE \xF7\xFF\xFE \xDF\xFF\xFE \xF7\xFF\xFE \xDF\xFF\xFE \xF9\xFF\xFF\xFF\xFE \xF0\xFF\xED\xFF\xF7 \xD9\xFF\xF7 \xD9\xFF\xF9 \xFF \xED\xFF\x81\xFF\xEB\xFF \xFF b b , 2 \xFF \xFF\xFE G\xFB\xCD G\xFB\xCD , 2 \xA1\xF2 8BIM , 2Gr\x89ph\x81\x81\xAF
- , 2 \x9A \xFF\x80\xC8 , 2 G\xFB\xCD G\xFB\xCD , 2 , 2 @\xDB\xFF\xFE \xD2\xFF\xFE \xDC\xFF\xF7\xFF\xFE \xF8\xFF(\xED\xFF\xF7\xAA\xFA\xFF\xFF U \xE5\xFF\xF7\xAA\xFA\xFF\xFF U \xE5\xFF\xF9\xAA\xFF\xAA\xFA\xFF\xFF U \xF9\xFF8\xF0\xFF\xFC\xAA\xFB\xFF\xFC\xAA\xFE\xFF\xFF \xFF\xAA\xAA \xE9\xFF\xFC\xAA\xFB\xFF\xFC\xAA\xFE\xFF\xFF \xFF\xAA\xAA \xE9\xFF\xFC\xAA\xFB\xFF\xFC\xAA\xFE\xFF\xFF \xFF\xAA\xAA \xFA\xFF7\xF2\xFF\xFE\xAA\xF3\xFF\xFE\xAA\xFF \xAA\xFF\xAAUU \xEB\xFF\xFE\xAA\xF3\xFF\xFE\xAA\xFF \xAA\xFF\xAAUU \xEB\xFF\xFE\xAA\xF7\xFF\xFD\xFF\xFE\xAA\xFF \xAA\xFF\xAAUU \xFA\xFF@\xF4\xFF\xFE\xAA\xFE\xFF\xF5\xAA\xFE\xFF\xAAU \xFF\xAAUU \xED\xFF\xFE\xAA\xFE\xFF\xF5\xAA\xFE\xFF\xAAU \xFF\xAAUU \xED\xFF\xFE\xAA\xFE\xFF\xF8\xAA\xFE\xAA\xFE\xFF\xAAU \xFF\xAAUU \xFA\xFF:\xF5\xFF\xFF\xAA\xFE\xFF\xF1\xAA\xFF\xAA \xAA\xFF\xAAUU \xED\xFF\xFF\xAA\xFE\xFF\xF1\xAA\xFF\xAA \xAA\xFF\xAAUU \xED\xFF\xFF\xAA\xFE\xFF\xF6\xAA\xFC\xAA\xFF\xAA \xAA\xFF\xAAUU \xF9\xFF7\xF6\xFF\xFF\xAA\xFF\xFF\xEE\xAAU \xFF\xAAUU \xEE\xFF\xFF\xAA\xFF\xFF\xEE\xAAU \xFF\xAAUU \xEE\xFF\xFF\xAA\xFF\xFF\xF4\xAA\xFB\xAAU \xFF\xAAUU \xF9\xFF4\xF7\xFF\xFF\xAA\xFF\xFF\xED\xAA \xAA\xFF\xAAUU \xEE\xFF\xFF\xAA\xFF\xFF\xED\xAA \xAA\xFF\xAAUU \xEE\xFF\xFF\xAA\xFF\xFF\xF3\xAA\xFB\xAA \xAA\xFF\xAAUU \xF8\xFF7\xF8\xFF\xFF\xAA\xFF\xFF\xED\xAAU \xFF\xAAUU \xEF\xFF\xFF\xAA\xFF\xFF\xED\xAAU \xFF\xAAUU \xEF\xFF\xFF\xAA\xFF\xFF\xF2\xAA\xFC\xAAU \xFF\xAAUU \xF8\xFF:\xF9\xFF\xFF\xAA\xFF\xFF\xEC\xAA \xAA\xFF\xAAUU U\xF1\xFF\xFF\xAA\xFF\xFF\xEC\xAA \xAA\xFF\xAAUU U\xF1\xFF\xFF\xAA\xFF\xFF\xF1\xAA\xFC\xAA \xAA\xFF\xAAUU U\xF9\xFF=\xFA\xFF\xFF\xAA\xFF\xFF\xEC\xAAU \xFF\xAAUU \xFEU\xF3\xFF\xFF\xAA\xFF\xFF\xEC\xAAU \xFF\xAAUU \xFEU\xF3\xFF\xFF\xAA\xFF\xFF\xF0\xAA\xFD\xAAU \xFF\xAAUU \xFEU\xFA\xFF=\xFA\xFF\xAA\xFF\xFF\xEB\xAA \xAA\xFF\xAAUU \xFEU\xF3\xFF\xAA\xFF\xFF\xEB\xAA \xAA\xFF\xAAUU \xFEU\xF3\xFF\xAA\xFF\xFF\xEF\xAA\xFD\xAA \xAA\xFF\xAAUU \xFEU\xFA\xFFC\xFB\xFF\xFF\xAA \xFF\xEB\xAA U \xFF\xAAUU UU\xFE\xAA\xF5\xFF\xFF\xAA \xFF\xEB\xAA U \xFF\xAAUU UU\xFE\xAA\xF5\xFF\xFF\xAA \xFF\xEE\xAA\xFE\xAA U \xFF\xAAUU UU\xFE\xAA\xFB\xFFC\xFB\xFF\xAA\xFF\xFF\xEB\xAA \xAA\xFF\xAAUU UU\xFE\xAA\xF5\xFF\xAA\xFF\xFF\xEB\xAA \xAA\xFF\xAAUU UU\xFE\xAA\xF5\xFF\xAA\xFF\xFF\xEE\xAA\xFE\xAA \xAA\xFF\xAAUU UU\xFE\xAA\xFB\xFFL\xFC\xFF\xFF\xAA \xFF\xEB\xAAU \xFF\xAAUU \xFEU\xAA\xFF\xAA\xAA\xF7\xFF\xFF\xAA \xFF\xEB\xAAU \xFF\xAAUU \xFEU\xAA\xFF\xAA\xAA\xF7\xFF\xFF\xAA \xFF\xED\xAA\xFF\xAAU \xFF\xAAUU \xFEU\xAA\xFF\xAA\xAA\xFC\xFFL\xFC\xFF\xAA\xFF\xFF\xEB\xAA U\xFF\xAAUU \xFEU\xAA\xFF\xFF\xAA\xF7\xFF\xAA\xFF\xFF\xEB\xAA U\xFF\xAAUU \xFEU\xAA\xFF\xFF\xAA\xF7\xFF\xAA\xFF\xFF\xED\xAA\xFF\xAA U\xFF\xAAUU \xFEU\xAA\xFF\xFF\xAA\xFC\xFFH\xFC\xFF\xAA\xFF\xEB\xAAU \xFF\xAAUU \xFDU\xFF\xAA\xFF\xAA\xF7\xFF\xAA\xFF\xEB\xAAU \xFF\xAAUU \xFDU\xFF\xAA\xFF\xAA\xF7\xFF\xAA\xFF\xEC\xAA\xAAU \xFF\xAAUU \xFDU\xFF\xAA\xFF\xAA\xFC\xFFN\xFD\xFF\xFF\xAA \xFF\xEB\xAA U\xFF\xAAUU \xFEU\xFE\xAA\xFF\xAA\xAA\xF9\xFF\xFF\xAA \xFF\xEB\xAA U\xFF\xAAUU \xFEU\xFE\xAA\xFF\xAA\xAA\xF9\xFF\xFF\xAA \xFF\xEC\xAA\xAA U\xFF\xAAUU \xFEU\xFE\xAA\xFF\xAA\xAA\xFD\xFFM\xFD\xFF\xFF\xAA \xFF\xEC\xAAU \xFF\xAAUU \xFDU\xFE\xAA\xFF\xAA\xAA\xF9\xFF\xFF\xAA \xFF\xEC\xAAU \xFF\xAAUU \xFDU\xFE\xAA\xFF\xAA\xAA\xF9\xFF\xFF\xAA \xFF\xEC\xAAU \xFF\xAAUU \xFDU\xFE\xAA\xFF\xAA\xAA\xFD\xFFM\xFD\xFF\xAA\xFF\xFF\xEC\xAA U\xFF\xAAUU \xFEU\xFD\xAA\xFF\xFF \xAA\xF9\xFF\xAA\xFF\xFF\xEC\xAA U\xFF\xAAUU \xFEU\xFD\xAA\xFF\xFF \xAA\xF9\xFF\xAA\xFF\xFF\xEC\xAA U\xFF\xAAUU \xFEU\xFD\xAA\xFF\xFF \xAA\xFD\xFFN\xFD\xFF\xAA\xFF\xFF\xED\xAAU \xFF\xAAUU \xFDU\xFD\xAA\xFF\xFF \xAA\xF9\xFF\xAA\xFF\xFF\xED\xAAU \xFF\xAAUU \xFDU\xFD\xAA\xFF\xFF \xAA\xF9\xFF\xAA\xFF\xFF\xED\xAA U \xFF\xAAUU \xFDU\xFD\xAA\xFF\xFF \xAA\xFD\xFFN\xFD\xFF\xAA\xFF\xFF\xED\xAA U\xFF\xAAUU \xFEU\xFC\xAA\xFF\xFF \xAA\xF9\xFF\xAA\xFF\xFF\xED\xAA U\xFF\xAAUU \xFEU\xFC\xAA\xFF\xFF \xAA\xF9\xFF\xAA\xFF\xFF\xED\xAA U\xFF\xAAUU \xFEU\xFC\xAA\xFF\xFF \xAA\xFD\xFFN\xFD\xFF\xAA\xFF\xFF\xEE\xAAU \xFF\xAAUU \xFDU\xFC\xAA\xFF\xFF \xAA\xF9\xFF\xAA\xFF\xFF\xEE\xAAU \xFF\xAAUU \xFDU\xFC\xAA\xFF\xFF \xAA\xF9\xFF\xAA\xFF\xFF\xEE\xAAU \xFF\xAAUU \xFDU\xFC\xAA\xFF\xFF \xAA\xFD\xFFN\xFD\xFF\xAA\xFF\xFF\xEE\xAA U\xFF\xAAUU \xFEU\xFB\xAA\xFF\xFF \xAA\xF9\xFF\xAA\xFF\xFF\xEE\xAA U\xFF\xAAUU \xFEU\xFB\xAA\xFF\xFF \xAA\xF9\xFF\xAA\xFF\xFF\xEE\xAA U\xFF\xAAUU \xFEU\xFB\xAA\xFF\xFF \xAA\xFD\xFFN\xFD\xFF\xAA\xFF\xFF\xEF\xAAU \xFF\xAAUU \xFDU\xFB\xAA\xFF\xFF \xAA\xF9\xFF\xAA\xFF\xFF\xEF\xAAU \xFF\xAAUU \xFDU\xFB\xAA\xFF\xFF \xAA\xF9\xFF\xAA\xFF\xFF\xEF\xAAU \xFF\xAAUU \xFDU\xFB\xAA\xFF\xFF \xAA\xFD\xFFN\xFD\xFF\xFF\xAA \xFF\xEF\xAA U\xFF\xAAUU \xFEU\xFA\xAA\xFF\xAA\xAA\xF9\xFF\xFF\xAA \xFF\xEF\xAA U\xFF\xAAUU \xFEU\xFA\xAA\xFF\xAA\xAA\xF9\xFF\xFF\xAA \xFF\xEF\xAA U\xFF\xAAUU \xFEU\xFA\xAA\xFF\xAA\xAA\xFD\xFFJ\xFD\xFF\xFF\xAA \xFF\xEF\xAA \xFF\xAAUU \xFDU\xFA\xAA\xFF\xAA\xAA\xF9\xFF\xFF\xAA \xFF\xEF\xAA \xFF\xAAUU \xFDU\xFA\xAA\xFF\xAA\xAA\xF9\xFF\xFF\xAA \xFF\xEF\xAA \xFF\xAA\xFFU\xFF \xFDU\xFA\xAA\xFF\xAA\xAA\xFD\xFFG\xFC\xFF\xAA\xFF\xF0\xAA U\xFF\xAAUU \xFEU\xF9\xAA\xFF\xAA\xF7\xFF\xAA\xFF\xF0\xAA U\xFF\xAAUU \xFEU\xF9\xAA\xFF\xAA\xF7\xFF\xAA\xFF\xF0\xAA U\xFF\xAA\xFFU\xFF \xFEU\xF9\xAA\xFF\xAA\xFC\xFFK\xFC\xFF\xAA\xFF\xFF\xF1\xAA \xFF\xAAUU \xFDU\xFA\xAA\xFF\xFF \xAA\xF7\xFF\xAA\xFF\xFF\xF1\xAA \xFF\xAAUU \xFDU\xFA\xAA\xFF\xFF \xAA\xF7\xFF\xAA\xFF\xFF\xF1\xAA \xFF\xAAUU \xFDU\xFA\xAA\xFF\xFF \xAA\xFC\xFFL\xFC\xFF\xFF\xAA \xFF\xF2\xAA\xFF \xFF\xFEU\xFF \xFEU\xF9\xAA\xFF\xAA\xAA\xF7\xFF\xFF\xAA \xFF\xF2\xAA\xFF \xFF\xFEU\xFF \xFEU\xF9\xAA\xFF\xAA\xAA\xF7\xFF\xFF\xAA \xFF\xF2\xAA\xFF \xFFUUU \xFEU\xF9\xAA\xFF\xAA\xAA\xFC\xFFJ\xFB\xFF\xAA\xFF\xFF\xF3\xAA \xFF\xAAUU \xFDU\xFA\xAA\xFF\xFF \xAA\xF5\xFF\xAA\xFF\xFF\xF3\xAA \xFF\xAAUU \xFDU\xFA\xAA\xFF\xFF \xAA\xF5\xFF\xAA\xFF\xFF\xF3\xAA \xFF\xAAUU\xFF \xFDU\xFA\xAA\xFF\xFF \xAA\xFB\xFFJ\xFB\xFF\xFF\xAA \xFF\xF4\xAAU \xFF\xFEU\xFF \xFEU\xF9\xAA\xFF\xAA\xAA\xF5\xFF\xFF\xAA \xFF\xF4\xAAU \xFF\xFEU\xFF \xFEU\xF9\xAA\xFF\xAA\xAA\xF5\xFF\xFF\xAA \xFF\xF4\xAAU \xFF\xFEU\xFF \xFEU\xF9\xAA\xFF\xAA\xAA\xFB\xFFK\xFA\xFF\xAA\xFF\xFF\xF5\xAAU \xAAUU \xFDU\xFA\xAA\xFF\xFF \xAA\xF3\xFF\xAA\xFF\xFF\xF5\xAAU \xAAUU \xFDU\xFA\xAA\xFF\xFF \xAA\xF3\xFF\xAA\xFF\xFF\xF5\xAAU \xAAUU \xFDU\xFA\xAA\xFF\xFF \xAA\xFA\xFFI\xFA\xFF\xFF\xAA\xFF\xFF\xF6\xAAU UU\xFE \xFEU\xFA\xAA\xFF\xFF\xFF\xAA\xF3\xFF\xFF\xAA\xFF\xFF\xF6\xAAU UU\xFE \xFEU\xFA\xAA\xFF\xFF\xFF\xAA\xF3\xFF\xFF\xAA\xFF\xFF\xF6\xAAU UU \xFEU\xFA\xAA\xFF\xFF\xFF\xAA\xFA\xFFD\xF9\xFF\xFF\xAA\xFF\xFF\xF7\xAAU U\xFE \xFDU\xFB\xAA\xFF\xFF\xFF\xAA\xF1\xFF\xFF\xAA\xFF\xFF\xF7\xAAU U\xFE \xFDU\xFB\xAA\xFF\xFF\xFF\xAA\xF1\xFF\xFF\xAA\xFF\xFF\xF7\xAAU U\xFE \xFDU\xFB\xAA\xFF\xFF\xFF\xAA\xF9\xFF@\xF8\xFF\xFF\xAA\xFF\xFF\xF8\xAA U\xFD \xFDU\xFB\xAA\xFF\xFF\xFF\xAA\xEF\xFF\xFF\xAA\xFF\xFF\xF8\xAA U\xFD \xFDU\xFB\xAA\xFF\xFF\xFF\xAA\xEF\xFF\xFF\xAA\xFF\xFF\xF8\xAA U\xFD U\xFEU\xFB\xAA\xFF\xFF\xFF\xAA\xF8\xFF:\xF7\xFF\xFF\xAA\xFF\xFF\xF9\xAA\xFE \xFCU\xFB\xAA\xFF\xFF\xFF\xAA\xED\xFF\xFF\xAA\xFF\xFF\xF9\xAA\xFE \xFCU\xFB\xAA\xFF\xFF\xFF\xAA\xED\xFF\xFF\xAA\xFF\xFF\xF9\xAA\xFE \xFEU\xFFU\xFB\xAA\xFF\xFF\xFF\xAA\xF7\xFF:\xF6\xFF\xFF\xAA\xFF\xFF\xFA\xAA\xFF \xFBU\xFC\xAA\xFF\xFF\xFF\xAA\xEB\xFF\xFF\xAA\xFF\xFF\xFA\xAA\xFF \xFBU\xFC\xAA\xFF\xFF\xFF\xAA\xEB\xFF\xFF\xAA\xFF\xFF\xFA\xAA\xFF \xFDU\xFFU\xFC\xAA\xFF\xFF\xFF\xAA\xF6\xFF2\xF5\xFF\xFF\xAA\xFE\xFF\xFC\xAA\xFBU\xFC\xAA\xFE\xFF\xFF\xAA\xE9\xFF\xFF\xAA\xFE\xFF\xFC\xAA\xFBU\xFC\xAA\xFE\xFF\xFF\xAA\xE9\xFF\xFF\xAA\xFE\xFF\xFC\xAA\xFBU\xFC\xAA\xFE\xFF\xFF\xAA\xF5\xFF4\xF4\xFF\xFE\xAA\xFE\xFF\xFC\xAA\xFEU\xFD\xAA\xFE\xFF\xFE\xAA\xE7\xFF\xFE\xAA\xFE\xFF\xFC\xAA\xFEU\xFD\xAA\xFE\xFF\xFE\xAA\xE7\xFF\xFE\xAA\xFE\xFF\xFC\xAA\xFEU \xAA\xFE\xAA\xFE\xFF\xFE\xAA\xF4\xFF(\xF2\xFF\xFE\xAA\xFB\xFF\xFE\xAA\xFC\xFF\xFE\xAA\xE3\xFF\xFE\xAA\xFB\xFF\xFE\xAA\xFC\xFF\xFE\xAA\xE3\xFF\xFE\xAA\xFB\xFF\xFE\xAA \xFF\xFD\xFF\xFE\xAA\xF2\xFF\xF0\xFF\xFC\xAA\xFB\xFF\xFC\xAA\xDF\xFF\xFC\xAA\xFB\xFF\xFC\xAA\xDF\xFF\xFC\xAA\xFB\xFF\xFC\xAA\xF0\xFF\xED\xFF\xF7\xAA\xD9\xFF\xF7\xAA\xD9\xFF\xF9\xAA\xFF\xAA\xED\xFF\x81\xFF\xEB\xFF \xFF
-|
-| , 2 \xFF \xFF\xFE G\xFB\xCD G\xFB\xCD , 2 \xA1\xF2 8BIM , 2Gr\x89ph\x81\x81\xAF
- , 2 \x9A \xFF\x80\xC8 , 2 G\xFB\xCD G\xFB\xCD , 2 , 2 @\xDB \xFE\xF8 \xDB\xFF\xFE\xF8\xFF\xE5 \xF7 \xFE\xF8 (\xED \xF7f\xF9 "U\xF8 \xED\xFF\xF7\x99\xFA\xFF "U \xF9\xFF\xED \xF9\xCC\xFF\xCC\xF9 "U\xF8 S\xF0 \xFEf\x99\xCC\xDD\xFE\xFF\xFF\xEE\xFF\x99\xFEf\xFE "3\xFF\xAA\x88\xFA \xF0\xFF\xFE\x99\xFF\xCC \xDD\xFE\xFF\xFF\xEE\xFF\xCC\xFE\x99\xFE\xFF"3\xFF\xAA\x88\xFA\xFF\xF0 \xFD\xCC\xFF\xDD\xFE\xFF\xFF\xEE \xFF\xFD\xCC\xFE "3\xFF\xAA\x88\xFA ]\xF2 \xFFf\x99\xDD\xFE\xFF\xCC\xDD\xCC\xEE\xCC\xEE\xFE\xFF
-̙ff \xCCݙ\x88"\xF9 \xF2\xFF\xFF\x99\xCC\xDD\xFD\xFF\xDD\xCC\xEE\xCC\xEE\xFE\xFF\xFF\xCC\xFF\x99\xFF \xCCݙ\x88" \xFA\xFF\xF2 \xFF\xCC\xFF\xDD\xFD\xFF\xDD\xFF\xEE\xFF\xEE\xFD\xFF\xFE\xCC\xFF \xCCݙ\x88"\xF9 T\xF4 \xFFf\x99\xEE\xFF\xEE\xCC\xF8f \x99\xCC\xEE\xFF\xEE\x99"3f\xF9 \xF4\xFF\xFF\x99\xCC\xEE\xFF\xEE\xCC\xF7\x99 \xCC\xEE\xFF\xEE\xCC"3f \xFA\xFF\xF4 \xFE\xCC\xEE\xFF\xEE\xFF\xF9\xCC\xFF\xCC \xFF\xEE\xFF\xEE\xFF"3f\xF9 E\xF5 f\x99\xCC\xFFݙ\xF3f\x99\xCC\xC0 \xCCݙwU\xF8 \xF5\xFF\xFF\x99\xFF\xFF \xDD\xF2\x99\xFF\xCC\xC0 \xCCݙwU \xF9\xFF\xF5 \xFF\xCC\xFF\xFF \xDD\xF6\xCC\xFC\xCC\xFF\xC0 \xCCݙwU\xF8 ?\xF6 f\x99\xFF\xEE\x99\xEFf\xFF"f\xF8 \xF6\xFF\x99\xCC\xFF\xEE\xCC\xEF\x99\xFF"f \xF9\xFF\xF6 \xFF\xCC\xFF\xEE\xFF\xF5\xCC\xFB\xCC\xFF"f\xF8 :\xF7 f\xCC\xFF\xEE\xEDf \xBBݙwU\xF7 \xF7\xFF\x99\xCC\xFF\xEE\xED\x99 \xBBݙwU \xF8\xFF\xF7 \xCC\xFF\xFF\xEE\xF3\xCC\xFC\xCC\x99 \xBBݙwU\xF7 <\xF8 f\xCC\xEE\xCC\xEDf3f\xF7 \xF8\xFF\x99\xCC\xEE\xCC\xED\x993f \xF8\xFF\xF8 \xCC\xFF\xEE\xFF\xF2\xCC\xFC\xCC3f\xF7 A\xF9 f\x99\xFF\xDD\xECf \xAAݙwD "3\xF9 \xF9\xFF\x99\xCC\xFF\xDD\xEC\x99 \xAAݙwD "3\xF9\xFF\xF9 \xFF\xCC\xFF\xDD\xF1\xCC\xFC\xCC \xAAݙwD "f\xF9 E\xFA f\x99\xFF\xCC\xECf
-"\xFF\xAA\x88f U33\xFA \xFA\xFF\xFF\x99\xFF\xFF\xEC\x99
-"\xFF\xAA\x88f U3f\xFA\xFF\xFA \xFF\xCC\xFF\xFF\xF0\xCC\xFD\xCC
-"\xFF\xAA\x88f Uff\xFA D\xFA f\xCC\xEE\xEBf
- \x99ݙwD "Uw3\xFA \xFA\xFF\x99\xFF\xEE\xEB\x99
- \x99ݙwD "Uwf\xFA\xFF\xFA \xCC\xFF\xEE\xEF\xCC\xFD\xCC
- \x99ݙwD "Uw\x99\xFA K\xFB f\x99\xFF\x99\xECf 3\xEE\xBBwf 33\x99\x99f\xFB \xFB\xFF\x99\xCC\xFF\xCC\xEC\x99 3\xEE\xBBwf 3f\xFE\x99\xFB\xFF\xFB \xFF\xCC \xFF\xEE\xCC\xFE\xCC f\xEE\xBBwf 3f\x99\x99\xCC\xFB J\xFB f\xFF\xCC\xEBf \x88݈wD " 3\x99\xCCf\xFB \xFB\xFF\x99\xFF\xCC\xEB\x99 \x88݈wD "33\x99̙\xFB\xFF\xFB \xCC\xFF\xFF\xEE\xCC\xFE\xCC \x88݈wD "ff\x99\xCC\xCC\xFB R\xFC f\x99\xFF\x99\xECf3ݻ\x88U \xFE3f\xEE\x99f\xFC \xFC\xFF\x99\xCC\xFF\xCC\xEC\x993ݻ\x88U 33f\x99\xFC\xFF\xFC \xFF\xCC \xFF\xED\xCC\xFF\xCC3ݻ\x88U 3ff\x99\xEE\xCC\xCC\xFC P\xFC f\xCC\xEE\xEBfw݈fD \xFE3f\xDD\xCCf\xFC \xFC\xFF\x99\xCC\xEE\xEB\x99w݈fD 3\xFEf\xDD\xFF\x99\xFC\xFF\xFC \xCC\xFF\xEE\xED\xCC\xFF\xCCw݈fD ff\x99\xCC\xDD\xFF\xCC\xFC R\xFC f\xFF\xCC\xECf3 ݻwf 3 3ff\x99\xFFf\xFC \xFC\xFF\x99\xFF\xCC\xEC\x99f ݻwf 33ff\x99\xCC\xFF\x99\xFC\xFF\xFC \xCC\xFF\xFF\xED\xCC\xCCf ݻwf f3f\x99\xCC\xCC\xFF\xCC\xFC V\xFD f\x99\xFF\x99\xECf w݈fD "\xFE3\xFFf\x99\xFF\x99f\xFD \xFD\xFF\x99\xCC\xFF\xEB\x99
- w݈fD "3ff\xFE\x99\xFF\x99\x99\xFD\xFF\xFD \xFF\xCC \xFF\xEC\xCC\xCC w݈fD "3f\x99\x99\xCC\xCC\xFF\xCC\xCC\xFD V\xFD f\xCC\xFF\xECf3 ݻwf \xFE3\xFEf\xFF\x99f\xFD \xFD\xFF\x99\xCC\xFF\xEC\x99 f ݻwf 33ff\xFE\x99\xFF̙\xFD\xFF\xFD \xCC\xFF\xFF\xEC\xCC f ݻwf 3ff\x99\xFE\xCC\xFF\xFF \xCC\xFD T\xFD f\xDD\xEE\xECfU\xEE\x88f3 "\xFE3\xFDf\xEE\xDDf\xFD \xFD\xFF\x99\xDD\xEE\xEC\x99 U\xEE\x88f3 "33ff\xFE\x99\xEEݙ\xFD\xFF\xFD \xCC\xDD\xEE\xEC\xCC
-U\xEE\x88f3 "ff\x99\xFD\xCC\xEE\xDD\xCC\xFD W\xFD f\xFF\xCC\xEDf3 ݻwU \xFE3\xFCf\xCC\xEEf\xFD \xFD\xFF\x99\xFF\xFF\xED\x99 f ݻwU 33ff\xFD\x99\xFF\xEE\x99\xFD\xFF\xFD \xCC\xFF\xFF\xED\xCC \x99 ݻwU 3ff\x99\x99\xFE\xCC\xFF\xEE\xCC\xFD V\xFD f\xFF\xCC\xEDf
-U\xEE\x88f3 " 33\xFCf\xCC\xEEf\xFD \xFD\xFF\x99\xFF\xCC\xED\x99
-U\xEE\x88f3 "3ff\xFC\x99\xCC\xEE\x99\xFD\xFF\xFD \xCC\xFF\xFF\xED\xCC
-U\xEE\x88f3 "ff\x99\x99\xFD\xCC\xFF\xEE\xCC\xFD W\xFD f\xFF\xDD\xEDf
- ̻fU D33\xFCf\xCC\xFFf\xFD \xFD\xFF\x99\xFF\xDD\xEE\x99 f ̻fU 3Dff\xFC\x99\xFF\xFF \x99\xFD\xFF\xFD \xCC\xFF\xDD\xEE\xCC\x99 ̻fU 3Df\x99\xFC\xCC\xFF\xFF \xCC\xFD V\xFD f\xEE\xCC\xEEf"D\xEE\x88f3 "\xFE3\xFBf\xDD\xEEf\xFD \xFD\xFF\x99\xEE\xFF\xEE\x99 "D\xEE\x88f3 "33ff\xFC\x99\xDD\xEE\x99\xFD\xFF\xFD \xCC\xEE\xFF\xEE\xCC"D \xEE\x88f3 "ff\x99\x99\xFC\xCC\xDD\xEE\xCC\xFD V\xFD f\xCC\xEE\xEFf3 \xC0\xBBfU \xFE3\xFAf\xEE\xCCf\xFD \xFD\xFF\x99\xCC\xEE\xEF\x99 f \xC0\xBBfU 33ff\xFB\x99\xEE̙\xFD\xFF\xFD \xCC\xFF\xEE\xEF\xCC\x99 \xC0\xBBfU 3ff\x99\xFB\xCC\xEE\xFF\xCC\xFD V\xFD f\xCC\xFF\xEFf
-"D݈f3 " 33\xFAf\xFF\x99f\xFD \xFD\xFF\x99\xCC\xFF\xEF\x99
-"D݈f3 "3ff\xFA\x99\xFF̙\xFD\xFF\xFD \xFF\xCC \xFF\xEF\xCC"D\xDD\x88f3 "ff\x99\x99\xFB\xCC\xFF\xCC\xCC\xFD Y\xFD f\x99\xFF\x99\xF0f \xBB\xBBfD \xFE3f3\xFCf\x99\xFF\x99f\xFD \xFD\xFF\x99\xCC\xFF\xEF\x99
- \xBB\xBBfD 33ff\xFA\x99\xFF\x99\x99\xFD\xFF\xFD \xFF\xCC \xFF\xF0\xCC\x99 \xBB\xBBfD 3ff\x99\xFA\xCC\xFF\xCC\xCC\xFD U\xFC f\xFF\x99\xF1f\xFF3݈f3 \xFE3\xFAf\x99\xFFf\xFC \xFC\xFF\x99\xFF\xCC\xF1\x99\xFF3݈f3 3\xFEf\xFB\x99\xCC\xFF\x99\xFC\xFF\xFC \xCC\xFF\xFF\xF1\xCC\xFF3݈f3 33f\x99\x99\xFB\xCC\xFF\xFF \xCC\xFC U\xFC f\xCC\xEE\xF2f3 \xBB\xBBfD \xFE3\xF9f\xEE\xDDf\xFC \xFC\xFF\x99\xCC\xEE\xF2\x99 f \xBB\xBBfD 33ff\xFA\x99\xEEݙ\xFC\xFF\xFC \xCC\xFF\xEE\xF1\xCC \xBB\xBBfD 3ff\x99\xFA\xCC\xEE\xDD\xCC\xFC Y\xFC f\x99\xFF\x99\xF3f\xFF"\xEE\x88U3 " 33\xFAf\x99\xFFff\xFC \xFC\xFF\x99\xCC\xFF\xCC\xF3\x99\xFF"\xEE\x88U3 "3ff\xF9\x99\xFF̙\xFC\xFF\xFC \xFF\xCC \xFF\xF2\xCC\xFF"\xEE\x88U3 "ff\x99\x99\xFA\xCC\xFF\xCC\xCC\xFC V\xFB f\xEE\xCC\xF3f \xAA\xC0fD \xFE3f3\xFBf\xCC\xEEf\xFB \xFB\xFF\x99\xEE\xCC\xF3\x99 \xAA\xC0fD 33\xFEf\xFB\x99\xFF\xEE\x99\xFB\xFF\xFB \xCC\xEE\xFF\xF3\xCC \xAA\xC0fD 3ff\x99\xFA\xCC\xFF\xEE\xCC\xFB Y\xFB f\x99\xFF\x99\xF5f3 \x88wU3 \xFE3\xFAf\x99\xEE\x99f\xFB \xFB\xFF\x99\xCC\xFF\xCC\xF5\x99f \x88wU3 \xFE3 f\xFA\x99\xCC\xEE̙\xFB\xFF\xFB \xCC\xFF\xFF\xF4\xCCf \x88wU3 33f\x99\x99\xFA\xCC\xEE\xFF\xCC\xFB S\xFA f\xEE\xEE\xF5f3 \x88fD \xFE3\xF9f\xFF\xEE f\xFA \xFA\xFF\x99\xEE\xEE\xF5\x99
-f \x88fD 33ff\xFA\x99\xFF\xEE \x99\xFA\xFF\xFA \xCC\xEE\xEE\xF5\xCCf \x88fD 3ff\x99\xFA\xCC\xFF\xEE \xCC\xFA W\xFA \xFFf\xFF\xCC\xF6f3fU" " \xFE3\xFBf\xCC\xFFff\xFA \xFA\xFF\xFF\x99\xFF\xCC\xF6\x99 3fU" "3ff\xFA\x99\xCC\xFF\x99\x99\xFA\xFF\xFA \xFF\xCC\xFF\xFF\xF6\xCCffU" "ff\x99\x99\xFB\xCC\xFF\xFF\xFF\xCC\xFA T\xF9 f\x99\xFF\xCC\xF7f3 f \xFE3\xFAf\xCC\xFF\x99f\xF9 \xF9\xFF\x99\xCC\xFF\xCC\xF7\x99f f 33\xFEf\xFC\x99\xCC\xFF̙\xF9\xFF\xF9 \xFF\xCC\xFF\xFF\xF7\xCC\x99 f 3ff\x99\xFB\xCC\xFF\xFF\xFF\xCC\xF9 R\xF8 f\x99\xFF\xCC\xF8f3 " \xFE3\xFBf\xCC\xFF\x99f\xF8 \xF8\xFF\x99\xCC\xFF\xCC\xF8\x99f "33ff\xFB\x99\xCC\xFF̙\xF8\xFF\xF8 \xFF\xCC \xFF\xF7\xCCf "3\xFFf\xFF\x99\xFB\xCC\xFF\xCC\xCC\xF8 O\xF7 f\xCC\xEE\xCC\xF9f" \xFC3\xFBf\xDD\xFF\x99f\xF7 \xF7\xFF\x99\xCC\xEE\xFF\xF9\x99" \xFE3\xFEf\xFC\x99\xDD\xFF̙\xF7\xFF\xF7 \xCC\xFF\xEE\xFF\xF9\xCC" 3fff\x99\x99\xFC\xCC\xDD\xFF\xFF\xCC\xF7 N\xF6 f\x99\xEE\xFF\x99\xFBf" \xFC3\xFCf\x99\xEE\xEE\x99f\xF6 \xF6\xFF\x99\xCC\xEE\xFF\xCC\xFB\x99" ff3\xFEf\xFD\x99\xCC\xEE\xEE̙\xF6\xFF\xF6 \xCC\xFF\xEE\xFF\xFA\xCC" \x99\xFEf\xFF\x99\xFC\xCC\xFF\xEE\xFF\xCC\xF6 Q\xF5 f\x99\xCC\xEE\xEE\xFCf\xFF3 f\xFE3\xFDf\x99\xCC\xFF\xEEff\xF5 \xF5\xFF\xFF\x99\xCC\xEE\xEE\xFC\x99 3\xFCf\xFD\x99\xFF\xCC\xFF\xF5\xFF\xF5 \xFF\xCC\xFF\xEE\xEE\xFC\xCC\x99f\x99\x99f\x99 \x99\xFD\xCC\xFF\xFF\xEE\xCC\xCC\xF5 M\xF4 \xFFf\x99\xEE\xFF\xFEf3f3ff\x99\x99\xFE\xEE\x99ff\xF4 \xF4\xFF\xFF\x99\xCC\xEE\xFF\xEE\xCC\xFD\x99\xFDf\xFF\x99 \xCC\xFE\xEE̙\x99\xF4\xFF\xF4 \xFF\xCC\xFF\xEE\xFF\xEE\xFF\xFD\xCC\xFD\x99\xFE\xCC\xFE\xEE\xFE\xCC\xF4 A\xF2 \xFFf\x99\xCC\xFE\xFF\xDD\xCC̙\xCC\xEE\xFE\xFF̙ff\xF2 \xF2\xFF\xFF\x99\xFF\xCC\xFE\xFF \xDD\xFD\xCC \xEE\xFE\xFF\xFF\xCC\xFF\x99\xF2\xFF\xF2 \xFE\xCC\xFD\xFF \xDD\xFD\xCC \xEE\xFD\xFF\xFE\xCC\xF2 2\xF0 \xFEf\xFF\x99 \xCC\xFE\xEE\xDD̙\xFDf\xF0 \xF0\xFF\xFD\x99\xCC\xFF\xFE\xEE\xDD\xCC\xCC\xFD\x99\xF0\xFF\xF0 \xFC\xCC \xFF\xFE\xEE\xDD\xFF\xFC\xCC\xF0 \xED \xF7f\xED \xED\xFF\xF7\x99\xED\xFF\xED \xF9\xCC\xFF\xCC\xED \xCF \xCF\xFF\xE5 \xEB \xFF \xA8\xA8 \xFF \xFF\xFE G\xFB\xCD G\xFB\xCD \xA1\xF2 8BIM Gr\x89ph\x81\x81\xAF
- \x9A \xFF\x80x G\xFB\xCD G\xFB\xCD @\xF8\xFF\xFB \xF7\xFF\xFF \xF5\xFF\xFB \xF7\xFF\xFF \xF5\xFF\xFB \xF7\xFF\xFF \xFE\xFF\xFA\xFF\xF7 \xFA\xFF\xFD \xF8\xFF\xF7 \xFA\xFF\xFD \xF8\xFF\xF7 \xFA\xFF\xFD \xFF\xFF\xFB\xFF\xF5 \xFC\xFF\xFC \xF9\xFF\xF5 \xFC\xFF\xFC \xF9\xFF\xF5 \xFC\xFF\xFC \xFF\xFF\xFC\xFF\xF3 \xFE\xFF\xFC \xF9\xFF\xF3 \xFE\xFF\xFC \xF9\xFF\xF3 \xFE\xFF\xFC \xFE\xFF\xFD\xFF\xF1 \xFF\xFC \xF9\xFF\xF1 \xFF\xFC \xF9\xFF\xF1 \xFF\xFC \xFD\xFF\xFD\xFF\xF2 \xFF\xFC \xF8\xFF\xF2 \xFF\xFC \xF8\xFF\xF2 \xFF\xFC \xFC\xFF\xFE\xFF\xF2 \xFF\xFC \xF8\xFF\xF2 \xFF\xFC \xF8\xFF\xF2 \xFF\xFC \xFB\xFF\xFE\xFF\xF3 \xFF\xFC \xF7\xFF\xF3 \xFF\xFC \xF7\xFF\xF3 \xFF\xFC \xFA\xFF\xFE\xFF\xF4 \xFF\xFC \xF6\xFF\xF4 \xFF\xFC \xF6\xFF\xF4 \xFF\xFC \xF9\xFF\xFE\xFF\xF5 \xFF\xFC \xF5\xFF\xF5 \xFF\xFC \xF5\xFF\xF5 \xFF\xFC \xF8\xFF\xFE\xFF\xF6 \xFF\xFC \xF4\xFF\xF6 \xFF\xFC \xF4\xFF\xF6 \xFF\xFC \xF7\xFF#\xFE\xFF\xF7 \xFF\xFC \xFF \xF5\xFF\xF7 \xFF\xFC \xFF \xF5\xFF\xF7 \xFF\xFC \xFF \xF8\xFF#\xFD\xFF\xF9 \xFF\xFC \xFF \xF3\xFF\xF9 \xFF\xFC \xFF \xF3\xFF\xF9 \xFF\xFC \xFF \xF7\xFF&\xFD\xFF\xF9 \xFF\xFD \xFF \xF3\xFF\xF9 \xFF\xFD \xFF \xF3\xFF\xF9 \xFF\xFD \xFF \xF7\xFF&\xFC\xFF\xFB \xFF\xFD \xFF \xF1\xFF\xFB \xFF\xFD \xFF \xF1\xFF\xFB \xFF\xFD \xFF \xF6\xFF&\xFB\xFF\xFC \xFF \xFF\xFF \xEF\xFF\xFC \xFF \xFF\xFF \xEF\xFF\xFC \xFF \xFF\xFF \xF5\xFF\xFA\xFF\xFD \xFE\xFF\xFE \xED\xFF\xFD \xFE\xFF\xFE \xED\xFF\xFD \xFE\xFF\xFE \xF4\xFF\xF8\xFF\xFB \xE9\xFF\xFB \xE9\xFF\xFB \xF2\xFF \xFF \xFF \xFF\xFE G\xFB\xCD G\xFB\xCD \xA1\xF2 8BIM Gr\x89ph\x81\x81\xAF
- \x9A \xFF\x80x G\xFB\xCD G\xFB\xCD @ \xF8 \xFBf\xF7 \xFF\xFE \xF8\xFF\xFB\x99\xF7\xFF\xFF\xFE\xFF\xF8 \xFB\xCC\xF7 \xFF\xFE %\xFA \xF7f\xF9 \xEE\xAA \xFA\xFF\xF7\x99\xFA\xFF \xEE\xAA\xFF\xFF\xFA \xF7\xCC\xF9 \xEE\xAA (\xFB \xF5f\xFB \xEE\xBB" \xFB\xFF\xF5\x99\xFC\xFF \xEE\xBB"\xFF\xFF\xFB \xF5\xCC\xFB \xEE\xBB" &\xFC \xF3f\xFD \xFF\xAA3\xFD \xFC\xFF\xF3\x99\xFE\xFF \xFF\xAA3 \xFE\xFF\xFC \xF3\xCC\xFD \xFF\xAA3\xFD %\xFD \xF1f\xFF \xEE\xBBD\xFC \xFD\xFF\xF1\x99\xFF \xEE\xBBD \xFD\xFF\xFD \xF1\xCC\xFF \xEE\xBBD\xFC "\xFD \xF1f"\xEE\xBBD\xFB \xFD\xFF\xF1\x99"\xEE\xBBD \xFC\xFF\xFD \xF1\xCC"\xEE\xBBD\xFB "\xFE \xF1f \xEE\xBBD\xFA \xFE\xFF\xF1\x99 \xEE\xBBD \xFB\xFF\xFE \xF1\xCC \xEE\xBBD\xFA "\xFE \xF2f \xEE\xBBD\xF9 \xFE\xFF\xF2\x99 \xEE\xBBD \xFA\xFF\xFE \xF2\xCC \xEE\xBBD\xF9 "\xFE \xF3f \xEE\xBBU\xF8 \xFE\xFF\xF3\x99 \xEE\xBBU \xF9\xFF\xFE \xF3\xCC \xEE\xBBU\xF8 "\xFE \xF4f \xEE\xBBU\xF7 \xFE\xFF\xF4\x99 \xEE\xBBU \xF8\xFF\xFE \xF4\xCC \xEE\xBBU\xF7 '\xFE \xF5f \xEE\xBBU f\xF8 \xFE\xFF\xF5\x99 \xEE\xBBU \x99\xF8\xFF\xFE \xF5\xCC \xEE\xBBU \xCC\xF8 *\xFE \xF6f \xEE\xC0U ff\xF8 \xFE\xFF\xF6\x99 \xEE\xC0U \x99\x99\xF8\xFF\xFE \xF6\xCC \xEE\xC0U \xCC\xCC\xF8 *\xFD \xF8f \xEE\xBBw ff\xF7 \xFD\xFF\xF8\x99 \xEE\xBBw \x99\x99\xF7\xFF\xFD \xF8\xCC \xEE\xBBw \xCC\xCC\xF7 '\xFD \xF8f \xFFU \xFEf\xF7 \xFD\xFF\xF8\x99 \xFFU \xFE\x99\xF7\xFF\xFD \xF8\xCC \xFFU \xFE\xCC\xF7 '\xFC \xFAf \xEE \xFEf\xF6 \xFC\xFF\xFA\x99 \xEE \xFE\x99\xF6\xFF\xFC \xFA\xCC \xEE \xFE\xCC\xF6 \xFB \xFBf\xFF \xFDf\xF5 \xFB\xFF\xFB\x99\xFF \xFD\x99\xF5\xFF\xFB \xFB\xCC\xFF \xFD\xCC\xF5 \xFA \xF7f\xF4 \xFA\xFF\xF7\x99\xF4\xFF\xFA \xF7\xCC\xF4 \xF8 \xFBf\xF2 \xF8\xFF\xFB\x99\xF2\xFF\xF8 \xFB\xCC\xF2 \xFF BuilderRsc.h \x8C\xE8 \xE9 H \xEA H \xF0 \xD2 H R \x90 R
- \x90 R \xD2 \x90 \x8C\xE9 \xF3 H \xF4 H \xFA \xD2 H R \x90 R \x90 R \xD2 \x90 \xE9 : \x8A $ \xFF\xFF\xFF\xFF Build , \xA0 \xA0\xFF \xE8 \xE8 \xE8tTTL\xE9tBTN
- \x80 Untitled ^1 OK 2 \xA0 \xA0\xFF \xE8 \xE8 \xE8tTTL\xE9tBTN\xEAtLBL \xEA\xEA \xFF This application let you create
-PDB files needed to use ScummVM
-on PalmOS.
-
-These files contain part of the constant
-global data used in ScummVM,
-prevent DATA SEGMENT FULL error
-when compiling and save a bit of
-dynamic heap. \xEE\xEA \xFF This application let you create the
-PDB files needed to use ScummVM
-on PalmOS.
-
-These files contain part of the constant
-global data used in ScummVM,
-prevent DATA SEGMENT FULL error
-when compiling and save a bit of
-dynamic heap.
-ScummBuilder @| ?| | _$ MBAR jMENU vPICT \x82Talt tAIN *tBTN 6tFRM NtLBL ftTTL \x96taif \xAEtver ƵMWC \xD2pref \xDE\xE8 \xE8
- \xE9 Q \xEA ' \x8B \xF0 8 \xCD \xF3 I \xC5 \xF4 Z K \xFA k \xD5 R | w R
- \x90 \xFB R \xA4 (a R \xB8 5\xE1 R \xCC 8\x8D R \xE0 \xE7 \xE9 \xF4 \x86 \xE8 =: \xE8\xFF\xFF ?k Q
- \xCD\xE7 \xBA\xE9
- <\xDF \xE8\xE8 =U L \xFE N @ O$ U
- P* \xB4h\xEA0 >y
-J\xE8\xFF\xFF o L\xFF\xFF \xEC \xE8< ;\xBF \xE9Y <O \xE8\xFF\xFF ~ @\xFF\xFF ;\xA7 \xFF\xFF =, Main Form MainOptionsLarge icon 1-bitLarge icon 2-bitLarge icon 8-bitSmall icon 1-bitSmall icon 2-bitSmall icon 8-bitLarge icon X2 1-bitLarge icon X2 2-bitLarge icon X2 8-bitSmall icon X2 1-bitSmall icon X2 8-bitSmall icon X2 2-bitRom IncompatibletestOKbuildMainAboutTitleText1Text2 Unnamed1002 Large icons (1-2 and 8 bits) Small icons (1-2 and 8 bits)
\ No newline at end of file
Deleted: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Rsc/builder.rsrc
===================================================================
Modified: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/base_event.cpp
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/base_event.cpp 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/base_event.cpp 2007-09-02 09:52:06 UTC (rev 28815)
@@ -188,7 +188,7 @@
} else if (keyCurrentState & _keyExtra.bitUp) {
_keyExtraPressed |= _keyExtra.bitUp;
- event.kbd.keycode = Common::EVENT_KEYUP;
+ event.kbd.keycode = Common::KEYCODE_UP;
} else if (keyCurrentState & _keyExtra.bitDown) {
_keyExtraPressed |= _keyExtra.bitDown;
@@ -233,7 +233,7 @@
#endif
if (ev.eType == keyUpEvent) {
- int k = 0;
+ Common::KeyCode k = Common::KEYCODE_INVALID;
switch (ev.data.keyUp.chr) {
// arrow keys
@@ -256,7 +256,7 @@
}
} else if (ev.eType == keyDownEvent) {
- int k = 0;
+ Common::KeyCode k = Common::KEYCODE_INVALID;
switch (ev.data.keyDown.chr) {
// ESC key
case vchrLaunch:
@@ -345,7 +345,7 @@
(3 * (3 * y / _screenHeight));
event.type = Common::EVENT_KEYDOWN;
- event.kbd.keycode = num;
+ event.kbd.keycode = (Common::KeyCode)num;
event.kbd.ascii = num;
event.kbd.flags = 0;
@@ -411,13 +411,8 @@
// F1 -> F10 key
if (key >= '0' && key <= '9' && mask == (Common::KBD_CTRL|Common::KBD_ALT)) {
- 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;
+ key = (key == '0') ? 324 : (315 + key - '1');
+ mask = 0;
#ifdef STDLIB_TRACE_MEMORY
// print memory
@@ -440,7 +435,7 @@
// other keys
_wasKey = true;
event.type = Common::EVENT_KEYDOWN;
- event.kbd.keycode = key;
+ event.kbd.keycode = (Common::KeyCode)key;
event.kbd.ascii = key;
event.kbd.flags = mask;
return true;
Modified: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/base_gfx.cpp
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/base_gfx.cpp 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/base_gfx.cpp 2007-09-02 09:52:06 UTC (rev 28815)
@@ -25,10 +25,6 @@
#include "be_base.h"
-#ifdef PALMOS_68K
-# include <BmpGlue.h>
-#endif
-
/*
* Graphics modes
*
@@ -144,27 +140,6 @@
WinPalette(winPaletteSet, _paletteDirtyStart, _paletteDirtyEnd - _paletteDirtyStart, _currentPalette + _paletteDirtyStart);
_paletteDirtyEnd = 0;
//_redawOSD = true;
-
-#ifdef PALMOS_68Ks
- UInt8 oldCol;
- oldCol = gVars->indicator.on;
- gVars->indicator.on = RGBToColor(0,255,0);
-
- if (oldCol != gVars->indicator.on)
- _redrawOSD = true;
-
-/* {
- // redraw if needed
- if (_lastKeyModifier)
- draw1BitGfx((kDrawKeyState + _lastKeyModifier - 1), 2, getHeight() + 2, true);
-
- if(_useNumPad)
- draw1BitGfx(kDrawNumPad, (getWidth() >> 1) - 32, getHeight() + 2, true);
-
- if (_showBatLow)
- draw1BitGfx(kDrawBatLow, (getWidth() >> 1), -16, true);
- }*/
-#endif
}
if (_redawOSD) {
_redawOSD = false;
@@ -184,11 +159,7 @@
void OSystem_PalmBase::draw_osd(UInt16 id, Int32 x, Int32 y, Boolean show, UInt8 color) {
//return;
-#ifdef PALMOS_68K
- MemHandle hTemp = DmGetResource(bitmapRsc, id);
-#else
MemHandle hTemp = DmGetResource('abmp', id + 100);
-#endif
if (hTemp) {
/*static const UInt32 pal[3] = {
@@ -201,11 +172,8 @@
bmTemp = (BitmapType *)MemHandleLock(hTemp);
Coord w, h;
-#ifdef PALMOS_68K
- BmpGlueGetDimensions(bmTemp, &w, &h, 0);
-#else
BmpGetDimensions(bmTemp, &w, &h, 0);
-#endif
+
PointType dst = { _screenOffset.x + x, _screenOffset.y + y };
RectangleType r = { dst.x, dst.y, w, h };
@@ -233,49 +201,4 @@
MemPtrUnlock(bmTemp);
DmReleaseResource(hTemp);
}
-
-/* MemHandle hTemp = DmGetResource(bitmapRsc, id);
-
- if (hTemp) {
- BitmapType *bmTemp;
- UInt32 *bmData;
- UInt8 ih, iw, ib;
- Coord w, h;
- Int16 blocks, next;
-
- UInt8 *scr = _screenP + x + _screenPitch * y;
- bmTemp = (BitmapType *)MemHandleLock(hTemp);
- bmData = (UInt32 *)BmpGetBits(bmTemp);
-
-#ifdef PALMOS_68K
- BmpGlueGetDimensions(bmTemp, &w, &h, 0);
-#else
- BmpGetDimensions(bmTemp, &w, &h, 0);
-#endif
-
- blocks = w >> 5;
- next = w - (blocks << 5);
-
- if (next)
- blocks++;
-
- for (ih = 0; ih < h; ih++) { // line
- for (ib = 0; ib < blocks; ib++) { // 32pix block
- next = w - (ib << 5);
- next = MIN(next, (Coord)32);
-
- for (iw = 0; iw < next; iw++) { // row
- *scr++ = ((*bmData & (1 << (31 - iw))) && show) ?
- gVars->indicator.on :
- gVars->indicator.off;
- }
-
- bmData++;
- }
- scr += _screenPitch - w;
- }
-
- MemHandleUnlock(hTemp);
- DmReleaseResource(hTemp);
- }*/
}
Modified: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/be_base.h
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/be_base.h 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/be_base.h 2007-09-02 09:52:06 UTC (rev 28815)
@@ -33,6 +33,7 @@
#include "common/scummsys.h"
#include "common/system.h"
#include "common/events.h"
+#include "graphics/surface.h"
namespace Audio {
class Mixer;
Modified: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/globals.h
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/globals.h 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/globals.h 2007-09-02 09:52:06 UTC (rev 28815)
@@ -29,22 +29,7 @@
#include <VFSMgr.h>
#include "stuffs.h"
-#ifdef PALMOS_68K
-
-#include "scumm_globals.h"
-
enum {
- kMemScummOldCostGames = 0,
- kMemScummNewCostGames,
- kMemSimon1Games,
- kMemSimon2Games,
-
- kMemGamesCount
-};
-
-#endif
-
-enum {
INIT_VIBRATOR = 1 << 0x00,
INIT_PA1LIB = 1 << 0x01,
INIT_ARM = 1 << 0x02,
@@ -99,20 +84,6 @@
UInt8 fmQuality;
UInt8 advancedMode;
-#ifdef PALMOS_68K
- // 68k only part
- struct {
- Boolean enable;
- UInt8 driver, format;
- UInt16 defaultTrackLength;
- UInt16 firstTrack;
- UInt8 volume;
- } CD;
-
- DmOpenRef globals[GBVARS_COUNT];
- UInt32 memory[kMemGamesCount];
-#endif
-
} GlobalsDataType, *GlobalsDataPtr;
extern GlobalsDataPtr gVars;
Modified: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/modules.cpp
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/modules.cpp 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/modules.cpp 2007-09-02 09:52:06 UTC (rev 28815)
@@ -4,7 +4,6 @@
#include "args.h"
#include "globals.h"
#include "modules.h"
-#include "extend.h"
#include "features.h"
#include "rumble.h"
@@ -21,8 +20,6 @@
GlobalsDataPtr gVars;
-#ifdef PALMOS_NATIVE
-
#include "endianutils.h"
#include <PNOLoader.h>
@@ -81,90 +78,6 @@
WinPalette(winPaletteSetToDefault, 0, 256, NULL);
}
-#else
-
-#include "stdafx.h"
-#include "base/main.h"
-#include "be_zodiac.h"
-#include "be_os5ex.h"
-
-static void palm_main(int argc, char **argvP) {
-#ifdef COMPILE_OS5
- if (gVars->advancedMode)
- g_system = new OSystem_PalmOS5Ex();
- else
- g_system = new OSystem_PalmOS5();
-#elif defined(COMPILE_ZODIAC)
- g_system = new OSystem_PalmZodiac();
-#else
- #error "No target defined."
-#endif
-
- assert(g_system);
-
- // Invoke the actual ScummVM main entry point:
- scummvm_main(argc, argvP);
-
- g_system->quit(); // TODO: Consider removing / replacing this!
-}
-
-void run(int argc, char *argv[]) {
-
- MathlibInit();
- gVars->HRrefNum = SonyHRInit(8);
- if (gVars->HRrefNum == sysInvalidRefNum)
- PalmHRInit(8);
- gVars->slkRefNum= SilkInit(&(gVars->slkVersion));
- gVars->screenPitch = StuffsGetPitch(gVars->screenFullWidth);
-
- // create file for printf, warnings, etc...
- StdioInit(gVars->VFS.volRefNum, "/PALM/Programs/ScummVM/scumm.log");
- if (gVars->indicator.showLED) StdioSetLedProc(DrawStatus);
- StdioSetCacheSize(gVars->VFS.cacheSize);
- gUnistdCWD = SCUMMVM_SAVEPATH;
-
- // init hardware
- if (HWR_INIT(INIT_GOLCD)) GoLCDInit(&gGoLcdH);
- if (HWR_INIT(INIT_PA1LIB)) Pa1libInit(gVars->palmVolume);
- if (HWR_INIT(INIT_VIBRATOR)) gVars->vibrator = RumbleInit();
- PalmInit(HWR_GET());
-
- if (!gVars->vibrator)
- HWR_RST(INIT_VIBRATOR);
-
- GlbOpen();
- // be sure to have a VG
- void *__ptr = StuffsForceVG();
-
- DO_EXIT( palm_main(argc, argv); )
-
- // be sure to release features memory
- FREE_FTR(ftrBufferOverlay)
- FREE_FTR(ftrBufferBackup)
- FREE_FTR(ftrBufferHotSwap)
-
- StuffsReleaseVG(__ptr);
- GlbClose();
-
- PalmRelease(HWR_GET());
- if (HWR_INIT(INIT_VIBRATOR)) RumbleRelease();
- if (HWR_INIT(INIT_PA1LIB)) Pa1libRelease();
- if (HWR_INIT(INIT_GOLCD)) GoLCDRelease(gGoLcdH);
-
- // close log file
- StdioRelease();
-
- PalmHRRelease();
- SonyHRRelease(gVars->HRrefNum);
- SilkRelease(gVars->slkRefNum);
- MathlibRelease();
-
- MemPtrFree(gVars);
- WinPalette(winPaletteSetToDefault, 0, 256, NULL);
-// ArgsFree(argvP); // called in main(...)
-}
-#endif
-
static UInt32 ModulesPalmMain(UInt16 cmd, MemPtr cmdPBP, UInt16 launchFlags)
{
UInt32 result = 0;
Modified: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/native/oscalls.cpp
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/native/oscalls.cpp 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/native/oscalls.cpp 2007-09-02 09:52:06 UTC (rev 28815)
@@ -60,3 +60,15 @@
PACE_PIN_EXEC_NP(pinSysGetOrientation, UInt16)
}
+PACE_CLASS_WRAPPER(Err)
+ __68k_SysSetOrientationTriggerState(UInt16 triggerState) {
+ PACE_PARAMS_INIT()
+ PACE_PARAMS_ADD16(triggerState)
+ PACE_PARAMS_END()
+ PACE_PIN_EXEC(pinSysSetOrientationTriggerState, Err)
+}
+
+PACE_CLASS_WRAPPER(UInt16)
+ __68k_SysGetOrientationTriggerState(void) {
+ PACE_PIN_EXEC_NP(pinSysGetOrientationTriggerState, UInt16)
+}
Modified: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/native/oscalls.h
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/native/oscalls.h 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/native/oscalls.h 2007-09-02 09:52:06 UTC (rev 28815)
@@ -41,6 +41,8 @@
Err __68k_PINSetInputAreaState(UInt16 state);
Err __68k_SysSetOrientation(UInt16 orientation);
UInt16 __68k_SysGetOrientation(void);
+Err __68k_SysSetOrientationTriggerState(UInt16 triggerState);
+UInt16 __68k_SysGetOrientationTriggerState(void);
#ifdef __cplusplus
}
Modified: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/os5_gfx.cpp
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/os5_gfx.cpp 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/os5_gfx.cpp 2007-09-02 09:52:06 UTC (rev 28815)
@@ -72,6 +72,7 @@
if (OPTIONS_TST(kOptModeRotatable)) {
_sysOldOrientation = __68K(SysGetOrientation());
__68K(SysSetOrientation(sysOrientationLandscape));
+ __68K(SysSetOrientationTriggerState(sysOrientationTriggerDisabled));
}
gVars->indicator.on = RGBToColor(0,255,0);
Modified: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/os5_overlay.cpp
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/os5_overlay.cpp 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/os5_overlay.cpp 2007-09-02 09:52:06 UTC (rev 28815)
@@ -80,9 +80,6 @@
}
void OSystem_PalmOS5::colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b) {
-#ifdef PALMOS_68K
- color = SWAP_BYTES_16(color);
-#endif
r = ((color >> 8) & 0xF8);
g = ((color >> 3) & 0xFC);
b = ((color << 3) & 0xF8);
Modified: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/os5_sound.cpp
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/os5_sound.cpp 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/os5_sound.cpp 2007-09-02 09:52:06 UTC (rev 28815)
@@ -97,18 +97,12 @@
sndOutput,
sndFormatPCM,
_samplesPerSec,
-#ifdef PALMOS_68K
- sndInt16Big,
-#else
sndInt16Little,
-#endif
sndStereo,
sound_callback(),
&_soundEx,
8192
-#ifdef PALMOS_68K
- ,false
-#elif defined (COMPILE_OS5)
+#ifdef COMPILE_OS5
,true
#endif
);
Deleted: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/palm-scumm-md5.h
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/palm-scumm-md5.h 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/palm-scumm-md5.h 2007-09-02 09:52:06 UTC (rev 28815)
@@ -1,9 +0,0 @@
-
-struct MD5Table {
- const char md5[32 + 1];
- const char target[16 + 1];
- Common::Language language;
- Common::Platform platform;
-};
-
-static const MD5Table *md5table;
\ No newline at end of file
Deleted: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_agi.h
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_agi.h 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_agi.h 2007-09-02 09:52:06 UTC (rev 28815)
@@ -1,9 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "compile.h"
-#undef DISABLE_AGI
-
-#define PALMOS_68K
-
-#endif
Deleted: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_agos.h
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_agos.h 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_agos.h 2007-09-02 09:52:06 UTC (rev 28815)
@@ -1,9 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "compile.h"
-#undef DISABLE_AGOS
-
-#define PALMOS_68K
-
-#endif
Deleted: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_cine.h
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_cine.h 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_cine.h 2007-09-02 09:52:06 UTC (rev 28815)
@@ -1,9 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "compile.h"
-#undef DISABLE_CINE
-
-#define PALMOS_68K
-
-#endif
Deleted: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_gob.h
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_gob.h 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_gob.h 2007-09-02 09:52:06 UTC (rev 28815)
@@ -1,9 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "compile.h"
-#undef DISABLE_GOB
-
-#define PALMOS_68K
-
-#endif
Deleted: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_kyra.h
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_kyra.h 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_kyra.h 2007-09-02 09:52:06 UTC (rev 28815)
@@ -1,9 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "compile.h"
-#undef DISABLE_KYRA
-
-#define PALMOS_68K
-
-#endif
Deleted: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_lure.h
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_lure.h 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_lure.h 2007-09-02 09:52:06 UTC (rev 28815)
@@ -1,9 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "compile.h"
-#undef DISABLE_LURE
-
-#define PALMOS_68K
-
-#endif
Deleted: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_queen.h
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_queen.h 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_queen.h 2007-09-02 09:52:06 UTC (rev 28815)
@@ -1,9 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "compile.h"
-#undef DISABLE_QUEEN
-
-#define PALMOS_68K
-
-#endif
Deleted: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_saga.h
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_saga.h 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_saga.h 2007-09-02 09:52:06 UTC (rev 28815)
@@ -1,9 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "compile.h"
-#undef DISABLE_SAGA
-
-#define PALMOS_68K
-
-#endif
Deleted: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_scumm.h
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_scumm.h 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_scumm.h 2007-09-02 09:52:06 UTC (rev 28815)
@@ -1,12 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "compile.h"
-#undef DISABLE_SCUMM
-//#undef DISABLE_SCUMM_7_8
-//#undef DISABLE_HE
-
-#define PALMOS_68K
-//#define PALMOS_DEBUG
-
-#endif
Deleted: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_sky.h
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_sky.h 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_sky.h 2007-09-02 09:52:06 UTC (rev 28815)
@@ -1,9 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "compile.h"
-#undef DISABLE_SKY
-
-#define PALMOS_68K
-
-#endif
Deleted: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_sword1.h
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_sword1.h 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_sword1.h 2007-09-02 09:52:06 UTC (rev 28815)
@@ -1,9 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "compile.h"
-#undef DISABLE_SWORD1
-
-#define PALMOS_68K
-
-#endif
Deleted: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_sword2.h
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_sword2.h 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/68k_sword2.h 2007-09-02 09:52:06 UTC (rev 28815)
@@ -1,9 +0,0 @@
-#ifndef PREFIX_H
-#define PREFIX_H
-
-#include "compile.h"
-#undef DISABLE_SWORD2
-
-#define PALMOS_68K
-
-#endif
Modified: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/compile.h
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/compile.h 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/compile.h 2007-09-02 09:52:06 UTC (rev 28815)
@@ -45,6 +45,7 @@
#define DISABLE_TOUCHE
#define DISABLE_PARALLACTION
#define DISABLE_CRUISE
+#define DISABLE_DRASCULA
// ScummVM
#define DISABLE_HQ_SCALERS
Copied: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/native_drascula.h (from rev 28814, scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_drascula.h)
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/native_drascula.h (rev 0)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/native_drascula.h 2007-09-02 09:52:06 UTC (rev 28815)
@@ -0,0 +1,7 @@
+#ifndef PREFIX_H
+#define PREFIX_H
+
+#include "native_common.h"
+#undef DISABLE_DRASCULA
+
+#endif
Modified: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/native_scumm.h
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/native_scumm.h 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/prefixes/native_scumm.h 2007-09-02 09:52:06 UTC (rev 28815)
@@ -6,4 +6,7 @@
#undef DISABLE_SCUMM_7_8
#undef DISABLE_HE
+#define USE_ARM_GFX_ASM
+#define USE_ARM_SMUSH_ASM
+
#endif
Deleted: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/scumm_globals.cpp
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/scumm_globals.cpp 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/scumm_globals.cpp 2007-09-02 09:52:06 UTC (rev 28815)
@@ -1,156 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include <PalmOS.h>
-
-#include "palmdefs.h"
-#include "globals.h"
-#include "scumm_globals.h"
-
-static void GlbInitAll() {
- if (gVars->globals[GBVARS_COMMON]) {
- CALL_INIT(ScummFont)
- }
- if (gVars->globals[GBVARS_ENGINE]) {
-#ifndef DISABLE_SCUMM
-# ifndef DISABLE_SCUMM_7_8
- CALL_INIT(DimuseTables)
- CALL_INIT(DimuseCodecs)
- CALL_INIT(Codec47)
-# endif
- CALL_INIT(Akos)
- CALL_INIT(Gfx)
- CALL_INIT(Dialogs)
- CALL_INIT(Charset)
- CALL_INIT(Costume)
- CALL_INIT(PlayerV2)
- CALL_INIT(Scumm_md5table)
-#endif
-#ifndef DISABLE_AGOS
- CALL_INIT(AGOS_AGOS)
- CALL_INIT(AGOS_Cursor)
- CALL_INIT(AGOS_Charset)
-#endif
-#ifndef DISABLE_SKY
- CALL_INIT(Sky_Hufftext)
-#endif
-#ifndef DISABLE_SWORD1
- CALL_INIT(Sword1_fxList)
-#endif
-#ifndef DISABLE_QUEEN
- CALL_INIT(Queen_Talk)
- CALL_INIT(Queen_Display)
- CALL_INIT(Queen_Graphics)
- CALL_INIT(Queen_Restables)
- CALL_INIT(Queen_Musicdata)
-#endif
- }
-}
-
-static void GlbReleaseAll() {
- if (gVars->globals[GBVARS_COMMON]) {
- CALL_RELEASE(ScummFont)
-
- }
- if (gVars->globals[GBVARS_SCUMM]) {
-#ifndef DISABLE_SCUMM
-# ifndef DISABLE_SCUMM_7_8
- CALL_RELEASE(DimuseTables)
- CALL_RELEASE(DimuseCodecs)
- CALL_RELEASE(Codec47)
-# endif
- CALL_RELEASE(Akos)
- CALL_RELEASE(Gfx)
- CALL_RELEASE(Dialogs)
- CALL_RELEASE(Charset)
- CALL_RELEASE(Costume)
- CALL_RELEASE(PlayerV2)
- CALL_RELEASE(Scumm_md5table)
-#endif
-#ifndef DISABLE_AGOS
- CALL_RELEASE(AGOS_AGOS)
- CALL_RELEASE(AGOS_AGOS)
- CALL_RELEASE(AGOS_AGOS)
-#endif
-#ifndef DISABLE_SKY
- CALL_RELEASE(Sky_Hufftext)
-#endif
-#ifndef DISABLE_SWORD1
- CALL_RELEASE(Sword1_fxList)
-#endif
-#ifndef DISABLE_QUEEN
- CALL_RELEASE(Queen_Talk)
- CALL_RELEASE(Queen_Display)
- CALL_RELEASE(Queen_Graphics)
- CALL_RELEASE(Queen_Restables)
- CALL_RELEASE(Queen_Musicdata)
-#endif
- }
-}
-
-//TODO : use Boolean instead of void to check err
-static DmOpenRef GlbOpenInternal(const Char *nameP) {
- LocalID dbID = DmFindDatabase(0, nameP);
- if (dbID) {
- UInt32 dbType, dbCreator;
- Err e = DmDatabaseInfo(0, dbID, 0, 0, 0, 0, 0, 0, 0, 0, 0, &dbType, &dbCreator);
-
- if (!e && dbType == 'GLBS' && dbCreator == appFileCreator)
- return DmOpenDatabase(0, dbID, dmModeReadOnly);
- }
- return NULL;
-}
-
-void GlbOpen() {
- gVars->globals[GBVARS_COMMON] = GlbOpenInternal("Glbs::Common");
- gVars->globals[GBVARS_ENGINE] = GlbOpenInternal("Glbs::Engine");
- GlbInitAll();
-}
-
-void GlbClose() {
- GlbReleaseAll();
-
- if (gVars->globals[GBVARS_COMMON])
- DmCloseDatabase(gVars->globals[GBVARS_COMMON]);
- if (gVars->globals[GBVARS_ENGINE])
- DmCloseDatabase(gVars->globals[GBVARS_ENGINE]);
-}
-
-void *GlbGetRecord(UInt16 index, UInt16 id) {
- if (gVars->globals[id]) {
- MemHandle recordH = DmQueryRecord(gVars->globals[id], index);
- if (recordH)
- return MemHandleLock(recordH);
- }
- return NULL;
-}
-
-void GlbReleaseRecord(UInt16 index, UInt16 id) {
- if (gVars->globals[id]) {
- MemHandle recordH = DmQueryRecord(gVars->globals[id], index);
- if (recordH)
- MemHandleUnlock(recordH);
- }
-}
Deleted: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/scumm_globals.h
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/scumm_globals.h 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/scumm_globals.h 2007-09-02 09:52:06 UTC (rev 28815)
@@ -1,92 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef __SCUMM_GLOBALS_H__
-#define __SCUMM_GLOBALS_H__
-
-#include "builder/enum_globals.h"
-
-void *GlbGetRecord(UInt16 index, UInt16 id);
-void GlbReleaseRecord(UInt16 index, UInt16 id);
-void GlbOpen();
-void GlbClose();
-
-
-#define _GINIT(x) void initGlobals_##x() {
-#define _GEND }
-#define _GRELEASE(x) void releaseGlobals_##x() {
-
-#define CALL_INIT(x) initGlobals_##x();
-#define CALL_RELEASE(x) releaseGlobals_##x();
-
-#define _GSETPTR(var,index,format,id) var = (format *)GlbGetRecord(index,id);
-#define _GRELEASEPTR(index,id) GlbReleaseRecord(index,id);
-
-#define PROTO_GLOBALS(x) void CALL_INIT(x);\
- void CALL_RELEASE(x);
-
-
-// Common stuffs
-PROTO_GLOBALS(ScummFont)
-
-// Scumm stuffs
-#ifndef DISABLE_SCUMM
-PROTO_GLOBALS(DimuseTables)
-PROTO_GLOBALS(Akos)
-PROTO_GLOBALS(DimuseCodecs)
-PROTO_GLOBALS(Codec47)
-PROTO_GLOBALS(Gfx)
-PROTO_GLOBALS(Dialogs)
-PROTO_GLOBALS(Charset)
-PROTO_GLOBALS(Costume)
-PROTO_GLOBALS(PlayerV2)
-PROTO_GLOBALS(Scumm_md5table)
-#endif
-// AGOS stuffs
-#ifndef DISABLE_AGOS
-PROTO_GLOBALS(AGOS_AGOS)
-PROTO_GLOBALS(AGOS_Cursor)
-PROTO_GLOBALS(AGOS_Charset)
-#endif
-// Sky stuffs
-#ifndef DISABLE_SKY
-PROTO_GLOBALS(Sky_Hufftext)
-#endif
-// Queen stuffs
-#ifndef DISABLE_QUEEN
-PROTO_GLOBALS(Queen_Talk)
-PROTO_GLOBALS(Queen_Display)
-PROTO_GLOBALS(Queen_Graphics)
-PROTO_GLOBALS(Queen_Restables)
-PROTO_GLOBALS(Queen_Musicdata)
-#endif
-// Sword1 stuffs
-#ifndef DISABLE_SWORD1
-PROTO_GLOBALS(Sword1_fxList)
-#endif
-
-#undef PROTO_GLOBALS
-
-#endif
Modified: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/zodiac_event.cpp
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/zodiac_event.cpp 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/zodiac_event.cpp 2007-09-02 09:52:06 UTC (rev 28815)
@@ -74,7 +74,7 @@
// skip text
case vchrActionDown:
event.type = Common::EVENT_KEYDOWN;
- event.kbd.keycode = '.';
+ event.kbd.keycode = Common::KEYCODE_PERIOD;
event.kbd.ascii = '.';
event.kbd.flags = 0;
return true;
Modified: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/zodiac_gfx.cpp
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/zodiac_gfx.cpp 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/zodiac_gfx.cpp 2007-09-02 09:52:06 UTC (rev 28815)
@@ -27,9 +27,6 @@
#include "common/config-manager.h"
#include "rumble.h"
-#ifdef PALMOS_68K
-#define _TwGfxOpen(x, y) TwGfxOpen((TwGfxHandle*)x, y);
-#else
static asm Err _TwGfxOpen(void **aResult, void *aInfoResult) {
stmfd sp!, {r4-r11,lr}
ldr r9, [r9]
@@ -39,7 +36,6 @@
mov r7, r1
ldr pc, =0x200995F0
}
-#endif
int OSystem_PalmZodiac::getDefaultGraphicsMode() const {
return GFX_WIDE;
@@ -71,6 +67,7 @@
_sysOldOrientation = SysGetOrientation();
SysSetOrientation(sysOrientationLandscape);
+ SysSetOrientationTriggerState(sysOrientationTriggerDisabled);
gVars->indicator.on = RGBToColor(0,255,0);
gVars->indicator.off = RGBToColor(0,0,0);
Modified: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/zodiac_overlay.cpp
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/zodiac_overlay.cpp 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/Src/zodiac_overlay.cpp 2007-09-02 09:52:06 UTC (rev 28815)
@@ -71,9 +71,6 @@
}
void OSystem_PalmZodiac::colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b) {
-#ifdef PALMOS_68K
- color = SWAP_BYTES_16(color);
-#endif
r = ((color >> 8) & 0xF8);
g = ((color >> 3) & 0xFC);
b = ((color << 3) & 0xF8);
Copied: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/arm.bat (from rev 28814, scummvm/trunk/backends/platform/PalmOS/arm.bat)
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/arm.bat (rev 0)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/arm.bat 2007-09-02 09:52:06 UTC (rev 28815)
@@ -0,0 +1,3 @@
+as.exe ../../../sound/rate_arm_asm.s -o Obj/rate_arm_asm.o
+as.exe ../../../engines/scumm/gfxARM.s -o Obj/gfxARM.o
+as.exe ../../../engines/scumm/smush/codec47ARM.s -o Obj/codec47ARM.o
Modified: scummvm/branches/gsoc2007-mixer/backends/platform/PalmOS/scummvm.mcp
===================================================================
(Binary files differ)
Modified: scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/makefile
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/makefile 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/makefile 2007-09-02 09:52:06 UTC (rev 28815)
@@ -5,12 +5,14 @@
# Select the build you want by uncommenting one of the following lines:
-#DS_BUILD_A = 1
+DS_BUILD_A = 1
#DS_BUILD_B = 1
#DS_BUILD_C = 1
-DS_BUILD_D = 1
+#DS_BUILD_D = 1
#DS_BUILD_E = 1
#DS_BUILD_F = 1
+#DS_BUILD_E = 1
+#DS_BUILD_F = 1
# Uncomment the following line to build in support for MP3 audio
# using libmad:
@@ -38,6 +40,7 @@
# Command to build libmad is:
# ./configure --host=arm-elf --enable-speed --enable-sso -enable-fpm=arm CFLAGS='-specs=ds_arm9.specs -mthumb-interwork'
+USE_ARM_SOUND_ASM = 1
ARM = 1
ifdef DS_BUILD_A
@@ -249,7 +252,7 @@
POST_OBJS_FLAGS = -Wl,--no-whole-archive
endif
-PORT_OBJS := $(portdir)/source/blitters.o $(portdir)/source/cdaudio.o $(portdir)/source/dsmain.o \
+PORT_OBJS := $(portdir)/source/blitters_arm.o $(portdir)/source/cdaudio.o $(portdir)/source/dsmain.o \
$(portdir)/../../../fs/ds/ds-fs.o $(portdir)/source/gbampsave.o $(portdir)/source/scummhelp.o\
$(portdir)/source/osystem_ds.o $(portdir)/source/portdefs.o $(portdir)/source/ramsave.o\
$(portdir)/source/scummconsole.o $(portdir)/source/touchkeyboard.o $(portdir)/source/zipreader.o\
@@ -423,8 +426,8 @@
#---------------------------------------------------------------------------------
%.nds: %.bin
- @echo ndstool -c $@ -9 scummvm.bin $(ARM7BIN) -b ../../$(LOGO) "$(shell basename $@);ScummVM 0.10.0;DS Port"
- ndstool -c $@ -9 scummvm.bin $(ARM7BIN) -b ../../$(LOGO) "$(shell basename $@);ScummVM 0.10.0;DS Port"
+ @echo ndstool -c $@ -9 scummvm.bin $(ARM7BIN) -b ../../$(LOGO) "$(shell basename $@);ScummVM 0.11.0;DS Port"
+ ndstool -c $@ -9 scummvm.bin $(ARM7BIN) -b ../../$(LOGO) "$(shell basename $@);ScummVM 0.11.0;DS Port"
dsbuild $@ -l ../ndsloader.bin
padbin 16 $(basename $@).ds.gba
Modified: scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/source/blitters.cpp
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/source/blitters.cpp 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/source/blitters.cpp 2007-09-02 09:52:06 UTC (rev 28815)
@@ -1,7 +1,9 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2005-2006 Neil Millstone
- * Copyright (C) 2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
*
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
Modified: scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/source/dsmain.cpp
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/source/dsmain.cpp 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/source/dsmain.cpp 2007-09-02 09:52:06 UTC (rev 28815)
@@ -21,17 +21,6 @@
*/
-// - Turn off when quit - Done
-// - Simon and Kyrandia - Done
-// - 200% scale option - Done
-// - Change zoom range - Done
-// - Speed increase! - Done
-// - Fixed bugs in Sky - Done
-// - Change name of ini file and intro screen for build c - Done
-// - Check for existance of zip file in batch file - Done
-// - Add new support - Done
-// - Fix help screen
-
// - Remove scummconsole.c
// - Delete files
// - Fatlib conversion?
@@ -39,39 +28,16 @@
// - libcartreset
// - Alternative controls - tap for left click, double for right
// - Inherit the Earth?
-// - New Supercard, M3 drivers?
// - Stereo audio?
// - Delete saves?
// - Software scaler?
-// - 100% scale
-// - Arrow keys cause key events when keyboard enabled - Done
-// - Mouse cursor display - Done
-// - Disable scaler on options menu - Done
-// - Fix scale icons on top screen - Done
-// - Fseek optimisation? - No need
-// - Fix agi hack to be cleaner - done
-// - Fix not typing looong words - Done
-// - Show keyboard by default in AGI games
-// - Fix mouse moving when cursor on keyboard screen - Done
-// - Fix 'fit' thingy always appearing - Done
-// - check cine backbuffer code - Done
-// - Add long filename support - Done
-// - New icons
-// - Add key config for gob engine: Start:F1, Shift-numbers: F keys - Done
-// - Fix [ds] appearing in game menu
+// - Alternative controls?
-// - Find out what's going wrong when you turn the console off
-// - enable console when asserting
-// - AGI: Adding keyboard hack
-// - CINE: Framebuffer modification should check if it works without, fix for overwrite crash
-// - KYRA: GetFileSize modification
+#define USE_LIBCARTRESET
-//#define USE_LIBCARTRESET
-//#define USE_BUILT_IN_DRIVER_SELECTION
-
#include <nds.h>
//#include <ARM9/console.h> //basic print funcionality
@@ -102,7 +68,7 @@
#include "cartreset_nolibfat.h"
#include "keys.h"
#include "profiler/cyg-profile.h"
-//test
+#include "blitters.h"
namespace DS {
@@ -245,7 +211,7 @@
{"sky", CONT_SKY},
{"simon1", CONT_SIMON},
{"simon2", CONT_SIMON},
- {"gob", CONT_GOBLINS},
+ {"gob1", CONT_SCUMM_ORIGINAL},
{"queen", CONT_SCUMM_ORIGINAL},
{"cine", CONT_FUTURE_WARS},
{"agi", CONT_AGI}
@@ -441,7 +407,7 @@
//strcpy(gameName, ConfMan.getActiveDomain().c_str());
strcpy(gameName, ConfMan.get("gameid").c_str());
- //consolePrintf("\n\n\n\nCurrent game: '%s' %d\n", gameName, gameName[0]);
+ consolePrintf("\n\n\n\nCurrent game: '%s' %d\n", gameName, gameName[0]);
currentGame = &gameList[0]; // Default game
@@ -962,25 +928,25 @@
if ((getKeysChanged() & KEY_UP)) {
event.type = getKeyEvent(KEY_UP);
- event.kbd.keycode = '8';
+ event.kbd.keycode = Common::KEYCODE_8;
event.kbd.ascii = '8';
system->addEvent(event);
}
if ((getKeysChanged() & KEY_LEFT)) {
event.type = getKeyEvent(KEY_LEFT);
- event.kbd.keycode = '4';
+ event.kbd.keycode = Common::KEYCODE_4;
event.kbd.ascii = '4';
system->addEvent(event);
}
if ((getKeysChanged() & KEY_RIGHT)) {
event.type = getKeyEvent(KEY_RIGHT);
- event.kbd.keycode = '6';
+ event.kbd.keycode = Common::KEYCODE_6;
event.kbd.ascii = '6';
system->addEvent(event);
}
if ((getKeysChanged() & KEY_DOWN)) {
event.type = getKeyEvent(KEY_DOWN);
- event.kbd.keycode = '2';
+ event.kbd.keycode = Common::KEYCODE_2;
event.kbd.ascii = '2';
system->addEvent(event);
}
@@ -989,19 +955,19 @@
if ((getKeysChanged() & KEY_X)) {
event.type = getKeyEvent(KEY_X);
- event.kbd.keycode = '9';
+ event.kbd.keycode = Common::KEYCODE_9;
event.kbd.ascii = '9';
system->addEvent(event);
}
if ((getKeysChanged() & KEY_A)) {
event.type = getKeyEvent(KEY_A);
- event.kbd.keycode = '6';
+ event.kbd.keycode = Common::KEYCODE_6;
event.kbd.ascii = '6';
system->addEvent(event);
}
if ((getKeysChanged() & KEY_B)) {
event.type = getKeyEvent(KEY_B);
- event.kbd.keycode = '3';
+ event.kbd.keycode = Common::KEYCODE_3;
event.kbd.ascii = '3';
system->addEvent(event);
}
@@ -1010,19 +976,19 @@
if ((getKeysChanged() & KEY_X)) {
event.type = getKeyEvent(KEY_X);
- event.kbd.keycode = '7';
+ event.kbd.keycode = Common::KEYCODE_7;
event.kbd.ascii = '7';
system->addEvent(event);
}
if ((getKeysChanged() & KEY_A)) {
event.type = getKeyEvent(KEY_A);
- event.kbd.keycode = '4';
+ event.kbd.keycode = Common::KEYCODE_4;
event.kbd.ascii = '4';
system->addEvent(event);
}
if ((getKeysChanged() & KEY_B)) {
event.type = getKeyEvent(KEY_B);
- event.kbd.keycode = '1';
+ event.kbd.keycode = Common::KEYCODE_1;
event.kbd.ascii = '1';
system->addEvent(event);
}
@@ -1032,7 +998,7 @@
if ((getKeysChanged() & KEY_Y)) {
event.type = getKeyEvent(KEY_Y);
- event.kbd.keycode = '5';
+ event.kbd.keycode = Common::KEYCODE_5;
event.kbd.ascii = '5';
system->addEvent(event);
}
@@ -1143,7 +1109,7 @@
if (!indyFightState) {
if ((!(getKeysHeld() & KEY_L)) && (!(getKeysHeld() & KEY_R)) && (getKeysChanged() & KEY_B)) {
- event.kbd.keycode = 27;
+ event.kbd.keycode = Common::KEYCODE_ESCAPE;
event.kbd.ascii = 27;
event.kbd.flags = 0;
@@ -1168,26 +1134,26 @@
event.kbd.flags = 0;
if (getKeysChanged() & KEY_LEFT) {
- event.kbd.keycode = SDLK_LEFT;
- event.kbd.ascii = SDLK_LEFT;
+ event.kbd.keycode = Common::KEYCODE_LEFT;
+ event.kbd.ascii = 0;
event.type = getKeyEvent(KEY_LEFT);
}
if (getKeysChanged() & KEY_RIGHT) {
- event.kbd.keycode = SDLK_RIGHT;
- event.kbd.ascii = SDLK_RIGHT;
+ event.kbd.keycode = Common::KEYCODE_RIGHT;
+ event.kbd.ascii = 0;
event.type = getKeyEvent(KEY_RIGHT);
}
if (getKeysChanged() & KEY_UP) {
- event.kbd.keycode = SDLK_UP;
- event.kbd.ascii = SDLK_UP;
+ event.kbd.keycode = Common::KEYCODE_UP;
+ event.kbd.ascii = 0;
event.type = getKeyEvent(KEY_UP);
}
if (getKeysChanged() & KEY_DOWN) {
- event.kbd.keycode = SDLK_DOWN;
- event.kbd.ascii = SDLK_DOWN;
+ event.kbd.keycode = Common::KEYCODE_DOWN;
+ event.kbd.ascii = 0;
event.type = getKeyEvent(KEY_DOWN);
}
@@ -1323,8 +1289,8 @@
Common::Event event;
event.type = getKeyEvent(KEY_DOWN);
- event.kbd.keycode = '#'; // F10 or # - show hotspots
- event.kbd.ascii = '#';
+ event.kbd.keycode = Common::KEYCODE_F10; // F10 or # - show hotspots
+ event.kbd.ascii = Common::ASCII_F10;
event.kbd.flags = 0;
system->addEvent(event);
// consolePrintf("F10\n");
@@ -1337,7 +1303,7 @@
Common::Event event;
event.type = getKeyEvent(KEY_DOWN);
- event.kbd.keycode = '.'; // Full stop - skips current dialogue line
+ event.kbd.keycode = Common::KEYCODE_PERIOD; // Full stop - skips current dialogue line
event.kbd.ascii = '.';
event.kbd.flags = 0;
system->addEvent(event);
@@ -1397,6 +1363,7 @@
// consolePrintf("!!!!!F5!!!!!");
}
event.kbd.flags = 0;
+ consolePrintf("!!!!!F5!!!!!");
system->addEvent(event);
}
Modified: scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/source/dsoptions.cpp
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/source/dsoptions.cpp 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/source/dsoptions.cpp 2007-09-02 09:52:06 UTC (rev 28815)
@@ -197,7 +197,7 @@
OSystem_DS* system = OSystem_DS::instance();
event.type = Common::EVENT_KEYDOWN;
- event.kbd.keycode = 'p';
+ event.kbd.keycode = Common::KEYCODE_p;
event.kbd.ascii = 'p';
event.kbd.flags = 0;
system->addEvent(event);
Modified: scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/source/osystem_ds.cpp
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/source/osystem_ds.cpp 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/source/osystem_ds.cpp 2007-09-02 09:52:06 UTC (rev 28815)
@@ -152,7 +152,25 @@
}
}
+bool OSystem_DS::grabRawScreen(Graphics::Surface* surf) {
+ surf->create(DS::getGameWidth(), DS::getGameHeight(), 1);
+ // Ensure we copy using 16 bit quantities due to limitation of VRAM addressing
+
+
+ u16* image = (u16 *) DS::get8BitBackBuffer();
+ for (int y = 0; y < DS::getGameHeight(); y++)
+ {
+ 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 << 8 + x];
+ }
+ }
+
+ return true;
+}
+
void OSystem_DS::grabPalette(unsigned char *colors, uint start, uint num) {
// consolePrintf("Grabpalette");
@@ -325,7 +343,7 @@
// So we make it something harmless which won't cause any adverse effects.
event.type = Common::EVENT_KEYUP;
event.kbd.ascii = 0;
- event.kbd.keycode = 0;
+ event.kbd.keycode = Common::KEYCODE_INVALID;
event.kbd.flags = 0;
// consolePrintf("type: %d\n", event.type);
return false;
@@ -478,27 +496,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
- size_t imageStrideInBytes = DS::isCpuScalerEnabled()? DS::getGameWidth() : 512;
- size_t imageStrideInWords = imageStrideInBytes / 2;
u16* image = (u16 *) DS::get8BitBackBuffer();
for (int y = 0; y < DS::getGameHeight(); y++)
{
- DC_FlushRange(image + (y * imageStrideInWords), 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 * imageStrideInWords + 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);
}
@@ -524,3 +553,5 @@
return new OSystem_DS();
}
+
+
Modified: scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/source/osystem_ds.h
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/source/osystem_ds.h 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/source/osystem_ds.h 2007-09-02 09:52:06 UTC (rev 28815)
@@ -31,6 +31,7 @@
#include "backends/saves/default/default-saves.h"
#include "backends/timer/default/default-timer.h"
#include "sound/mixer.h"
+#include "graphics/surface.h"
class DSAudioMixer : public Audio::Mixer {
};
@@ -53,9 +54,12 @@
GBAMPSaveFileManager mpSaveManager;
DSAudioMixer* _mixer;
DSTimerManager* _timer;
+ Graphics::Surface _framebuffer;
+
static OSystem_DS* _instance;
+
typedef void (*SoundProc)(void *param, byte *buf, int len);
typedef int (*TimerProc)(int interval);
@@ -137,6 +141,9 @@
virtual void initBackend();
+ virtual Graphics::Surface *lockScreen();
+ virtual void unlockScreen();
+
virtual Audio::Mixer* getMixer() { return _mixer; }
virtual Common::TimerManager* getTimerManager() { return _timer; }
static int timerHandler(int t);
Modified: scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/source/touchkeyboard.cpp
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/source/touchkeyboard.cpp 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/ds/arm9/source/touchkeyboard.cpp 2007-09-02 09:52:06 UTC (rev 28815)
@@ -338,7 +338,7 @@
Common::Event event;
OSystem_DS* system = OSystem_DS::instance();
- event.kbd.keycode = autoCompleteBuffer[0];
+ event.kbd.keycode = (Common::KeyCode) autoCompleteBuffer[0];
event.kbd.ascii = autoCompleteBuffer[0];
event.type = Common::EVENT_KEYDOWN;
event.kbd.flags = 0;
@@ -402,9 +402,9 @@
if (!DS::shiftState) {
event.kbd.ascii = keys[r].character;
- event.kbd.keycode = 0;
+ event.kbd.keycode = Common::KEYCODE_INVALID;
} else {
- event.kbd.keycode = SDLK_F1 - (keys[r].character - '1');
+ event.kbd.keycode = (Common::KeyCode) (Common::KEYCODE_F1 - (keys[r].character - '1'));
event.kbd.ascii = 0;
}
@@ -416,10 +416,10 @@
event.kbd.ascii = keys[r].character;
}
- event.kbd.keycode = event.kbd.ascii;
+ event.kbd.keycode = (Common::KeyCode) event.kbd.ascii;
} else {
event.kbd.ascii = keys[r].character;
- event.kbd.keycode = keys[r].character;
+ event.kbd.keycode = (Common::KeyCode) keys[r].character;
}
Modified: scummvm/branches/gsoc2007-mixer/backends/platform/sdl/events.cpp
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/sdl/events.cpp 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/sdl/events.cpp 2007-09-02 09:52:06 UTC (rev 28815)
@@ -23,7 +23,7 @@
*
*/
-#include "backends/platform/sdl/sdl-common.h"
+#include "backends/platform/sdl/sdl.h"
#include "common/util.h"
#include "common/events.h"
Modified: scummvm/branches/gsoc2007-mixer/backends/platform/sdl/graphics.cpp
===================================================================
--- scummvm/branches/gsoc2007-mixer/backends/platform/sdl/graphics.cpp 2007-09-02 02:37:18 UTC (rev 28814)
+++ scummvm/branches/gsoc2007-mixer/backends/platform/sdl/graphics.cpp 2007-09-02 09:52:06 UTC (rev 28815)
@@ -23,7 +23,7 @@
*
*/
-#include "backends/platform/sdl/sdl-common.h"
+#include "backends/platform/sdl/sdl.h"
#include "common/util.h"
#include "graphics/font.h"
#include "graphics/fontman.h"
@@ -310,7 +310,6 @@
void OSystem_SDL::loadGFXMode() {
assert(_inited);
_forceFull = true;
- _modeFlags |= DF_UPDATE_EXPAND_1_PIXEL;
int hwW, hwH;
@@ -606,65 +605,55 @@
uint32 srcPitch, dstPitch;
SDL_Rect *lastRect = _dirtyRectList + _numDirtyRects;
@@ 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