Commit Graph

141 Commits

Author SHA1 Message Date
Johannes Schickel
4ea4172cba SCUMM: Implement proper Indy4 Amiga palette handling.
This should fix incorrect text colors in some scenes.
2011-08-26 05:54:47 +02:00
Christoph Mallon
23a0f5318c JANITORIAL: Remove trailing empty lines. 2011-08-07 13:53:33 +02:00
Johannes Schickel
3b7c91f2a7 COMMON: Move HerculesDimensions enum to SCUMM.
The enum is only used inside the SCUMM engine so it is rather pointless to
keep it in common/util.h right now. Also if we really want it in some common
place it should probably be better in graphics/ too.
2011-06-21 16:59:50 +02:00
Max Horn
88913c0139 ALL: Remove trailing whitespaces
This tries to make our code a bit more compliant with our code formatting
conventions. For future use, this is the command I used:
  git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
2011-06-20 00:59:48 +02:00
athrxx
03ba1871f7 SCUMM: fixed messed up colors in 16bit HE games
(regression from 068b4a5351)
2011-06-18 19:45:36 +02:00
athrxx
cc77de35c2 SCUMM: make sure asmDrawStripToScreen is not called in 16bit mode
(fixes possible issue in LOOM PCE)
2011-06-18 13:12:13 +02:00
athrxx
0881f54a06 SCUMM: fix FM-TOWNS graphics output for ARM devices
(changed behavior of USE_ARM_GFX_ASM define)
2011-06-17 23:38:22 +02:00
athrxx
0a42a7d625 SCUMM: hopefully fix 16bit mode support for SCUMM FM-TOWNS games and LOOM PCE on Android
This mostly reverts 5b7754e3f0. Instead, we try to use other 16bit modes  after 555 fails.
2011-06-15 22:30:04 +02:00
Matthew Hoops
1277975c66 ALL: neighbour -> neighbor 2011-05-25 10:50:46 -04:00
Max Horn
068b4a5351 SCUMM: Move tmsk code into its own Gdi subclass 2011-05-13 11:47:07 +02:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Johannes Schickel
71bdb86e02 Merge pull request #16 "Add a PixelFormat to Graphics::Surface.".
For further discussion check here:
https://github.com/scummvm/scummvm/pull/16

Conflicts:
	graphics/png.cpp
2011-05-01 16:54:45 +02:00
dhewg
983b044ccb ARM: Global symbols get an underscore prefix on darwin
apply same solution as for the sound/smush ARM asm here
2011-04-23 03:39:37 +02:00
Johannes Schickel
53d982b24f SCUMM: Setup proper pixel format for virtual screen surfaces.
Thanks to Max for notifying me that SCUMM seems always to use RGB555.
2011-04-18 15:48:46 +02:00
Johannes Schickel
da734a4af0 ALL/GRAPHICS: Remove Surface::bytesPerPixel. 2011-04-17 21:27:34 +02:00
Johannes Schickel
b0bd8fa795 SCUMM: Prefer Surface::format over Surface::bytesPerPixel. 2011-04-17 20:58:07 +02:00
Max Horn
0ce2ca4e00 COMMON: Replace MKID_BE by MKTAG
MKID_BE relied on unspecified behavior of the C++ compiler,
and as such was always a bit unsafe. The new MKTAG macro
is slightly less elegant, but does no longer depend on the
behavior of the compiler.
Inspired by FFmpeg, which has an almost identical macro.
2011-04-12 16:53:15 +02:00
athrxx
92f922aabe SCUMM FM-TOWNS: cleanup (thx LordHoto) 2011-03-22 15:53:43 +01:00
Max Horn
2d1c8a3533 ALL: Fix whitespaces / indention
svn-id: r55818
2011-02-07 23:01:06 +00:00
Florian Kagerer
206971d16b SCUMM/FM-TOWNS JAPANESE: fix out of bounds text drawing
(could cause invalid memory access in MI1)

svn-id: r54079
2010-11-05 00:36:23 +00:00
Max Horn
3534cff8ef ALL: Fix indention (whitespaces -> tabs)
svn-id: r53738
2010-10-23 15:46:50 +00:00
Florian Kagerer
64c0d2a1d1 SCUMM/FM-TOWNS: minor graphics fix
This fixes a graphics glitch that occured when leaving the Scumm Bar in MI1 for the first time (before the cut scene with LeChuck).

svn-id: r53645
2010-10-20 15:39:08 +00:00
Florian Kagerer
c841c3fb7c SCUMM/FM-TOWNS: more improvements to japanese font drawing
- made use of LordHotos graphics/sjis code to reduce code duplication
- japanese mode for version 3 and 5 works fine now with few exceptions (some line spacing glitches in MI1 intro etc.)

svn-id: r53554
2010-10-17 13:08:00 +00:00
Florian Kagerer
5af782c5d2 SCUMM/FM-TOWNS: disable new graphics code in DS port
svn-id: r53033
2010-10-05 19:04:52 +00:00
Florian Kagerer
6ca15d0888 SCUMM/FM-TOWNS: fix drawBox()
svn-id: r52991
2010-10-03 14:32:09 +00:00
Florian Kagerer
77fe52bbd7 INDY3/FM-TOWNS: fix intro graphics bug
svn-id: r52987
2010-10-02 23:18:15 +00:00
Florian Kagerer
0d8f4a22ae SCUMM/FM-TOWNS: fix palette and other graphics issues
This commit should fix at least the following bugs/feature requests: #1032859, #1252088, #1055391, #1315968, #1315938, #1742106, #812891.
The FM-Towns version of Scumm games use a mixed graphics mode with 2 layers (one with 32767 colors and one with 16 colors). Among other things I have added a screen output class which emulates this  dual layer approach which allows specific hardware effects like enabling and disabling layers (e.g. in the voodoo priestess scene in MI1).

