Commit Graph

31472 Commits

Author SHA1 Message Date
Eugene Sandulenko
0ca17a7f8c Fix compilation when 16BIT code is disabled.
svn-id: r41543
2009-06-15 11:46:28 +00:00
Eugene Sandulenko
dcc5e26cab Fix compilation
svn-id: r41542
2009-06-15 11:37:07 +00:00
Eugene Sandulenko
5d61784dae Remove uglyness with PixelFormat initialization.
svn-id: r41541
2009-06-15 11:35:51 +00:00
Jody Northup
c97bfd16f9 made Graphics::PixelFormat(ColorMode) constructor explicit, removed Graphics::PixelFormat(int bitFormat) constructor that was never really implemented anyway
svn-id: r41540
2009-06-15 10:10:22 +00:00
Jody Northup
8d306ebccf Added kUnsupportedColorMode error code brought Scumm engine and SDL backend into compliance with API outlined in http://scummvmupthorn09.wordpress.com/2009/06/14/how-this-is-going-to-work/
Provided convenient Graphics::PixelFormat constructors for ColorMode enums, and bitformat integers.
Removed last vestiges (I think) of initial cursor hack.

svn-id: r41539
2009-06-15 09:45:19 +00:00
Travis Howell
e6f874ee95 Fix possible endian issues.
svn-id: r41494
2009-06-13 13:59:41 +00:00
Jody Northup
350dc4290f Fixed cursor code to keep track of cursor formats so that ThemeEngine and/or GuiManager cursors will render properly over the game (on spacebar hit, for instance)
svn-id: r41491
2009-06-13 10:24:52 +00:00
Jody Northup
2ee51a8fa1 Unfinished proof of concept regarding my compromise with LordHoto in IRC.
svn-id: r41464
2009-06-12 08:49:45 +00:00
Jody Northup
6adbd0c41e Renamed Graphics::ColorFormat to Graphics::ColorMode, streamlined enum by removing order section and temporarily removing kFormatARGB1555
Converted cursor code to make use of _screenFormat, instead of a parameter passed directly to it by the engine.
Adjusted scumm engine to account for these changes.
This should probably have been two separate commits, but the changes concern the same files...

svn-id: r41443
2009-06-11 05:56:00 +00:00
Eugene Sandulenko
b4c44a018b Code formatting
svn-id: r41420
2009-06-10 08:41:33 +00:00
Travis Howell
8a8366aab5 Correct horizontal flipping in decompressWizImage(), when using 16bit color.
svn-id: r41418
2009-06-10 06:05:11 +00:00
Jody Northup
58a348fd18 Scumm engine now dynamically requests 16-bit color based on game features, (using ad-hoc request format)
svn-id: r41417
2009-06-10 05:35:54 +00:00
Jody Northup
0a793f08a4 SDL backend now dynamically generates 8 or 16-bit color surface depending on engine request (using ad-hoc format).
svn-id: r41416
2009-06-10 05:35:18 +00:00
Jody Northup
c426dd99a4 Laying the foundation for preliminary bitdepth negotiation. (No functionality changes yet)
svn-id: r41396
2009-06-09 07:55:43 +00:00
Eugene Sandulenko
d3ede78c9a Since we're in 16bit branch, enable 16bit by default
svn-id: r41330
2009-06-07 12:01:21 +00:00
Travis Howell
06f12248a1 Merged revisions 41205,41207-41208,41210,41214-41217 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

........
  r41205 | waltervn | 2009-06-06 10:07:18 +1000 (Sat, 06 Jun 2009) | 2 lines
  
  SCI: Moved the handling of 65535.map into the resource manager.
........
  r41207 | dreammaster | 2009-06-06 10:53:08 +1000 (Sat, 06 Jun 2009) | 1 line
  
  Bugfix for display when multiple user waits follow each other
........
  r41208 | dreammaster | 2009-06-06 11:00:44 +1000 (Sat, 06 Jun 2009) | 1 line
  
  Bugfix to show the title screen at the correct speed when restarting the game
........
  r41210 | dreammaster | 2009-06-06 11:39:08 +1000 (Sat, 06 Jun 2009) | 1 line
  
  Disabled the execution of scripts when doing a user wait - this prevents animated backgrounds from jerking to new positions once the mouse has been pressed
........
  r41214 | thebluegr | 2009-06-06 20:21:48 +1000 (Sat, 06 Jun 2009) | 1 line
  
  Objectified the graphics driver
