Commit Graph
618 Commits
Author SHA1 Message Date
Filippos Karapetis 93890a49c1 Added back the functionality to skip videos
svn-id: r49911
2010-06-16 23:28:20 +00:00
Filippos Karapetis 9b6f71d7cf Added handling for the SCI2.1 kPalette(1) call. The graphics in Torin's Passage are shown with the correct colors now
svn-id: r49908
2010-06-16 21:44:33 +00:00
Matthew Hoops cf38303497 Don't disable kPalVary for SCI32, the semantics have remained the same.
svn-id: r49865
2010-06-15 16:56:23 +00:00
Martin Kiewitz b25aba1d1e SCI: SciGui/SciGui32 gone for good...
svn-id: r49860
2010-06-15 15:44:24 +00:00
Martin Kiewitz 891b568fde SCI: move textSize and textFonts and textColors inside gfxText16
svn-id: r49851
2010-06-15 13:01:07 +00:00
Martin Kiewitz 59d0035b03 SCI: move portrait methods to gfxPaint16
svn-id: r49806
2010-06-15 12:01:49 +00:00
Filippos Karapetis eb4ec596cd Use the SELECTOR() macro for readability
svn-id: r49563
2010-06-10 09:18:57 +00:00
Filippos Karapetis c00d645506 Fixed the cursor limiting code in GK1
svn-id: r49440
2010-06-05 18:15:41 +00:00
Filippos Karapetis 67de5b1bd3 Mass renaming of selector-related functions, and removed some defines which were just cloaking functions with a different name
- GET_SEL32 -> readSelector
- GET_SEL32V -> readSelectorValue
- PUT_SEL32 -> writeSelector
- PUT_SEL32V -> writeSelectorValue
Also, changed some selector-related function names and variables to CamelCase

svn-id: r49317
2010-05-29 23:37:15 +00:00
Matthew Hoops cd5e90f298 Implement QuickTime playback for SCI1.1 Mac. The 'Halfdome' and 'KQ6Movie' videos now play. However, they require multiple edit list support to look completely correct.
svn-id: r49224
2010-05-26 03:43:21 +00:00
Filippos Karapetis c874ff15a8 Cleaned up the game ID code:
- The game ID is now obtained from ScummVM ID directly, not by converting Sierra's internal ID
- Moved the code which reads the internal Sierra ID inside the resource manager
- Moved the code which converts the internal Sierra ID to ScummVM's IDs together with the rest of the detection code

svn-id: r49152
2010-05-23 10:28:03 +00:00
Matthew Hoops 11cbdd0318 Committing the rest of the VideoDecoder Rewrite from patch #2963496.
svn-id: r49079
2010-05-18 14:17:24 +00:00
Filippos Karapetis 46af5a5162 - Moved kernel_lookup_text inside the Kernel class
- Added a pointer to the segment manager from within the Kernel class, thus simplifying the calls to it

svn-id: r49076
2010-05-18 12:16:48 +00:00
Matthew Hoops 3dda73d9a2 Add initial support for KQ6 Mac. Wrapper functions for read/writing to pointers are now used (found in util.*) for code that has different endianness in SCI1.1+ Mac games. Add support for Mac 'snd ' and 'CURS' resources. QFG1 Mac is not yet playable due to script compression.
svn-id: r49070
2010-05-18 04:17:58 +00:00
Martin Kiewitz 59a255226f SCI: SCI_SCREEN_MASK_* now GFX_SCREEN_MASK_*, using enum - added new enum GFX_SCREEN_UPSCALED_*
svn-id: r49039
2010-05-15 08:57:13 +00:00
Martin Kiewitz c893ba1508 SCI: replaced value with constant when checking if controls are selected
svn-id: r48795
2010-04-25 15:44:11 +00:00
Torbjörn Andersson 65585f6433 Silenced some harmless cppcheck warnings about unreachable code after a return.
In this case, it was always a break after a return in a switch case. There are
similar cases which cppcheck didn't detect, and a couple of cases where we have
a break after a continue in a switch case (where the continue refers to an
outer loop), but I didn't touch those. Not yet, at least.