Old savegames (saved before this update) will load, but you’ll encounter palette glitches in the verb/inventory screen, since the 16 color palette for layer 2 is not contained in your savegame. This will be true at least for version 5 games. Certain scene change actions (which require the verb/inventory part to be redrawn) might correct this (e.g. try looking at the treasure map in MI1 and closing it). Version 3 games should be okay, since they use a static text palette which is never changed and which will be reset after loading a savegame.

This update requires a USE_RGB_COLORS setting for proper operation. 8 bit users will get a warning that they’ll have to expect palette glitches . Apart from that the engine in 8 bit mode should not only still work okay, but also benefit from some of the other (non palette related) improvements (e.g. bug #1032859 should be fixed even in 8 bit mode).

Japanese font drawing hasn’t been improved much yet. This will be a separate task.

svn-id: r52966
2010-10-01 19:24:52 +00:00
Travis Howell
4c215fc9a0 SCUMM: Fix bug #2702847 - PUTTZOO: Graphic glitches on dancing penguin.
svn-id: r52363
2010-08-25 06:02:18 +00:00
Max Horn
7a125f85fe SCUMM: cleanup
svn-id: r52295
2010-08-23 10:00:19 +00:00
Torbjörn Andersson
b91ef12897 Fixed typo in comment.
svn-id: r50889
2010-07-14 16:57:16 +00:00
Torbjörn Andersson
25077baf6a Moved setTileData() into GdiPCEngine since that's the only class that uses it.
svn-id: r50888
2010-07-14 16:55:32 +00:00
Max Horn
b104534d0d Patch #2973283: SCUMM: Unneeded pointer dereference
svn-id: r48360
2010-03-22 23:03:09 +00:00
Johannes Schickel
aed02365ec Strip trailing spaces/tabs.
svn-id: r47541
2010-01-25 01:39:44 +00:00
Travis Howell
bb0c765731 Exclude Loom PCE engine specific code, from non-16bit color build.
svn-id: r46080
2009-11-22 11:43:12 +00:00
Travis Howell
94e75b8b6d Fix charset palette in PCE version of Loom, based on information from Tobias.
svn-id: r46064
2009-11-22 08:36:14 +00:00
Travis Howell
2d31fc3af8 Add patch for Tobias, for Kanji support in Japanese PCE version of Loom, with minor changes.
svn-id: r46061
2009-11-22 08:20:20 +00:00
Torbjörn Andersson
149d784d0b Kirben suggested using vs->bytesPerPixel instead of _bytesPerPixel when drawing
the corners on the flashlight. He's probably right, since 'vs' is what we are
drawing to.

svn-id: r45561
2009-10-31 13:43:46 +00:00
Torbjörn Andersson
2f7f5bb4f1 Fixed flashlight drawing in 16 bpp games. (Which probably means PC-Engine Loom
is the only game where it makes any difference.)

svn-id: r45560
2009-10-31 13:34:31 +00:00
Travis Howell
f7fcec1ce2 The verb images for distaff have no mask data, in PCE version of Loom.
svn-id: r45559
2009-10-31 13:15:49 +00:00
Travis Howell
4f5a99655c Fix charset masking for 16bit color games.
svn-id: r45454
2009-10-28 04:57:54 +00:00
Travis Howell
e49065c821 Add support for distaff images in PCE version of Loom.
svn-id: r45433
2009-10-27 09:17:09 +00:00
Travis Howell
88c7ca6f8f Add patch from Tobias, for object masking support in PCE version of Loom.
svn-id: r45396
2009-10-26 10:15:05 +00:00
Travis Howell
ea91714b17 Switch PCE version of Loom to 16bit color, since it used 9bit color.
svn-id: r45393
2009-10-26 09:11:18 +00:00
Travis Howell
6b61700a7b Add patch from Tobias, for masking support in PCE version of Loom, with minor changes.
svn-id: r45387
2009-10-26 02:45:26 +00:00
Travis Howell
bb0cee730e Add/remove comments.
svn-id: r45306
2009-10-21 13:21:26 +00:00
Travis Howell
746258f882 Add patch from Tobias, for graphic support (backgrounds/objects) in PCE version of Loom, with minor changes.
svn-id: r45304
2009-10-21 12:59:10 +00:00
Max Horn
adaf3ec8b4 SCUMM: Rename _bitDepth to _bytesPerPixel
svn-id: r44336
2009-09-25 09:13:33 +00:00
Johannes Schickel
902e0699b1 Add comment about why r44322 was needed.
svn-id: r44323
2009-09-25 01:00:34 +00:00
Johannes Schickel
ec040488b7 Implement proper overflow handling in Gdi::writeRoomColor for Indy4 Amiga as described in #1294513 "FOA/Amiga: Palette problem (Regression)".
svn-id: r44322
2009-09-25 00:50:51 +00:00
Johannes Schickel
506fceeb9d Attempt to fix bug #2838205 "MONKEY: Palette glitches in Amiga version" as described on the tracker item.
svn-id: r44321
2009-09-25 00:31:46 +00:00