codenotifier - ScummVM: revision 34749

Project: ScummVM

Revision: 34749

Author: tanoku

Date: 05 Oct 2008 07:21:07

Changes:

Merged several revisions from SVNMerge.
Fixed theme loading to use the new ArchiveMember class.

Original SVNMerge.py log:
=====================
Merged revisions 34686,34688-34689,34691-34698,34700-34705,34707-34713,34715-34722,34725-34727,34731-34732,34734-34738,34746 via svnmerge from
https://tanoku@scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

........
r34686 | cyx | 2008-09-29 21:09:56 +0200 (Mon, 29 Sep 2008) | 1 line

add constructor to SearchSet::Node for proper init of structure members with gcc 3.4.x (see tracker items #2120595, #2106292)
........
r34688 | cyx | 2008-09-29 22:08:26 +0200 (Mon, 29 Sep 2008) | 1 line

restrict _heXmapNum to HE versions, should fix #2135822
........
r34689 | eriktorbjorn | 2008-09-29 22:40:58 +0200 (Mon, 29 Sep 2008) | 4 lines

Since no one has come up with any better suggestion... this should fix #2123258
("COMI: Crash after video (SAN) play"). The eos() function won't return true
until we've tried to read *past* the end of the stream.
........
r34691 | tanoku | 2008-09-30 00:29:07 +0200 (Tue, 30 Sep 2008) | 1 line

Ported ZipArchive::getAllNames() implementation from GUI branch.
........
r34692 | fingolfin | 2008-09-30 11:07:03 +0200 (Tue, 30 Sep 2008) | 1 line

Order alphabetically
........
r34693 | fingolfin | 2008-09-30 11:08:17 +0200 (Tue, 30 Sep 2008) | 1 line

SAGA: Removed patchesCount from SAGAGameDescription
........
r34694 | fingolfin | 2008-09-30 11:09:39 +0200 (Tue, 30 Sep 2008) | 1 line

SCUMM HE: Use FilesystemNode::openForReading() instead of 'new Common::File' (didn't cover all instances, though)
........
r34695 | fingolfin | 2008-09-30 11:11:25 +0200 (Tue, 30 Sep 2008) | 1 line

SAGA: Forgot to commit saga.h
........
r34696 | fingolfin | 2008-09-30 11:12:02 +0200 (Tue, 30 Sep 2008) | 1 line

Added multiple new open() methods to Common::File, which make it possible to use this class as a generic convenience wrapper around all kinds of SeekableReadStream; also renamed the name() method to the less confusing getName()
........
r34697 | fingolfin | 2008-09-30 13:33:43 +0200 (Tue, 30 Sep 2008) | 1 line

cleanup
........
r34698 | tanoku | 2008-09-30 13:53:37 +0200 (Tue, 30 Sep 2008) | 1 line

Fixed functionality of ZipArchive::getAllNames(). Now it expects a possibly non-empty string list and returns the amount of new filenames added to it.
........
r34700 | fingolfin | 2008-09-30 14:27:38 +0200 (Tue, 30 Sep 2008) | 1 line

Renamed Engine::quit to Engine::shouldQuit (previously, it was easily confused with Engine::quitGame); also cleaned up engine.h a bit
........
r34701 | fingolfin | 2008-09-30 14:37:28 +0200 (Tue, 30 Sep 2008) | 1 line

cleanup
........
r34702 | fingolfin | 2008-09-30 14:38:44 +0200 (Tue, 30 Sep 2008) | 1 line

AdvancedDetector: Do not (ab)use paths to keep track of files, rather, use FSNodes -- partial (?) fix for bug #2137680
........
r34703 | fingolfin | 2008-09-30 14:58:27 +0200 (Tue, 30 Sep 2008) | 1 line

SAGA: Some code cleanup
........
r34704 | fingolfin | 2008-09-30 14:59:29 +0200 (Tue, 30 Sep 2008) | 1 line

SKY: Fix detector to not (ab)use FSNode::getPath; if you want to open a FSNode, just pass it to File::open
........
r34705 | thebluegr | 2008-09-30 15:19:14 +0200 (Tue, 30 Sep 2008) | 1 line

Fixed crash when starting IHNM, a regression from commit #34693
........
r34707 | fingolfin | 2008-09-30 17:42:19 +0200 (Tue, 30 Sep 2008) | 1 line

Fixing ConfigManager::loadConfigFile
........
r34708 | fingolfin | 2008-09-30 18:23:35 +0200 (Tue, 30 Sep 2008) | 1 line

AGI: Another case where it is better to use FSNodes directly, instead of converting them to path strings
........
r34709 | fingolfin | 2008-09-30 18:34:38 +0200 (Tue, 30 Sep 2008) | 1 line

Modified FilePluginProvider to use FSNodes (instead of raw filenames / paths) in its API
........
r34710 | fingolfin | 2008-09-30 18:38:46 +0200 (Tue, 30 Sep 2008) | 1 line

AGI: Got rid of yet another unwarranted use of FSNode::getPath
........
r34711 | fingolfin | 2008-09-30 18:53:04 +0200 (Tue, 30 Sep 2008) | 1 line

AGI: Simplify WagFileParser by not reading data into a memory stream first (this was there to improve performance on systems with slow seeking; those systems should use another approach, see scummvm-devel)
........
r34712 | thebluegr | 2008-09-30 18:55:10 +0200 (Tue, 30 Sep 2008) | 1 line

Fix crash when starting ITE, a regression from commit #34705
........
r34713 | fingolfin | 2008-09-30 19:09:41 +0200 (Tue, 30 Sep 2008) | 1 line

Fix ThemeBrowser to use FSNodes, not getPath()
........
r34715 | Kirben | 2008-10-02 16:41:50 +0200 (Thu, 02 Oct 2008) | 1 line

Correct HE version for Putt-Putt Enters the Race (French/Windows).
........
r34716 | fingolfin | 2008-10-02 18:58:59 +0200 (Thu, 02 Oct 2008) | 1 line

Renamed FilesystemNode -> FSNode
........
r34717 | fingolfin | 2008-10-02 19:08:15 +0200 (Thu, 02 Oct 2008) | 1 line

cleanup
........
r34718 | fingolfin | 2008-10-02 19:17:18 +0200 (Thu, 02 Oct 2008) | 1 line

Ignore String::deleteLastChar when called on an empty string
........
r34719 | fingolfin | 2008-10-02 19:20:21 +0200 (Thu, 02 Oct 2008) | 1 line

Fix for bug #2142743: Assertion on clicking "Theme" in Options
........
r34720 | fingolfin | 2008-10-02 19:48:01 +0200 (Thu, 02 Oct 2008) | 7 lines

Engine class changed:
- Moved initCommonGFX() && GUIErrorMessage() out of class Engine
- got rid of the _autosavePeriod member (this prevented users from
changing the autosave period during runtime)
- Got rid of an evil 'using GUI::Dialog' statement
- Clarified some Doxygen comments
........
r34721 | fingolfin | 2008-10-02 19:52:29 +0200 (Thu, 02 Oct 2008) | 1 line

Add the current dir to the global SearchSet, i.e. to SearchMan (this should fix the problems on Windows, and maybe other systems, see 'bug' #2137680)
........
r34722 | fingolfin | 2008-10-02 19:55:08 +0200 (Thu, 02 Oct 2008) | 1 line

Forgot to mention yet another Engine class change: mainMenuDialog -> openMainMenuDialog; and also forgot to commit this related file :/
........
r34725 | fingolfin | 2008-10-02 20:11:40 +0200 (Thu, 02 Oct 2008) | 1 line

typo
........
r34726 | thebluegr | 2008-10-03 00:04:34 +0200 (Fri, 03 Oct 2008) | 1 line

Merged loadHotSpotsMads() and loadHotSpotsM4()
........
r34727 | lordhoto | 2008-10-03 02:16:21 +0200 (Fri, 03 Oct 2008) | 2 lines

Fixed typos (thanks to Raziel^ for spotting them).
........
r34731 | fingolfin | 2008-10-03 18:07:57 +0200 (Fri, 03 Oct 2008) | 1 line

Fixed Engine::hasFeature to use proper types (i.e., MetaEngine::MetaEngineFeature instead of int)
........
r34732 | fingolfin | 2008-10-03 18:14:12 +0200 (Fri, 03 Oct 2008) | 1 line

SCUMM: Added french Monkey VGA variant, see bug #2129199
........
r34734 | lordhoto | 2008-10-03 18:57:40 +0200 (Fri, 03 Oct 2008) | 2 lines

Committed slightly modified patch #2034983 "Case-insensitivy and directory handling for engines".
........
r34735 | lordhoto | 2008-10-03 20:18:42 +0200 (Fri, 03 Oct 2008) | 2 lines

Check all 'kyra.dat' files in setup paths instead of only the first one found.
........
r34736 | lordhoto | 2008-10-03 20:23:57 +0200 (Fri, 03 Oct 2008) | 2 lines

Cleanup.
........
r34737 | dreammaster | 2008-10-04 13:10:25 +0200 (Sat, 04 Oct 2008) | 1 line

Bugfix to prevent NPC characters managing to walk beyond room exits without leaving the room, and thus getting stuck
........
r34738 | fingolfin | 2008-10-04 15:09:01 +0200 (Sat, 04 Oct 2008) | 1 line

Renamed some MetaEngine feature flags; removed explicit numbers from this feature flag list (nothing should rely on their specific values, anyway); added a note that Engine::hasFeature should become independant of MetaEngine::hasFeature
........
r34746 | john_doe | 2008-10-04 23:40:14 +0200 (Sat, 04 Oct 2008) | 3 lines

- Declared all stack functions as inline
- Sleep some ms after 500 opcodes to reduce CPU load
- Fixed odd bug in LGoP2 where text disappeared quickly without waiting for user input by returning 0x38 in sfShowPage
........

Files:
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/screen.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/m4/hotspot.h (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/wii/wii-fs-factory.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/ds/ds-fs-factory.h (try)
modified: /scummvm/branches/gsoc2008-gui/gui/options.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/saga/detection_tables.h (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/text_mr.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/platform/dc/dc-fs.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/touche/menu.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/gui/launcher.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/tools/credits.pl (try)
modified: /scummvm/branches/gsoc2008-gui/engines/lure/surface.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agos/script_s1.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/scene_mr.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/base/plugins.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/platform/wince/CELauncherDialog.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agos/animation.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/posix/posix-fs-factory.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/symbian/symbian-fs-factory.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/posix/posix-fs.h (try)
modified: /scummvm/branches/gsoc2008-gui/engines/queen/logic.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/lure/menu.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/platform/dc/selector.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agi/op_test.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/gui/massadd.h (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agos/gfx.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/m4/scene.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/gui/browser.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/script_lok.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/lure/game.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/ds/ds-fs.h (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/ds/ds-fs-factory.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/common/xmlparser.h (try)
modified: /scummvm/branches/gsoc2008-gui/common/file.h (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/windows/windows-fs.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/common/archive.h (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/text_hof.cpp (try)
modified: /scummvm/branches/gsoc2008-gui (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agos/verb.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/gob/sound/sound.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/gob/game_v2.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/gui_mr.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agos/input.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/saga/saga.h (try)
modified: /scummvm/branches/gsoc2008-gui/engines/saga/music.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/lol.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/windows/windows-fs-factory.h (try)
modified: /scummvm/branches/gsoc2008-gui/engines/gob/inter_v1.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/plugins/posix/posix-provider.h (try)
modified: /scummvm/branches/gsoc2008-gui/backends/platform/wince/CELauncherDialog.h (try)
modified: /scummvm/branches/gsoc2008-gui/common/archive.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agos/script_e1.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/dialogs.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/gui_hof.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/gob/mult.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/windows/windows-fs-factory.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agi/wagparser.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agi/saveload.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/scumm/smush/smush_player.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/sword2/screen.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/plugins/win32/win32-provider.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/scene_hof.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/saga/gfx.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/events/default/default-events.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/palmos/palmos-fs-factory.h (try)
modified: /scummvm/branches/gsoc2008-gui/engines/saga/rscfile.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/lure/intro.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/abstract-fs.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/saveload.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/saga/introproc_ihnm.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/sequences_lok.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/base/commandLine.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/made/scriptfuncs.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/platform/sdl/sdl.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/lure/events.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/sky/sky.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/plugins/dc/dc-provider.h (try)
modified: /scummvm/branches/gsoc2008-gui/engines/touche/touche.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/gob/inter_bargon.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/sword2/controls.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/scumm/he/resource_he.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/detection.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/sky/control.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agos/script.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agos/oracle.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/lure/scripts.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/scumm/he/cup_player_he.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/plugins/sdl/sdl-provider.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/scumm/detection.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/resource.h (try)
modified: /scummvm/branches/gsoc2008-gui/gui/theme.h (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/psp/psp-fs.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/script_mr.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/base/plugins.h (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/ps2/ps2-fs.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/saga/sndres.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/saveload_lok.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/parallaction/graphics.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/engine.h (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agos/event.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/AUTHORS (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/psp/psp-fs-factory.h (try)
modified: /scummvm/branches/gsoc2008-gui/engines/sword2/palette.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/kyra_lok.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/ps2/ps2-fs-factory.h (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/kyra_v1.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/gui/ThemeEngine.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/gui/browser.h (try)
modified: /scummvm/branches/gsoc2008-gui/engines/parallaction/disk_br.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/saga/saga.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agos/saveload.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/gob/inter.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agi/sound.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/common/md5.h (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/text.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/lure/hotspots.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/tinsel/tinsel.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/scumm/he/script_v60he.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/resource.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/sword2/animation.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/common/advancedDetector.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/saves/default/default-saves.h (try)
modified: /scummvm/branches/gsoc2008-gui/engines/sword1/control.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agos/window.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/gui_v2.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/parallaction/parallaction_br.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/sword2/resman.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/engine.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/gui/themebrowser.h (try)
modified: /scummvm/branches/gsoc2008-gui/engines/queen/talk.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/psp/psp-fs-factory.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/kyra_mr.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/tools/scumm-md5.txt (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/ps2/ps2-fs-factory.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/gob/video.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agi/detection.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agi/preagi_winnie.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/parallaction/parallaction_ns.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/gob/util.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/saga/module.mk (try)
modified: /scummvm/branches/gsoc2008-gui/common/md5.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/gob/game_v1.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/saga/detection.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/gui.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/cine/main_loop.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/lure/fights.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/scumm/actor.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agi/sound.h (try)
modified: /scummvm/branches/gsoc2008-gui/engines/parallaction/exec_ns.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/gob/inter_v2.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agi/wagparser.h (try)
modified: /scummvm/branches/gsoc2008-gui/engines/sword2/sword2.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/platform/symbian/src/SymbianOS.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/plugins/win32/win32-provider.h (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/amigaos4/amigaos4-fs.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/scumm/scumm.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/abstract-fs.h (try)
modified: /scummvm/branches/gsoc2008-gui/common/fs.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/seqplayer.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/sword1/credits.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/lure/lure.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/common/file.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agi/preagi_common.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/metaengine.h (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/amigaos4/amigaos4-fs-factory.h (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agos/script_e2.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/palmos/palmos-fs.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/platform/dc/dc.h (try)
modified: /scummvm/branches/gsoc2008-gui/engines/scumm/he/resource_he.h (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agos/subroutine.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/gob/palanim.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/sequences_hof.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/sword1/animation.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/sword1/sword1.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/gui/theme.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/gui_lok.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/plugins/posix/posix-provider.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agi/op_cmd.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/plugins/sdl/sdl-provider.h (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/staticres.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/made/script.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agos/script_ww.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/common/unzip.h (try)
modified: /scummvm/branches/gsoc2008-gui/engines/scumm/resource.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/resource_intern.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/common/fs.h (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/amigaos4/amigaos4-fs-factory.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/common/config-manager.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agi/loader_v3.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/wii/wii-fs.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/m4/hotspot.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agos/agos.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agi/preagi_troll.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/common/system.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/queen/queen.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/gob/videoplayer.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/wii/wii-fs-factory.h (try)
modified: /scummvm/branches/gsoc2008-gui/backends/saves/default/default-saves.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/palmos/palmos-fs-factory.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/gui/credits.h (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agi/cycle.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/scumm/scumm-md5.h (try)
modified: /scummvm/branches/gsoc2008-gui/gui/themebrowser.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/symbian/symbian-fs.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/posix/posix-fs.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/common/unzip.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/plugins/dc/dc-provider.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/saga/rscfile.h (try)
modified: /scummvm/branches/gsoc2008-gui/gui/massadd.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/parallaction/disk.h (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/kyra_hof.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/agi/preagi_mickey.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/common/str.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/saga/scene.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/script.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/ds/ds-fs.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/fs-factory.h (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/symbian/symbian-fs-factory.h (try)
modified: /scummvm/branches/gsoc2008-gui/backends/fs/posix/posix-fs-factory.h (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/resource_intern.h (try)
modified: /scummvm/branches/gsoc2008-gui/engines/parallaction/parallaction.cpp (try)
modified: /scummvm/branches/gsoc2008-gui/engines/kyra/kyra_v2.cpp (try)

Diff:

......	@@ -192,7 +192,7 @@
192	192	_system->initSize(960, 400);
193	193	else
194	194	_system->initSize(640, 400);
195		_vm->initCommonGFX(true);
	195	initCommonGFX(true);
196	196	_system->endGFXTransaction();
197	197	} else {
198	198	_system->beginGFXTransaction();
......	@@ -200,7 +200,7 @@
200	200	_system->initSize(640, 200);
201	201	else
202	202	_system->initSize(320, 200);
203		_vm->initCommonGFX(false);
	203	initCommonGFX(false);
204	204	_system->endGFXTransaction();
205	205	}
206	206
......	@@ -384,7 +384,7 @@
384	384	getFadeParams(palData, delay, delayInc, diff);
385	385
386	386	int delayAcc = 0;
387		while (!_vm->quit()) {
	387	while (!_vm->shouldQuit()) {
388	388	delayAcc += delayInc;
389	389
390	390	int refreshed = fadePalStep(palData, diff);
......	@@ -401,7 +401,7 @@
401	401	delayAcc &= 0xFF;
402	402	}
403	403
404		if (_vm->quit()) {
	404	if (_vm->shouldQuit()) {
405	405	setScreenPalette(palData);
406	406	if (upFunc && upFunc->isValid())
407	407	(*upFunc)();
......	@@ -750,7 +750,7 @@
750	750
751	751	int32 start, now;
752	752	int wait;
753		for (y = 0; y < h && !_vm->quit(); ++y) {
	753	for (y = 0; y < h && !_vm->shouldQuit(); ++y) {
754	754	start = (int32)_system->getMillis();
755	755	int y_cur = y;
756	756	for (x = 0; x < w; ++x) {
......	@@ -775,7 +775,7 @@
775	775
776	776	copyOverlayRegion(sx, sy, sx, sy, w, h, srcPage, dstPage);
777	777
778		if (_vm->quit()) {
	778	if (_vm->shouldQuit()) {
779	779	copyRegion(sx, sy, sx, sy, w, h, srcPage, dstPage);
780	780	_system->updateScreen();
781	781	}

......	@@ -105,9 +105,9 @@
105	105
106	106	void dump();
107	107
108		void loadHotSpotsM4(Common::SeekableReadStream* hotspotStream, int hotspotCount);
109		void loadHotSpotsMads(Common::SeekableReadStream* hotspotStream, int hotspotCount);
	108	void loadHotSpots(Common::SeekableReadStream* hotspotStream, int hotspotCount);
110	109
	110	uint32 readHotSpotInteger(Common::SeekableReadStream* hotspotStream);
111	111	private:
112	112	typedef Common::Array<HotSpot*> HotSpotArray;
113	113	HotSpotArray _hotspots;

......	@@ -858,7 +858,7 @@
858	858	BrowserDialog browser("Select directory for savegames", true);
859	859	if (browser.runModal() > 0) {
860	860	// User made his choice...
861		Common::FilesystemNode dir(browser.getResult());
	861	Common::FSNode dir(browser.getResult());
862	862	if (dir.isWritable()) {
863	863	_savePath->setLabel(dir.getPath());
864	864	} else {
......	@@ -874,7 +874,7 @@
874	874	BrowserDialog browser("Select directory for GUI themes", true);
875	875	if (browser.runModal() > 0) {
876	876	// User made his choice...
877		Common::FilesystemNode dir(browser.getResult());
	877	Common::FSNode dir(browser.getResult());
878	878	_themePath->setLabel(dir.getPath());
879	879	draw();
880	880	}
......	@@ -884,7 +884,7 @@
884	884	BrowserDialog browser("Select directory for extra files", true);
885	885	if (browser.runModal() > 0) {
886	886	// User made his choice...
887		Common::FilesystemNode dir(browser.getResult());
	887	Common::FSNode dir(browser.getResult());
888	888	_extraPath->setLabel(dir.getPath());
889	889	draw();
890	890	}
......	@@ -895,7 +895,7 @@
895	895	BrowserDialog browser("Select directory for plugins", true);
896	896	if (browser.runModal() > 0) {
897	897	// User made his choice...
898		Common::FilesystemNode dir(browser.getResult());
	898	Common::FSNode dir(browser.getResult());
899	899	_pluginsPath->setLabel(dir.getPath());
900	900	draw();
901	901	}
......	@@ -906,7 +906,7 @@
906	906	BrowserDialog browser("Select SoundFont", false);
907	907	if (browser.runModal() > 0) {
908	908	// User made his choice...
909		Common::FilesystemNode file(browser.getResult());
	909	Common::FSNode file(browser.getResult());
910	910	_soundFont->setLabel(file.getPath());
911	911
912	912	if (!file.getPath().empty() && (file.getPath() != "None"))

......	@@ -349,7 +349,7 @@
349	349	const uint32 endTime = _chatEndTime;
350	350	resetSkipFlag();
351	351
352		while (running && !quit()) {
	352	while (running && !shouldQuit()) {
353	353	if (!_emc->isValid(&_chatScriptState))
354	354	_emc->start(&_chatScriptState, 1);
355	355
......	@@ -367,7 +367,7 @@
367	367
368	368	uint32 nextFrame = _system->getMillis() + delayTime * _tickLength;
369	369
370		while (_system->getMillis() < nextFrame && !quit()) {
	370	while (_system->getMillis() < nextFrame && !shouldQuit()) {
371	371	updateWithText();
372	372
373	373	const uint32 curTime = _system->getMillis();
......	@@ -419,7 +419,7 @@
419	419	uint32 nextFrame = _system->getMillis() + _rnd.getRandomNumberRng(4, 8) * _tickLength;
420	420
421	421	int frame = _badConscienceFrameTable[_badConscienceAnim+24];
422		while (running && !quit()) {
	422	while (running && !shouldQuit()) {
423	423	if (nextFrame < _system->getMillis()) {
424	424	++frame;
425	425	if (_badConscienceFrameTable[_badConscienceAnim+32] < frame)
......	@@ -477,7 +477,7 @@
477	477	uint32 nextFrame = _system->getMillis() + _rnd.getRandomNumberRng(3, 6) * _tickLength;
478	478
479	479	int frame = _goodConscienceFrameTable[_goodConscienceAnim+15];
480		while (running && !quit()) {
	480	while (running && !shouldQuit()) {
481	481	if (nextFrame < _system->getMillis()) {
482	482	++frame;
483	483	if (_goodConscienceFrameTable[_goodConscienceAnim+20] < frame)
......	@@ -597,7 +597,7 @@
597	597
598	598	uint32 nextFrame = 0;
599	599	int frame = 12;
600		while (running && !quit()) {
	600	while (running && !shouldQuit()) {
601	601	if (nextFrame < _system->getMillis()) {
602	602	++frame;
603	603	if (frame > 22)

......	@@ -29,11 +29,11 @@
29	29
30	30	DECLARE_SINGLETON(WiiFilesystemFactory);
31	31
32		AbstractFilesystemNode *WiiFilesystemFactory::makeRootFileNode() const {
	32	AbstractFSNode *WiiFilesystemFactory::makeRootFileNode() const {
33	33	return new WiiFilesystemNode();
34	34	}
35	35
36		AbstractFilesystemNode *WiiFilesystemFactory::makeCurrentDirectoryFileNode() const {
	36	AbstractFSNode *WiiFilesystemFactory::makeCurrentDirectoryFileNode() const {
37	37	char buf[MAXPATHLEN];
38	38
39	39	if (getcwd(buf, MAXPATHLEN))
......	@@ -42,7 +42,7 @@
42	42	return new WiiFilesystemNode();
43	43	}
44	44
45		AbstractFilesystemNode *WiiFilesystemFactory::makeFileNodePath(const Common::String &path) const {
	45	AbstractFSNode *WiiFilesystemFactory::makeFileNodePath(const Common::String &path) const {
46	46	return new WiiFilesystemNode(path, true);
47	47	}
48	48	#endif

......	@@ -35,9 +35,9 @@
35	35	*/
36	36	class DSFilesystemFactory : public FilesystemFactory, public Common::Singleton<DSFilesystemFactory> {
37	37	public:
38		virtual AbstractFilesystemNode *makeRootFileNode() const;
39		virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
40		virtual AbstractFilesystemNode *makeFileNodePath(const Common::String &path) const;
	38	virtual AbstractFSNode *makeRootFileNode() const;
	39	virtual AbstractFSNode *makeCurrentDirectoryFileNode() const;
	40	virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const;
41	41
42	42	protected:
43	43	DSFilesystemFactory() {};

......	@@ -160,7 +160,8 @@
160	160	{ "credit4n.dlt", GAME_RESOURCEFILE, 1797, NULL}, // PC
161	161	{ "credit4m.dlt", GAME_RESOURCEFILE, 1797, NULL}, // Macintosh
162	162	{ "p2_a.voc", GAME_VOICEFILE, 4, NULL},
163		{ "p2_a.iaf", GAME_VOICEFILE, 4, &ITEPC_GameSound}
	163	{ "p2_a.iaf", GAME_VOICEFILE, 4, &ITEPC_GameSound},
	164	{ NULL, 0, 0, NULL}
164	165	};
165	166
166	167	static const GamePatchDescription ITEMacPatch_Files[] = {
......	@@ -171,7 +172,8 @@
171	172	{ "wyrm4.dlt", GAME_RESOURCEFILE, 1533, NULL},
172	173	{ "credit3m.dlt", GAME_RESOURCEFILE, 1796, NULL},
173	174	{ "credit4m.dlt", GAME_RESOURCEFILE, 1797, NULL},
174		{ "p2_a.iaf", GAME_VOICEFILE, 4, &MAC_GameSound}
	175	{ "p2_a.iaf", GAME_VOICEFILE, 4, &MAC_GameSound},
	176	{ NULL, 0, 0, NULL}
175	177	};
176	178
177	179	static const SAGAGameDescription gameDescriptions[] = {
......	@@ -209,7 +211,6 @@
209	211	ITEDEMO_GameFonts,
210	212	&ITEDISK_GameSound,
211	213	&ITEDISK_GameSound,
212		0,
213	214	NULL,
214	215	},
215	216
......	@@ -237,7 +238,6 @@
237	238	ITEWINDEMO_GameFonts,
238	239	&ITEDEMO_GameVoice,
239	240	&MAC_GameSound,
240		ARRAYSIZE(ITEMacPatch_Files),
241	241	ITEMacPatch_Files,
242	242	},
243	243
......	@@ -266,7 +266,6 @@
266	266	ITEWINDEMO_GameFonts,
267	267	&ITEDEMO_GameVoice,
268	268	&MAC_GameSound,
269		ARRAYSIZE(ITEMacPatch_Files),
270	269	ITEMacPatch_Files,
271	270	},
272	271
......	@@ -295,7 +294,6 @@
295	294	ITEWINDEMO_GameFonts,
296	295	&ITEDEMO_GameVoice,
297	296	&ITEPC_GameSound,
298		ARRAYSIZE(ITEPatch_Files),
299	297	ITEPatch_Files,
300	298	},
301	299
......	@@ -324,7 +322,6 @@
324	322	ITEWINDEMO_GameFonts,
325	323	&ITEWINDEMO1_GameSound,
326	324	&ITEWINDEMO1_GameSound,
327		ARRAYSIZE(ITEPatch_Files),
328	325	ITEPatch_Files,
329	326	},
330	327
......	@@ -360,7 +357,6 @@
360	357	ITEWINDEMO_GameFonts,
361	358	&ITEMACCD_G_GameSound,
362	359	&ITEMACCD_G_GameSound,
363		0,
364	360	NULL,
365	361	},
366	362
......	@@ -387,7 +383,6 @@
387	383	ITEWINDEMO_GameFonts,
388	384	&MAC_GameSound,
389	385	&MAC_GameSound,
390		ARRAYSIZE(ITEMacPatch_Files),
391	386	ITEMacPatch_Files,
392	387	},
393	388
......	@@ -422,7 +417,6 @@
422	417	ITE_GameFonts,
423	418	&MAC_GameSound,
424	419	&ITEPC_GameSound,
425		0,
426	420	NULL,
427	421	},
428	422
......	@@ -454,7 +448,6 @@
454	448	ITE_GameFonts,
455	449	&MAC_GameSound,
456	450	&ITEPC_GameSound,
457		0,
458	451	NULL,
459	452	},
460	453
......	@@ -481,7 +474,6 @@
481	474	ITE_GameFonts,
482	475	&ITEPC_GameSound,
483	476	&ITEPC_GameSound,
484		ARRAYSIZE(ITEPatch_Files),
485	477	ITEPatch_Files,
486	478	},
487	479
......	@@ -508,7 +500,6 @@
508	500	ITE_GameFonts,
509	501	&ITEPC_GameSound,
510	502	&ITEPC_GameSound,
511		ARRAYSIZE(ITEPatch_Files),
512	503	ITEPatch_Files,
513	504	},
514	505
......	@@ -535,7 +526,6 @@
535	526	ITE_GameFonts,
536	527	&ITEPC_GameSound,
537	528	&ITEPC_GameSound,
538		ARRAYSIZE(ITEPatch_Files),
539	529	ITEPatch_Files,
540	530	},
541	531
......	@@ -563,7 +553,6 @@
563	553	ITE_GameFonts,
564	554	&ITEPC_GameSound,
565	555	&ITEPC_GameSound,
566		0,
567	556	NULL,
568	557	},
569	558
......	@@ -593,7 +582,6 @@
593	582	ITE_GameFonts,
594	583	&ITEDISK_GameSound,
595	584	&ITEDISK_GameSound,
596		0,
597	585	NULL,
598	586	},
599	587
......	@@ -620,7 +608,6 @@
620	608	ITE_GameFonts,
621	609	&ITEDISK_GameSound,
622	610	&ITEDISK_GameSound,
623		ARRAYSIZE(ITEPatch_Files),
624	611	ITEPatch_Files,
625	612	},
626	613
......	@@ -647,7 +634,6 @@
647	634	ITE_GameFonts,
648	635	&ITEDISK_GameSound,
649	636	&ITEDISK_GameSound,
650		ARRAYSIZE(ITEPatch_Files),
651	637	ITEPatch_Files,
652	638	},
653	639
......	@@ -683,7 +669,6 @@
683	669	IHNMDEMO_GameFonts,
684	670	&IHNM_GameSound,
685	671	&IHNM_GameSound,
686		0,
687	672	NULL,
688	673	},
689	674
......	@@ -718,7 +703,6 @@
718	703	IHNMCD_GameFonts,
719	704	&IHNM_GameSound,
720	705	&IHNM_GameSound,
721		0,
722	706	NULL,
723	707	},
724	708
......	@@ -751,7 +735,6 @@
751	735	IHNMCD_GameFonts,
752	736	&IHNM_GameSound,
753	737	&IHNM_GameSound,
754		0,
755	738	NULL,
756	739	},
757	740
......	@@ -782,7 +765,6 @@
782	765	IHNMCD_GameFonts,
783	766	&IHNM_GameSound,
784	767	&IHNM_GameSound,
785		0,
786	768	NULL,
787	769	},
788	770
......	@@ -813,7 +795,6 @@
813	795	IHNMCD_GameFonts,
814	796	&IHNM_GameSound,
815	797	&IHNM_GameSound,
816		0,
817	798	NULL,
818	799	},
819	800
......	@@ -845,7 +826,6 @@
845	826	IHNMCD_GameFonts,
846	827	&IHNM_GameSound,
847	828	&IHNM_GameSound,
848		0,
849	829	NULL,
850	830	},
851	831
......	@@ -876,7 +856,6 @@
876	856	IHNMCD_GameFonts,
877	857	&IHNM_GameSound,
878	858	&IHNM_GameSound,
879		0,
880	859	NULL,
881	860	},
882	861	// I Have No Mouth And I Must Scream - Mac English CD
......	@@ -904,10 +883,9 @@
904	883	IHNMCD_GameFonts,
905	884	&MAC_GameSound,
906	885	&MAC_GameSound,
907		0,
908	886	NULL,
909	887	},
910		{ AD_TABLE_END_MARKER, 0, 0, 0, 0, NULL, 0, NULL, NULL, NULL, 0, NULL }
	888	{ AD_TABLE_END_MARKER, 0, 0, 0, 0, NULL, 0, NULL, NULL, NULL, NULL }
911	889	};
912	890
913	891	} // End of namespace Saga

......	@@ -33,9 +33,9 @@
33	33	/**
34	34	* Implementation of the ScummVM file system API based on Ronin.
35	35	*
36		* Parts of this class are documented in the base interface class, AbstractFilesystemNode.
	36	* Parts of this class are documented in the base interface class, AbstractFSNode.
37