Commit Graph

538 Commits

Author SHA1 Message Date
Matthew Hoops
0031c41db8 COMMON: Change kPlatformPC to kPlatformDOS
"PC" was very ambiguous and now it matches what we show in the GUI.

This also corrects sword2's platform to Windows.
2013-05-02 18:43:10 -04:00
Filippos Karapetis
f3f3d5bcbf TINSEL: Clear the screen with the correct color in DW1 Mac 2013-05-01 03:53:00 +03:00
Filippos Karapetis
5692c378ec TINSEL: Simplify palette endianess conversions 2013-05-01 03:50:29 +03:00
Torbjörn Andersson
50c8fae6ec TINSEL: Reorder loop condition to fix out-of-bounds access
This should fix CID 1003943 and CID 1003944.
2013-04-26 23:38:20 +02:00
Filippos Karapetis
95f92ed9de TINSEL: Add support for enhanced music in the Mac version of DW1 2013-04-12 19:31:11 +03:00
Filippos Karapetis
687e47d332 TINSEL: Remove the unused ghost palette 2013-04-12 07:19:53 +03:00
Filippos Karapetis
94b328fa7f TINSEL: Fix black/white colors in the Mac version of DW1 2013-04-12 07:19:53 +03:00
Filippos Karapetis
53e82436e6 TINSEL: Simplify overflow calculation inside MacDrawTiles()
Thanks to wjp for noticing this
2013-04-12 07:19:52 +03:00
Filippos Karapetis
a9886f1c26 TINSEL: Fix typo 2013-04-12 07:19:52 +03:00
Filippos Karapetis
d45534d29d TINSEL: Remove the unused noFadeTable parameter from the fader functions 2013-04-12 07:19:52 +03:00
Willem Jan Palenstijn
2d1fd3b554 ALL: Fix typo (existant->existent) 2013-02-23 22:07:32 +01:00
Torbjörn Andersson
304ac2a7c4 TINSEL: Fix another Clang analyzer warning
Whether or not SaveFailure() can delete the save file, we want to
invalidate the save name because it probably only lives on the
stack so the pointer will become invalid once DoSave() has ended.
2013-01-02 21:25:51 +01:00
Filippos Karapetis
55fee6d97b TINSEL: Enhanced music is not supported in the Mac version of DW1
Also, did some minor whitespace formatting
2012-12-18 02:24:46 +02:00
Filippos Karapetis
1214b7a7e4 TINSEL: Enable the detection entries for DW1 Mac (both the demo and the full version) 2012-12-15 21:07:38 +02:00
Filippos Karapetis
6f81d914f2 TINSEL: Fix sprite clipping in DW1 Mac 2012-12-15 19:52:27 +02:00
Filippos Karapetis
96397a5741 TINSEL: Initial version of the graphics drawing function for DW1 Mac
Still some graphical glitches remain, as clipping isn't done correctly
2012-12-15 08:14:55 +02:00
Filippos Karapetis
b41d78bdd8 TINSEL: Fix intro scene skipping in DW1 Mac 2012-12-15 08:14:55 +02:00
Filippos Karapetis
1713d7ee3c TINSEL: Always convert the inventory objects to the native endianess
This is needed for DW1 Mac
2012-12-15 08:14:54 +02:00
Matthew Hoops
a0863dfb3f TINSEL: Silence gcc warning 2012-12-13 17:46:16 -05:00
Filippos Karapetis
11b920d8ae TINSEL: Fix a comment in playDW1MacMusic()
Thanks to clone2727 for noticing
2012-12-13 03:41:15 +02:00
Filippos Karapetis
07994fb361 TINSEL: Add support for the digitized music in DW1 Mac 2012-12-13 03:09:41 +02:00
Filippos Karapetis
a3f22b8804 TINSEL: Unify the PSX graphics drawing code with the rest
This is nitpicking, for uniformity which I forgot to add in a previous
cleanup commit
2012-12-13 02:00:59 +02:00
Filippos Karapetis
fe3737f7a3 TINSEL: Remove outdated comment 2012-12-13 01:59:33 +02:00
Filippos Karapetis
576d92e286 TINSEL: Clean up the sound code 2012-12-13 01:58:47 +02:00
Filippos Karapetis
b1732f9aca TINSEL: Clean up the graphics draw types code 2012-12-11 23:46:57 +02:00
Filippos Karapetis
45fcbdcd8c TINSEL: Fix misleading comment 2012-12-11 22:46:50 +02:00
Filippos Karapetis
532194db1f TINSEL: Fix the colors in the Mac version of DW1 2012-12-11 22:40:19 +02:00
Filippos Karapetis
344d6bc2da TINSEL: An additional endianess fix for DW1 Mac
This will also need testing on a BE system
2012-12-11 04:04:04 +02:00
Filippos Karapetis
f23e7a246c TINSEL: Merge the different TinselV0/V1 graphics code handlers 2012-12-11 04:03:22 +02:00
Filippos Karapetis
ee613fe77b TINSEL: The speech file in DW1 Mac demo/full is LE 2012-12-11 03:14:10 +02:00
Filippos Karapetis
e08fa202d6 TINSEL: Handle the invalid max polygons value in DW1 Mac 2012-12-11 03:10:50 +02:00
Filippos Karapetis
6c0a24fd7c TINSEL: Add an initial incomplete graphics decoder for DW1 Mac
Part of the game graphics is now shown
2012-12-11 03:06:50 +02:00
Filippos Karapetis
e21a547667 TINSEL: Fix what seems to be two bugs in the endianess handling code
This will need to be tested in a BE system for correctness. Fixes
the Mac version of DW1
2012-12-11 03:04:59 +02:00
Filippos Karapetis
394ff22232 TINSEL: Add another check to skip the non-MIDI music of DW1 Mac 2012-12-11 02:59:30 +02:00
Filippos Karapetis
b05fa7f204 TINSEL: Add resource handling of the BE resources in DW1 Mac
This is the second attempt. All the BE resources of DW1 Mac are
handled correctly now. Added READ_16, READ_32, FROM_16, FROM_32 and
TO_32 to handle all of the different cases where endianess is
already handled. Note that the game scripts are LE, so these
haven't been changed
2012-12-11 02:56:48 +02:00
Filippos Karapetis
ce87175bed TINSEL: Revert the BE -> LE resource conversion for DW1 Mac
This was a bad idea, as we ended up with another place where the
resource files were processed. Thus, I'm moving back to handling the
BE resources of the Mac version in the engine itself
2012-12-11 02:41:51 +02:00
Torbjörn Andersson
4914bea358 TINSEL: Remove unused variable 2012-12-10 20:07:17 +01:00
Filippos Karapetis
b532a81b42 TINSEL: Add a WIP BE To LE SCN file conversion code (unfinished)
This is a cleaner approach to handle the Mac version of DW1 (demo
and full versions - refer to bug #3110936). This way, we can keep
the game engine as LE even with the Mac BE resource files.

Both the demo and the full version progress up to drawing the scene
graphics now and crash because of the currently unhandled bitmap
chunk.
2012-12-10 17:38:24 +02:00
Filippos Karapetis
c90d56355f TINSEL: Simplify the scene entrance handling code
This also reverts the rest of the BE resource handling code
2012-12-10 17:38:23 +02:00
Filippos Karapetis
c6cf4827d7 TINSEL: Revert most of the engine BE resource handling code
This was added in commit 3fdddd53b2.
However, having handling for both BE and LE resource complicates
the engine code unnecessarily. Thus, a different approach will be
done.
2012-12-10 17:38:22 +02:00
Torbjörn Andersson
da971e38a5 TINSEL: Fix misleading comment
I missed these in my scroll wheel pull request, but better late
than never.
2012-12-03 20:00:08 +01:00
David Turner
2509b6475c Merge pull request #294 from eriktorbjorn/tinsel-scrollwheel
TINSEL: Add scrollwheel support to save/load and inventory
2012-12-03 04:05:14 -08:00
Filippos Karapetis
3fdddd53b2 TINSEL: Start handling the BE resources of the Mac versions of DW1
Refer to bug #3110936

This is still work in progress, but it doesn't affect the rest
of the LE versions of DW1. Both the Mac demo and the full
version still crash. The music in the Mac version is skipped for
now, as it isn't MIDI
2012-12-01 21:53:33 +02:00
Torbjörn Andersson
220fb66364 TINSEL: Add scrollwheel support to save/load and inventory 2012-11-24 11:06:42 +01:00
Torbjörn Andersson
0da424efb6 TINSEL: Fix typo in comment 2012-11-22 23:11:27 +01:00
Torbjörn Andersson
29afdabb6b TINSEL: Fix inventory scrollbar handle position
The scrollbar handle was one pixel too far to the left, and the
topmost position was off by one as well. I've verified this to the
best of my ability. I've compared it visually in DOSBox (which is
a bit tricky for Discworld 2, but I think it's right now), and
against the initial Tinsel v1 source code that was added to
ScummVM. I don't know what the initial Tinsel v2 source code
looked like, though.
2012-11-22 23:04:12 +01:00
Torbjörn Andersson
c16de405d7 TINSEL: Fix inventory scrolling
Adjusted NM_SLIDE_INSET and NM_SLIDE_THICKNESS to make the inventory
scrollbar work as it did before Tinsel v1 and v2 were combined. The
scrollbar worked before, but you had to click a bit to the left of
it to operate it. It's the only place in the code where these
constants are used, so it should not break anything else.
2012-11-22 22:12:51 +01:00
Johannes Schickel
89abab97e3 JANITORIAL: Remove trailing whitespaces.
Powered by:
git ls-files "*.cpp" "*.h" "*.m" "*.mm" | xargs sed -i -e 's/[ \t]*$//'
2012-09-26 04:17:55 +02:00
Filippos Karapetis
e9730ca597 TINSEL: Fix bug #3541542 - "DW: PSX version dies when pressing ESC in intro"
DW1 PSX seems to have its own scene skipping code for scenes 2 and 3, thus
injecting our own causes it to hang. Scenes 2 and 3 can be skipped separately.
2012-09-03 04:32:31 +03:00
Paul Gilbert
2dee92a908 TINSEL: Fixed portability issue with earlier savegames 2012-08-06 20:03:56 +10:00