34394 Commits

Author SHA1 Message Date
Max Lingua
4ccdb3e2a3 Merge branch 'master' of git://github.com/scummvm/scummvm 2014-01-23 18:33:15 -05:00
Johannes Schickel
29eeb91d4e Merge pull request #423 from lordhoto/engine-path-setup
ENGINES: Make game path addition to SearchMan fully configurable
2014-01-23 14:22:29 -08:00
Johannes Schickel
aa87af50b2 Merge pull request #422 from lordhoto/agos-archive
AGOS: Archive code cleanup
2014-01-23 12:56:28 -08:00
Eugene Sandulenko
91ebc07eb9 FULLPIPE: Enable sceneFinal 2014-01-23 12:01:26 -08:00
Eugene Sandulenko
19bf8cf4bf FULLPIPE: Implement sceneHandlerFinal_startFinal() 2014-01-23 12:01:26 -08:00
Eugene Sandulenko
e9ced0784b FULLPIPE: Implement sceneHandlerFinal_fallCoin() 2014-01-23 12:01:25 -08:00
Eugene Sandulenko
c776ec6afa FULLPIPE: More code to sceneFinal 2014-01-23 12:01:25 -08:00
Eugene Sandulenko
7ce04e0383 FULLPIPE: Implement sceneHandlerFinal() 2014-01-23 12:01:25 -08:00
Eugene Sandulenko
34c2ba5ff3 FULLPIPE: Implement sceneFinal_updateCursor() 2014-01-23 12:01:25 -08:00
Eugene Sandulenko
7277ad7aa1 FULLPIPE: Plug sceneFinal in 2014-01-23 12:01:25 -08:00
Eugene Sandulenko
8154da85ad FULLPIPE: Initial code for sceneFinal 2014-01-23 12:01:25 -08:00
uruk
3fd28f31a7 AVALANCHE: Implement majorRedraw(). 2014-01-22 18:51:48 +01:00
uruk
c53c4ca626 AVALANCHE: Remove/move variables. 2014-01-22 18:09:25 +01:00
Johannes Schickel
65931d74e3 TINSEL: Take advante of Engine::initializePath.
This makes sure that the game path is only ever added once for the PSX version
of DW1. Most noticably this will make the warning about the game path being
present in SearchSet disappear on startup.
2014-01-22 18:08:32 +01:00
Johannes Schickel
651e280801 ENGINES: Introduce method Engine::initializePath which sets up SearchMan.
This replaces the hardcoded addition of the game path in runGame in
base/main.cpp by an engine configurable one.
2014-01-22 18:07:06 +01:00
uruk
681bc68cf6 AVALANCHE: Remove unused code. 2014-01-22 18:00:44 +01:00
Johannes Schickel
1fa74e355c WINTERMUTE: Two minor formatting fixes. 2014-01-22 17:33:04 +01:00
Eugene Sandulenko
a4fa8fe216 FULLPIPE: Enable scene38. This completes the scene 2014-01-22 07:27:38 -08:00
Eugene Sandulenko
9a881b8334 FULLPIPE: Finish renames in scene38 2014-01-22 07:27:32 -08:00
Eugene Sandulenko
4cdf4eb4c4 FULLPIPE: Started renames in scene38 2014-01-22 07:27:05 -08:00
uruk
2479a53d65 AVALANCHE: Move kTune and TuneType to Dialogs. 2014-01-22 03:34:45 +01:00
Johannes Schickel
047df69407 AGOS: Use Common::File instead of SearchMan.
This makes sure the hack from Common::File for filenames with a trailing dot
is used as expected.
2014-01-22 00:53:21 +01:00
Johannes Schickel
1cee8439e7 AGOS: Get rid of ArchiveMan in favor of global SearchMan.
This in fact slightly changes the priority order of added archives. Formerly,
all archives in SearchMan were preferred to the customly added ones in
ArchiveMan. All standard paths (i.e. path and extrapath) will be still be
searched before the custom ones (which are all priority 0 right now) but system
specific paths will be searched after (due to their priority being -1). Since
system specific paths shouldn't contain any game data files this should
hopefully be harmless.