........
  r41215 | thebluegr | 2009-06-06 20:36:38 +1000 (Sat, 06 Jun 2009) | 1 line
  
  Moved the fake 1x1 mode structure to gfx_resmgr.cpp (where it's actually used)
........
  r41216 | thebluegr | 2009-06-06 20:40:32 +1000 (Sat, 06 Jun 2009) | 1 line
  
  Some uint8 -> byte conversions
........
  r41217 | Kirben | 2009-06-06 20:50:37 +1000 (Sat, 06 Jun 2009) | 1 line
  
  Add logic stub for Backyard Basketball.
........

svn-id: r41218
2009-06-06 11:01:25 +00:00
Travis Howell
d11d56ae13 Add logic stub for Backyard Basketball.
svn-id: r41217
2009-06-06 10:50:37 +00:00
Filippos Karapetis
26b03dd359 Some uint8 -> byte conversions
svn-id: r41216
2009-06-06 10:40:32 +00:00
Filippos Karapetis
be41483373 Moved the fake 1x1 mode structure to gfx_resmgr.cpp (where it's actually used)
svn-id: r41215
2009-06-06 10:36:38 +00:00
Filippos Karapetis
8033a39128 Objectified the graphics driver
svn-id: r41214
2009-06-06 10:21:48 +00:00
Jody Northup
0323638ce9 Streamlined the cursor blitting changes introduced in revision 41412
svn-id: r41213
2009-06-06 08:41:03 +00:00
Jody Northup
4087a3e6e8 Corrected 16-bit cursor blit errors on GFX mode change.
svn-id: r41212
2009-06-06 08:02:45 +00:00
Travis Howell
f379d7fe1a Add initial support for copyMaskWizImage, to fix videos in later Blue's Clues games.
svn-id: r41211
2009-06-06 07:22:19 +00:00
Paul Gilbert
93375bddf0 Disabled the execution of scripts when doing a user wait - this prevents animated backgrounds from jerking to new positions once the mouse has been pressed
svn-id: r41210
2009-06-06 01:39:08 +00:00
Jody Northup
56e5920bba Corrected cursor display errors introduced by revision 41204, reimplemented 16-bit cursor support in a less hacky, but still temporary way.
svn-id: r41209
2009-06-06 01:16:04 +00:00
Paul Gilbert
3739d82f62 Bugfix to show the title screen at the correct speed when restarting the game
svn-id: r41208
2009-06-06 01:00:44 +00:00
Paul Gilbert
95a4ea15b5 Bugfix for display when multiple user waits follow each other
svn-id: r41207
2009-06-06 00:53:08 +00:00
Travis Howell
8ff3a568fa Merged revisions 41154-41156,41160,41163-41181,41185-41186,41188-41189,41196-41202 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

........
  r41154 | thebluegr | 2009-06-04 18:25:48 +1000 (Thu, 04 Jun 2009) | 1 line
  
  Turned debug_weak_validations on by default again, as apparently some games like SQ3 fail in some validations (e.g. when loading). Also, fixed a potential out of bounds access when copying the value of __FILE__ into a buffer (as its value can be quite long in some cases).
........
  r41155 | thebluegr | 2009-06-04 18:28:20 +1000 (Thu, 04 Jun 2009) | 1 line
  
  Reordered the numpad keys so that they make more sense, and simplified the code which returns the values of shifted function keys
........
  r41156 | djwillis | 2009-06-04 18:30:31 +1000 (Thu, 04 Jun 2009) | 1 line
  
  Initial import of the GP2XWiz backend (based on the GP2X and SDL backends). Includes configure changes and one #ifdef to SDL backend. Also updates NEWS.
........
  r41160 | strangerke | 2009-06-04 19:48:56 +1000 (Thu, 04 Jun 2009) | 1 line
  
  gob : _spriteBottom incorrectly saved and restored in Draw_v2::spriteOperation
........
  r41163 | fingolfin | 2009-06-04 21:28:05 +1000 (Thu, 04 Jun 2009) | 1 line
  
  SCI: Renamed various debug related global variables to have a g_ prefix; and moved any 'extern' decls of them into a new header file
........
  r41164 | waltervn | 2009-06-04 21:35:17 +1000 (Thu, 04 Jun 2009) | 2 lines
  
  SCI: Support for 16-bit DPCM.
........
  r41165 | fingolfin | 2009-06-04 21:44:55 +1000 (Thu, 04 Jun 2009) | 1 line
  
  SCI: cleanup
........
  r41166 | fingolfin | 2009-06-04 21:45:17 +1000 (Thu, 04 Jun 2009) | 1 line
  
  SCI: Moved MemObject code into a separate source file
........
  r41167 | fingolfin | 2009-06-04 21:45:34 +1000 (Thu, 04 Jun 2009) | 1 line
  
  Code formatting in the gp2xwiz backend
........
  r41168 | thebluegr | 2009-06-04 22:47:11 +1000 (Thu, 04 Jun 2009) | 1 line
  
  Updated the MSVC project files of the SCI engine
........
  r41169 | waltervn | 2009-06-05 00:29:20 +1000 (Fri, 05 Jun 2009) | 2 lines
  
  SCI: Message: Added support for escape sequences.
........
  r41170 | waltervn | 2009-06-05 01:56:11 +1000 (Fri, 05 Jun 2009) | 2 lines
  
  SCI: Added support for early SCI1.1 audio maps.
........
  r41171 | waltervn | 2009-06-05 02:18:35 +1000 (Fri, 05 Jun 2009) | 2 lines
  
  SCI: Audio: Fixed bug in reading of SOL header.
........
  r41172 | fingolfin | 2009-06-05 06:50:51 +1000 (Fri, 05 Jun 2009) | 1 line
  
  SCI: Added FIXME comment to not_register()
........
  r41173 | fingolfin | 2009-06-05 06:51:09 +1000 (Fri, 05 Jun 2009) | 1 line
  
  SCI: cleanup
........
  r41174 | fingolfin | 2009-06-05 06:51:24 +1000 (Fri, 05 Jun 2009) | 1 line
  
  SCI: Slightly modified kAddAfter so that it does not modify its arguments needlessly
........
  r41175 | fingolfin | 2009-06-05 06:51:40 +1000 (Fri, 05 Jun 2009) | 1 line
  
  SCI: Added MemObject::isValidOffset method; use it to simplify determine_reg_type
........
  r41176 | fingolfin | 2009-06-05 07:42:24 +1000 (Fri, 05 Jun 2009) | 1 line
  
  SCI: Renamed _kfuncTable -> _kernelFuncs; and simplified/streamlined the kernel func map in kernel.cpp a bit
........
  r41177 | fingolfin | 2009-06-05 07:44:39 +1000 (Fri, 05 Jun 2009) | 1 line
  
  SCI: Renamed EngineState::flags and version to _flags and _version (following our conventions); also slightly changed the EngineState constructor to init _version & _flags, and used this to make them constant
........
  r41178 | fingolfin | 2009-06-05 07:53:45 +1000 (Fri, 05 Jun 2009) | 1 line
  
  oops
........
  r41179 | athrxx | 2009-06-05 08:12:13 +1000 (Fri, 05 Jun 2009) | 1 line
  
  LOL: implemented Vaelan's cube
........
  r41180 | fingolfin | 2009-06-05 08:16:31 +1000 (Fri, 05 Jun 2009) | 1 line
  
  SCI: Made some members of class Resource protected; some cleanup
........
  r41181 | waltervn | 2009-06-05 09:55:08 +1000 (Fri, 05 Jun 2009) | 3 lines
  
  SCI: Fixed some endian bugs related to speech handling. READ_UINT* are not LE,
  but use native endianness. Thanks to clone2727 for pointing this out.
........
  r41185 | Kirben | 2009-06-05 10:57:58 +1000 (Fri, 05 Jun 2009) | 1 line
  
  Update sound code in HE80+ games, for sound rate differences.
........
  r41186 | waltervn | 2009-06-05 11:12:52 +1000 (Fri, 05 Jun 2009) | 2 lines
  
  SCI: Audio: Fixed bug in sample length computation.
........
  r41188 | Kirben | 2009-06-05 12:35:38 +1000 (Fri, 05 Jun 2009) | 1 line
  
  Fix issues selecting some items in arttime and football.
........
  r41189 | Kirben | 2009-06-05 14:16:32 +1000 (Fri, 05 Jun 2009) | 1 line
  
  Minor cleanup.
........
  r41196 | dreammaster | 2009-06-05 22:20:42 +1000 (Fri, 05 Jun 2009) | 1 line
  
  Tweaks to the code that pauses for a mouse press when displaying many text messages
........
  r41197 | thebluegr | 2009-06-06 04:05:45 +1000 (Sat, 06 Jun 2009) | 1 line
  
  Removed some unused code and performed some cleanup
........
  r41198 | thebluegr | 2009-06-06 05:04:14 +1000 (Sat, 06 Jun 2009) | 1 line
  
  Moved some more debug commands to ScummVM's coneole and removed some unused code
........
  r41199 | athrxx | 2009-06-06 07:34:18 +1000 (Sat, 06 Jun 2009) | 1 line
  
  LOL: implemented another opcode
........
  r41200 | mthreepwood | 2009-06-06 08:35:13 +1000 (Sat, 06 Jun 2009) | 1 line
  
  Make the PlayStation's abbreviation to all lower-case for consistency and change the description from Playstation to Sony PlayStation
........
  r41201 | athrxx | 2009-06-06 08:53:36 +1000 (Sat, 06 Jun 2009) | 1 line
  
  LOL: minor bug fix
........
  r41202 | thebluegr | 2009-06-06 09:08:35 +1000 (Sat, 06 Jun 2009) | 1 line
  
  Cleanup
........

svn-id: r41206
2009-06-06 00:10:40 +00:00
Walter van Niftrik
61a7b7c625 SCI: Moved the handling of 65535.map into the resource manager.
svn-id: r41205
2009-06-06 00:07:18 +00:00
Jody Northup
d65bbe1d7a Fixes ScummEngine_v70he::setDefaultCursor to work in 16-bit, using a temporary hack.
svn-id: r41204
2009-06-05 23:59:40 +00:00
Filippos Karapetis
da36901b07 Cleanup
svn-id: r41202
2009-06-05 23:08:35 +00:00
Florian Kagerer
5f005bf930 LOL: minor bug fix
svn-id: r41201
2009-06-05 22:53:36 +00:00
Matthew Hoops
7e52694025 Make the PlayStation's abbreviation to all lower-case for consistency and change the description from Playstation to Sony PlayStation
svn-id: r41200
2009-06-05 22:35:13 +00:00
Florian Kagerer
90ee879d89 LOL: implemented another opcode
svn-id: r41199
2009-06-05 21:34:18 +00:00
Filippos Karapetis
7c84cca81d Moved some more debug commands to ScummVM's coneole and removed some unused code
svn-id: r41198
2009-06-05 19:04:14 +00:00
Filippos Karapetis
24cb130b26 Removed some unused code and performed some cleanup
svn-id: r41197
2009-06-05 18:05:45 +00:00
Paul Gilbert
862d1cf42b Tweaks to the code that pauses for a mouse press when displaying many text messages
svn-id: r41196
2009-06-05 12:20:42 +00:00
Travis Howell
ccee18a489 Cleanup.
svn-id: r41195
2009-06-05 10:13:19 +00:00
Jody Northup
9789ba7f28 Corrected backend to be able to accept a 16-bit mouseKeyColor without overflow
svn-id: r41194
2009-06-05 08:09:37 +00:00
Travis Howell
662a305752 HACK not required at this point, since transparency color of 5 is still used for 16bit color HE games.
svn-id: r41193
2009-06-05 07:07:56 +00:00
Travis Howell
7edfab28d8 Ooops, correct mistakes in commit 41162.
svn-id: r41192
2009-06-05 06:47:49 +00:00
Jody Northup
f8361b5c53 Converted cursor code to use 16-bit.
svn-id: r41191
2009-06-05 06:41:04 +00:00
Travis Howell
1f43d9b860 Correct error in decompress16BitWizImage().
svn-id: r41190
2009-06-05 04:28:07 +00:00
Travis Howell
58d494a7cb Minor cleanup.
svn-id: r41189
2009-06-05 04:16:32 +00:00
Travis Howell
9ca2345fc1 Fix issues selecting some items in arttime and football.
svn-id: r41188
2009-06-05 02:35:38 +00:00
Travis Howell
e90364c890 Update o72_getPixel() for 16bit color, and cleanup.
svn-id: r41187
2009-06-05 01:20:39 +00:00
Walter van Niftrik
3c58a6ca8f SCI: Audio: Fixed bug in sample length computation.
svn-id: r41186
2009-06-05 01:12:52 +00:00
Travis Howell
de348d6fa8 Update sound code in HE80+ games, for sound rate differences.
svn-id: r41185
2009-06-05 00:57:58 +00:00
Travis Howell
9911c1bf59 Fix endian issue, the palette must be in little endian.
svn-id: r41184
2009-06-05 00:33:25 +00:00
Travis Howell
fa2b1add9d Ooops, update asserts in grabScreen565() too.
svn-id: r41183
2009-06-05 00:28:07 +00:00