svn-id: r48218
2010-03-10 06:39:23 +00:00
Max Horn 02201e937a SCI: Move SciGui::wait to EngineState::wait
svn-id: r48118
2010-02-23 22:44:46 +00:00
Max Horn b9a11ddb0b SCI: Move language related code from EngineState to SciEngine
svn-id: r48052
2010-02-13 17:46:44 +00:00
Max Horn e45f0f309a SCI: Remove EngineState::_kernel, use SciEngine::_kernel instead
svn-id: r48050
2010-02-13 17:45:40 +00:00
Max Horn 9575cc08a2 SCI: Move GameFeatures from EngineState to SciEngine
svn-id: r48049
2010-02-13 17:44:58 +00:00
Max Horn a82939c9be SCI: Get rid of EngineState::resMan
svn-id: r48048
2010-02-13 17:44:19 +00:00
Max Horn 721a57a661 SCI: Move Gui/Gfx related permanent objects from EngineState to SciEngine
svn-id: r48047
2010-02-13 17:43:31 +00:00
Martin Kiewitz 749b0ea237 SCI: added dummy assertpalette to GfxPalette, setting destination palette immediately on kPalVary(start) call
svn-id: r47953
2010-02-07 12:00:06 +00:00
Martin Kiewitz 67870c7dc8 SCI: adding more debug output to kPalVary, fixing loading savedgames (_gfxPaint wasnt copied over)
svn-id: r47943
2010-02-06 21:38:58 +00:00
Martin Kiewitz 3255b572ad SCI: added debug code to kPalVary, added warning when calling kPalette(setFromResource) with unsupported parameters
svn-id: r47941
2010-02-06 21:22:05 +00:00
Martin Kiewitz 454856b5fd SCI: put kShakeScreen into GfxPaint, called directly now
svn-id: r47936
2010-02-06 17:03:18 +00:00
Matthew Hoops dc12437390 Add a missing break.
svn-id: r47926
2010-02-06 05:29:08 +00:00
Max Horn f86618f92b SCI: Add a 'SELECTOR' macro
svn-id: r47918
2010-02-05 22:55:18 +00:00
Martin Kiewitz 25a9df8a81 SCI: moving kDisplay into GfxPaint16, now getting called directly as well
svn-id: r47917
2010-02-05 22:31:48 +00:00
Martin Kiewitz 71fb77a5aa SCI: priority band specific stuff now gets called directly w/o SciGui
svn-id: r47916
2010-02-05 22:20:46 +00:00
Martin Kiewitz f967318225 SCI: remaining cursor functions now also directly called
svn-id: r47914
2010-02-05 21:09:36 +00:00
Martin Kiewitz 248bc560f3 SCI: moved onControl etc. into GfxCompare, now getting called directly. also fixed loading saved games due Gfx* changes
svn-id: r47912
2010-02-05 20:44:03 +00:00
Matthew Hoops 779fc7dc19 Cleanup kShowMovie; merge the SCI1.1/SCI2 and SCI2.1 AVI code.
svn-id: r47911
2010-02-05 19:41:06 +00:00
Martin Kiewitz f3ea96d168 SCI: GfxCoordAdjuster class added, local2Global and global2Local use that class directly, kGraph / RedrawBox is now using GfxPaint16 directly
svn-id: r47908
2010-02-05 18:56:13 +00:00
Martin Kiewitz f8f490c565 SCI: calling most of the cursor functions directly via _gfxCursor instead of SciGui/32
svn-id: r47903
2010-02-05 14:48:51 +00:00
Filippos Karapetis 0d85b39468 Moved the PalVary code inside the GfxPalette class
svn-id: r47893
2010-02-04 23:17:33 +00:00
Martin Kiewitz 5f39e3b7b5 SCI: kPicNotValid now uses GfxScreen directly and not SciGui/32
svn-id: r47889
2010-02-04 20:52:56 +00:00
Martin Kiewitz e74bd30a2e SCI: putting most kGraph functions into GfxPaint16
svn-id: r47887
2010-02-04 20:18:01 +00:00
Martin Kiewitz fb49449322 SCI: putting kDrawCel info GfxPaint class, debug is using GfxPaint class as well for drawing cels
svn-id: r47885
2010-02-04 20:02:48 +00:00
Martin Kiewitz 3ce2e22978 SCI: adding GfxPaint class, implementing kernelDrawPicture for GfxPaint16 and GfxPaint32, using those classes directly when drawing pictures instead of SciGui/32. Making draw_pic command work in sci32 that way, using _gfxPaint16 for kDrawPic because that command is sci16 exclusive
svn-id: r47883
2010-02-04 19:22:40 +00:00
Filippos Karapetis 2fb37063a4 Placed all the game feature detection code in a separate class
svn-id: r47850
2010-02-03 11:02:43 +00:00
Martin Kiewitz d31f696d1f SCI: rename Controls to GfxControls, gets directly called now
svn-id: r47783
2010-01-31 22:20:55 +00:00
Martin Kiewitz 5cf510648a SCI: syncWithFramebuffer() is now called directly w/o SciGui/SciGui32
svn-id: r47781
2010-01-31 21:59:37 +00:00
Martin Kiewitz 66c88b98f5 SCI: GfxCache is now also called directly w/o SciGui nor SciGui32
svn-id: r47759
2010-01-31 17:14:58 +00:00
Martin Kiewitz 7184fa3bad SCI: renamed kernelFind() to kernelFindColor, so that it isnt that confusing :P
svn-id: r47753
2010-01-31 16:26:15 +00:00
Martin Kiewitz 72c2d360f7 SCI: renamed SciPalette to GfxPalette, Screen to GfxScreen, GfxPalette is now called directly w/o SciGui
svn-id: r47752
2010-01-31 16:21:11 +00:00
Martin Kiewitz c991a5bceb SCI: renamed SciGuiAnimate to GfxAnimate, moved code from SciGui into this class, now getting called directly
svn-id: r47751
2010-01-31 15:07:36 +00:00
Martin Kiewitz 7929255cd9 SCI: cleaned up graphics classes, removed gfx&windowmgr, added gfxports, gfxcompare, gfxpaint16, gfxcache. kernel uses gfxports directly w/o going through SciGui
svn-id: r47745
2010-01-31 12:35:15 +00:00
Willem Jan Palenstijn 06bd17ee71 SCI: Remove extra '\n's in debugC messages
svn-id: r47707
2010-01-30 11:59:05 +00:00