This wasn't tested for games with CAB archives.
2014-01-22 00:30:28 +01:00
Johannes Schickel
e560dca6b1 AGOS: Slightly clean up ArchiveMan code.
This removes the (always true) _fallBack flag which determined whether
SearchMan should be searched.
2014-01-22 00:14:26 +01:00
Eugene Sandulenko
51c0f0e697 FULLPIPE: Complete sceneHandler38_animateAlcoholics() 2014-01-21 13:17:59 -08:00
Einar Johan Trøan Sømåen
2e93f5aba2 WINTERMUTE: Enable Wintermute by default. 2014-01-21 18:45:23 +01:00
Eugene Sandulenko
711522eeeb FULLPIPE: Started implementation of sceneHandler38_animateAlcoholics() 2014-01-21 07:28:26 -08:00
Eugene Sandulenko
33b6d0878b FULLPIPE: Implement sceneHandler38_propose() 2014-01-21 07:28:25 -08:00
Eugene Sandulenko
5137f609de FULLPIPE: Implement sceneHandler38_point() 2014-01-21 07:28:25 -08:00
Eugene Sandulenko
7d49a97e8c FULLPIPE: Implement sceneHandler38_hammerKick() 2014-01-21 07:28:25 -08:00
Einar Johan Trøan Sømåen
2dfbad8074 WINTERMUTE: Avoid using Graphics::copyFrom to copy FMV-frames.
copyFrom frees and reallocates the surface for every update, as long
as the dimensions and format stay the same, we can do with just a
memcpy.

This gives a tiny improvement in the update-part of the Theora-player
(on the order of a bit more than 1 second saved total in the 1:28 long
J.U.L.I.A.-intro)
2014-01-21 02:25:18 +01:00
Einar Johan Trøan Sømåen
0b76f66edc WINTERMUTE: Special-case FMV-handling to not fill the screen with background color.
If we have only one thing being drawn, and that is opaque, we can
skip filling the render surface with background color.
This shaves another few wasted cycles of the FMV playback. (Since we
now don’t have to write the entire render surface TWICE).

This reduces the time spent in drawTickets() to ~60% of what it was before.
2014-01-21 01:32:49 +01:00
Einar Johan Trøan Sømåen
4f4599b542 WINTERMUTE: Fix bug that prevented the opaque and binary blit speedups from working. 2014-01-21 01:32:40 +01:00
Eugene Sandulenko
273974cca2 FULLPIPE: Implement sceneHandler38_tryTakeBottle() and postHammerKick() 2014-01-19 17:06:38 +04:00
Eugene Sandulenko
055b390bc7 FULLPIPE: Implement sceneHandler38_drink() 2014-01-19 17:02:42 +04:00
Eugene Sandulenko
7e07e3448e FULLPIPE: Implement sceneHandler38() 2014-01-19 16:59:18 +04:00
Eugene Sandulenko
151a13d82d FULLPIPE: Implement scene38_setBottleState() 2014-01-19 16:37:09 +04:00
Eugene Sandulenko
a5a60d565e FULLPIPE: Plug scene38 in 2014-01-19 16:28:47 +04:00
Eugene Sandulenko
f923425692 FULLPIPE: Initial code for scene38 2014-01-19 16:19:43 +04:00
Max Lingua
001e3f7658 PS2: modified sword25 loslib.cpp to support PS2 2014-01-19 00:51:02 -05:00
Max Lingua
a960ec7adf PS2: snprintf hack to fix scumm.plg 2014-01-18 13:48:08 -05:00
Strangerke
bd90eddd10 MORTEVIELLE: Enable engine by default 2014-01-18 14:50:09 +01:00
Torbjörn Andersson
64a58316aa FULLPIPE: Silence GCC warnings. 2014-01-18 13:19:08 +01:00
Eugene Sandulenko
dc7fc44929 FULLPIPE: Renames in scene37. This completes the scene 2014-01-18 13:49:19 +02:00
Eugene Sandulenko
ce69278a48 FULLPIPE: Implement sceneHandler37_updateRing() 2014-01-18 13:42:18 +02:00
Eugene Sandulenko
7445f89353 FULLPIPE: Plug scene37 in 2014-01-18 12:07:28 +02:00
Eugene Sandulenko
d122b201d6 FULLPIPE: Implement sceneHandler37_setRingsState() 2014-01-18 12:06:05 +02:00
Eugene Sandulenko
8a229f5a66 FULLPIPE: Implement sceneHandler37() 2014-01-18 12:01:06 +02:00
Eugene Sandulenko
9a4d233fc5 FULLPIPE: Implement scene37_updateCursor() 2014-01-18 11:28:57 +02:00
Eugene Sandulenko
9dd3c9d2b7 FULLPIPE: Plug scene37 in 2014-01-18 11:26:51 +02:00