Commit Graph

755 Commits

Author SHA1 Message Date
Torbjörn Andersson
3fc929d66c HOPKINS: Fix cursor endian issue (I think)
I had assumed that PAL_PIXELS contained the colors encoded in
native byte order, but looking again it appears that it's always
encoded as little-endian.
2013-02-10 15:56:18 +01:00
Torbjörn Andersson
f6456003e1 HOPKINS: Fix cursor tranparency
Before, cursor images were converted to 16 bpp, and anything that
was the same as the first color in PAL_PIXELS[] was made transparent.
Now, cursors images are drawn as 8 bpp with a cursor palette created
from PAL_PIXELS[]. This preserves all the black parts of the cursor
that weren't actually color index 0.

It would be nice if we only regenerated the cursor/palette when they
have actually changed, but that's for later.
2013-02-10 12:19:41 +01:00
Strangerke
2044a71c27 HOPKINS: (mostly) fix the priority bug in the city map. Still rare visible glitches on the chimney, but the birds are ok!. 2013-02-10 11:15:19 +01:00
Strangerke
d102511da6 HOPKINS: Some more renaming in TalkManager 2013-02-10 11:14:22 +01:00
Strangerke
7927babf21 HOPKINS: Some more renaming and refactoring in TalkManager 2013-02-09 14:52:37 +01:00
Strangerke
6830416d86 HOPKINS: Some refactoring. Remove a variable from TalkManager 2013-02-08 23:51:37 +01:00
Strangerke
c29f4c71b1 HOPKINS: Improve private/public scope in TalkManager 2013-02-08 07:35:25 +01:00
Strangerke
6ce3e2187b HOPKINS: Improve private/public scope in SoundManager and ScriptManager 2013-02-08 07:29:40 +01:00
Strangerke
3de056d381 HOPKINS: Improve private/public scope in ObjectsManager 2013-02-08 06:44:28 +01:00
Strangerke
a836676312 HOPKINS:Move some variables from globals to ObjectManager 2013-02-07 22:30:40 +01:00
Strangerke
d12cd96161 HOPKINS: Improve private/public scope in Globals. Remove some useless variables, move some variables to FontManager 2013-02-07 21:56:10 +01:00
Strangerke
a542e38059 HOPKINS: Improve private/public scope in EventsManager 2013-02-07 18:56:40 +01:00
Strangerke
dd9474593f HOPKINS: Improve private/public scope in DialogsManager 2013-02-07 18:37:13 +01:00
Strangerke
0f25a60749 HOPKINS: Improve private/public scope in FontMAnager 2013-02-07 18:12:32 +01:00
Strangerke
e96edd8b19 HOPKINS: Misc refactoring and renaming, remove some dead code 2013-02-07 08:44:22 +01:00
Strangerke
901c4fabd8 HOPKINS: Remove GOTOs in cityMapCarRoute 2013-02-07 07:57:16 +01:00
Strangerke
d7c8fe9122 HOPKINS: Remove several GOTOs in PARCOURS2 2013-02-07 00:23:17 +01:00
Strangerke
9eb289d480 HOPKINS: Start refactoring GENIAL. Remove three labels and the associated GOTOs 2013-02-06 23:50:59 +01:00
Strangerke
b05ca628e8 HOPKINS: Get rid if the last GOTO in DialogManager 2013-02-06 22:13:41 +01:00
Strangerke
f35c410493 HOPKINS: Remove the last GOTO from TalkManager 2013-02-06 21:59:13 +01:00
Strangerke
2e47d8fe7a HOPKINS: Renaming in ScriptManager and DialogManager 2013-02-06 21:44:32 +01:00
Strangerke
7d40d1e2e3 HOPKINS: Remove two labels and their associated GOTOs from EventsManager 2013-02-06 19:59:23 +01:00
Strangerke
880f00150c HOPKINS: Fix regression in #fddc6497bf316e6e44b258b1c7fd9adc0749bd72 : "Menu: after the fading, a button is moved by 1 or 2 pixels" 2013-02-06 08:18:19 +01:00
Strangerke
205fdaaa0c HOPKINS: Remove a useless variable in LinesManager, some renaming 2013-02-06 08:02:18 +01:00
Strangerke
46ef222ccd HOPKINS: Remove 2 labels and associated GOTOs from ObjectManager 2013-02-06 00:11:45 +01:00
Strangerke
caefdc9439 HOPKINS: Some renaming in ObjectsManager 2013-02-05 08:00:49 +01:00
Strangerke
324da2999b HOPKINS: More refactoring and renaming in ObjectsManager 2013-02-05 07:52:46 +01:00
Strangerke
19427ff176 HOPKINS: Some refactoring in ObjectsManager 2013-02-05 00:12:42 +01:00
Strangerke
555c0ad320 HOPKINS: Fix spacing in Debugger 2013-02-04 23:01:02 +01:00
Strangerke
03257de902 HOPKINS: Refactoring in ComputerManager 2013-02-04 22:54:23 +01:00
Strangerke
98e3f09863 HOPKINS: Improve imageStr allocation, replace remaining useless reads by skips 2013-02-04 20:38:31 +01:00
Strangerke
0747f769e9 HOPKINS: Use similar naming and coding style in different functions of AnimationManager 2013-02-04 08:24:49 +01:00
Strangerke
013bbbbad4 HOPKINS: Start refactoring playSequence2. Remove 4 labels and the associated GOTOs 2013-02-04 08:07:44 +01:00
Torbjörn Andersson
2396316201 HOPKINS: Use SWAP() to swap elements in displaySprite() 2013-02-04 00:17:24 +01:00
Strangerke
ae80dc481b HOPKINS: More refactoring of playSequence in order to handle shouldQuit() 2013-02-03 23:07:51 +01:00
Strangerke
db60dcb432 HOPKINS: Replace a global variable by a parameter in playSequence() 2013-02-03 22:51:34 +01:00
Strangerke
cec23051b3 HOPKINS: Fix the Esc key behavior in playSequence, remove several GOTOs 2013-02-03 22:28:38 +01:00
Torbjörn Andersson
49afc87b88 HOPKINS: Attempt to fix crash when skipping movie
Before starting an "Swav" sound, check that its sound handle isn't
already used. If it is, stop it. When skipping a movie, it still
(incorrectly?) goes through the motions of playing the remaining
frames, including starting any movie sounds on the way.

This would cause us to lose the handle to the sound that was
currently playing in the "Swav" slot, and I *think* that's what
ended up confusing things. I'm still not entirely sure exactly
what was happening.
2013-02-03 18:33:20 +01:00
Strangerke
bce7139c8c HOPKINS: Refactor selection of action animations 2013-02-03 15:42:49 +01:00
Strangerke
5846c71469 HOPKINS: Remove debug hack left in previous commit, some tiny refactoring 2013-02-03 14:30:03 +01:00
Strangerke
5be9c19ac7 HOPKINS: flatten a leftover serie of IFs 2013-02-03 14:20:39 +01:00
Strangerke
6a477576b9 HOPKINS: Some more refactoring in BTOCEAN code 2013-02-03 14:14:08 +01:00
Strangerke
c4657c71ab HOPKINS: Get rid of 3 more labels 2013-02-03 13:50:29 +01:00
Strangerke
397c0cc238 HOPKINS: Start refactoring BTOCEAN. Get rid of two labels and their associated GOTOs 2013-02-03 13:38:51 +01:00
Strangerke
0f69da1a4f HOPKINS: Skip several useless reads in playAnim2, some more refactoring 2013-02-03 11:22:20 +01:00
Strangerke
29ce3e23f1 HOPKINS: More refactoring in playAnim2. Get rid of the remaining GOTOs 2013-02-03 11:08:37 +01:00
Strangerke
c56efbb203 HOPKINS: More refactoring in playAnim2: Get rid of another label and associated GOTO 2013-02-03 10:27:53 +01:00
Strangerke
3653f2b214 HOPKINS: Remove dead code in playAnim2, get rid of one more GOTO 2013-02-03 10:19:42 +01:00
Strangerke
f90da4dd7e HOPKINS: Get rid of another couple of GOTOs in playAnim2 2013-02-03 10:04:03 +01:00
Strangerke
aa4f39e666 HOPKINS: Remove two GOTOs in playAnim() 2013-02-03 07:59:48 +01:00
Strangerke
6797698af8 HOPKINS: Some more refactoring 2013-02-03 01:25:37 +01:00
Torbjörn Andersson
b889bb69ef HOPKINS: Fix Valgrind warnings in INILINK()
We can't read all the way to the end of the buffer, because the
READ_BE_UINT24() function will, naturally, read a few bytes ahead.
2013-02-02 23:09:29 +01:00
Torbjörn Andersson
8f300bdc30 HOPKINS: Fix GCC warnings 2013-02-02 20:26:42 +01:00
Strangerke
690405961f HOPKINS: Some refactoring in GraphicsManager 2013-02-02 19:20:58 +01:00
Torbjörn Andersson
ea4639c65f HOPKINS: Fix Sprite_Vesa() height clipping
This fixes some Valgrind warnings on the city overhead map, and also
seem to get rid of the bird "droppings" previously left behind in the
area beneath the picture. There are things I don't understand about
this function, but I hope I didn't break anything.
2013-02-02 12:41:44 +01:00
Strangerke
9772426c58 HOPKINS: Fix signness issue, get rid of another GOTO 2013-02-02 12:26:21 +01:00
Strangerke
4b0e226340 HOPKINS: Get rid of a goto in the display code. Remove useless casts (with comments about that). Some renaming. 2013-02-02 12:15:41 +01:00
Strangerke
f10d3c8dcc HOPKINS: Remove 2 more labels in EventsManager 2013-02-01 07:55:49 +01:00
Strangerke
7480957ab0 HOPKINS: Get rid of a couple of LABELS in EventsManager, some renaming 2013-02-01 07:36:13 +01:00
Strangerke
3cb6af38df HOPKINS: Some refactoring in DialogsManager 2013-02-01 00:33:01 +01:00
Strangerke
334968c5ff HOPKINS: More refactoring in AnimationManager and ComputerManager 2013-01-31 23:52:01 +01:00
Strangerke
7d743c9e77 HOPKINS: More refactoring in searchAnim 2013-01-31 08:24:34 +01:00
Strangerke
ab6826e24d HOPKINS: Start refactoring searchAnim 2013-01-31 08:18:01 +01:00
Strangerke
9dd09f6c6e HOPKINS: Remove some more casts to unsigned int 2013-01-31 07:48:44 +01:00
Strangerke
15de07ff74 HOPKINS: Introduce MKTAG24. Make use of MKTAG16 and MKTAG24 2013-01-30 08:31:32 +01:00
Strangerke
e68e3c91eb HOPKINS: USe MKTAG where possible 2013-01-30 00:17:08 +01:00
Strangerke
3b63e28a39 HOPKINS: Refactor searchCharacterAnim() 2013-01-29 23:59:25 +01:00
Strangerke
9ceb6c18cd HOPKINS: Fix regression introduced in 4ce218ef00 2013-01-29 21:16:46 +01:00
Strangerke
4fed1f580e HOPKINS: More renaming in the Global class 2013-01-29 08:35:14 +01:00
Strangerke
fbc19ab3b4 HOPKINS: Various renaming 2013-01-29 08:12:43 +01:00
Strangerke
11a0f00c25 HOPKINS: Add hack to improve the display of text on the computers, for the BeOS and OS/2 versions 2013-01-28 22:36:11 +01:00
Strangerke
c0ad052c72 HOPKINS: Add a fallback for the sound played in the option menu, for the BeOS and OS/2 versions 2013-01-28 07:45:46 +01:00
Strangerke
623360cf15 HOPKINS: Add fallback alternative for the computer font file, for the BeOS and OS/2 versions 2013-01-28 07:15:06 +01:00
Strangerke
a896975962 HOPKINS: Renaming of another variable in LinesManager 2013-01-27 23:49:20 +01:00
Strangerke
0b78d86335 HOPKINS: set private a couple of members of AnimationManager 2013-01-27 23:48:50 +01:00
Strangerke
e923cdef5b HOPKINS: Some refactoring in LinesManager 2013-01-27 23:30:40 +01:00
Strangerke
e77198081d HOPKINS: Move some more LinesManager variables to private, add some functions to access them 2013-01-27 22:53:20 +01:00
Strangerke
0f13ff5cc1 HOPKINS: More private members in LinesManager 2013-01-27 22:28:10 +01:00
Strangerke
b9f9b2c75b HOPKINS: Move some more members to LinesManager 2013-01-27 20:20:36 +01:00
Torbjörn Andersson
a50c05f7d0 HOPKINS: Work around broken cadavre.mod in OS/2 and BeOS versions
A large part of cadavre.mod is broken. No new notes play, and only
the old background sounds remain. It's possible, perhaps even
probable, that the original MOD player didn't have this problem,
but all standalone players I've tried do, so I'm assuming it's the
file that's broken. We work around it by changing the length of
the song after it's been loaded to only include the good parts.
2013-01-27 18:18:04 +01:00
Strangerke
9d1d5a09c4 HOPKINS: Move two more variables to _linesManager, set private some variables 2013-01-27 15:22:57 +01:00
Strangerke
8de1b1b996 HOPKINS: Move some more variables from Globals to LinesManager 2013-01-27 14:58:47 +01:00
Strangerke
68f5da1375 HOPKINS: Move _maxLineIdx to LinesManager, remove a useless variable 2013-01-27 14:32:05 +01:00
Strangerke
50aa4cbc73 HOPKINS: Move some structures and functions to LinesManager 2013-01-27 12:53:00 +01:00
Strangerke
e1504b28a6 HOPKINS: More renaming in LinesManager 2013-01-27 12:04:24 +01:00
Strangerke
84f7ce6ea3 HOPKINS: Refactor REPONSE 2013-01-27 01:25:46 +01:00
Strangerke
e21fed1707 HOPKINS: Simplify calls to PARCOURS2 2013-01-26 16:46:21 +01:00
Strangerke
305c820eef HOPKINS: Simplify version selection 2013-01-26 15:35:02 +01:00
Strangerke
33431f666c HOPKINS: Fix bank animation speed for OS2 and BeOS version, add code to replace display_version 2013-01-26 15:30:27 +01:00
Strangerke
4887fd6e6e HOPKINS: Refactor checkSmoothMove and makeSmoothMove 2013-01-26 14:54:57 +01:00
Strangerke
9644e865bd HOPKINS: Fix regression in pathfinding code, some more refactoring 2013-01-26 01:57:06 +01:00
Strangerke
550065b496 HOPKINS: Start refactoring PARC_PERS 2013-01-25 08:24:17 +01:00
Strangerke
06b72f3ff0 HOPKINS: More refactoring on PARCOURS2 2013-01-24 20:50:48 +01:00
Strangerke
6bd728e9c8 HOPKINS: Start refactoring PARCOURS2 2013-01-24 08:34:35 +01:00
Strangerke
59d46f36a9 HOPKINS: Refactoring in LinesManager. Fix a loop bug in PARCOURS2 2013-01-24 08:04:58 +01:00
Strangerke
e1d85a28b5 HOPKINS: Some more renaming in LinesManager. Fix a bug in last loop condition 2013-01-24 00:24:44 +01:00
Strangerke
380bf2ba1a HOPKINS: Some renaming and refactoring in ObjectsManager and LinesManager 2013-01-24 00:06:38 +01:00
Torbjörn Andersson
51df9a7f9b HOPKINS: Change a few spaces to tabs 2013-01-24 00:05:36 +01:00
Torbjörn Andersson
efe910d689 HOPKINS: Fix GCC warnings 2013-01-23 21:44:31 +01:00
Strangerke
668f2ddad7 HOPKINS: Renaming in globals and ObjectsManager 2013-01-23 08:10:36 +01:00
Strangerke
56ca87b3a5 HOPKINS: Modify misc setVolume functions so they are a bit less precise 2013-01-23 01:42:31 +01:00
Strangerke
82ecfd537f HOPKINS: Some renaming and refactoring in globals, TalkManager and FontsManager 2013-01-23 01:38:34 +01:00
Strangerke
0e0337c30e HOPKINS: Some renaming. Implement proper music volume during speech 2013-01-22 21:24:31 +01:00
Strangerke
c056266cdd HOPKINS: rename one more field, fix glitch in ObjectsManager 2013-01-22 18:59:01 +01:00
Strangerke
6a8d6e6eca HOPKINS: Fix error in loop conditions. Thanks Eriktorbjorn for noticing 2013-01-22 07:59:21 +01:00
Strangerke
1a3fb10d91 HOPKINS: Some renaming 2013-01-22 07:53:59 +01:00
Strangerke
704a36d1fb HOPKINS: More renaming in ObjectsManager and globals 2013-01-21 22:25:12 +01:00
Strangerke
2cd0d1f4a1 Hopkins: More renaming 2013-01-21 19:15:37 +01:00
Strangerke
33636f0d63 HOPKINS: More renaming in ObjectsManager 2013-01-21 18:59:17 +01:00
Strangerke
de2fa9a81f HOPKINS: Rename several structures 2013-01-21 07:50:12 +01:00
Strangerke
daa6c887ef HOPKINS: Remove useless fields in ObjectsManager, some renaming 2013-01-21 00:06:50 +01:00
Strangerke
7b063288d6 HOPKINS: Fix error in PARADISE (field16 vs field10), rename some fields 2013-01-20 23:36:58 +01:00
Strangerke
f9b4fe09da HOPKINS: Fix regression introduced in 5678fbd321: Glitch while speaking. Thanks to eriktorbjorn for noticing and bisecting the problem 2013-01-20 22:46:00 +01:00
Strangerke
2c69135c99 HOPKINS: Get rid of GOTOs in FontManager 2013-01-20 20:49:08 +01:00
Strangerke
d92f85f0e1 HOPKINS: Some more renaming and refactoring 2013-01-20 19:12:45 +01:00
Strangerke
568e645417 HOPKINS: Refactor playIntro 2013-01-20 17:47:35 +01:00
Strangerke
4c44e797d8 HOPKINS: Fix speech in intro for BeOS and OS/2 versions. Thanks Eriktorbjorn for the help 2013-01-20 13:44:14 +01:00
Strangerke
e5db285cd6 HOPKINS: Add Spanish computer text 2013-01-20 12:43:34 +01:00
Strangerke
db80d0d0df HOPKINS: Some more renaming 2013-01-20 12:33:59 +01:00
Strangerke
3878138d8f HOPKINS: Some renaming in GraphicsManager and HopkinsEngine 2013-01-20 11:28:39 +01:00
Strangerke
17d57a367e HOPKINS: Remove WSOUND_INIT 2013-01-20 01:04:52 +01:00
Strangerke
d88e5ad22f HOPKINS: Remove a couple of useless functions 2013-01-20 01:01:09 +01:00
Strangerke
523aa82563 HOPKINS: Some renaming 2013-01-20 00:56:19 +01:00
Strangerke
1e2723576a HOPKINS: Fix regression introduced in 9c58c936c8 2013-01-19 14:12:37 +01:00
Strangerke
ca2f04b70f HOPKINS: The first speech after a video was skipped if the video was skipped before. This fixes it. 2013-01-18 22:23:58 +01:00
Strangerke
0d92a7e5a3 HOPKINS: Add support for RAW speechs used by the OS/2 version 2013-01-18 21:09:41 +01:00
Strangerke
4fd4a5ce05 HOPKINS: Fix cut&paste error in searchCat. Thanks eriktorbjorn for pointing at it 2013-01-18 19:03:38 +01:00
Strangerke
4fd422692b HOPKINS: Some renaming and refactoring 2013-01-18 18:52:19 +01:00
Strangerke
55b288e98b HOPKINS: Add some specific BeOS and OS2 files 2013-01-18 18:51:30 +01:00
Strangerke
9c58c936c8 HOPKINS: Some renaming and refactoring 2013-01-18 08:32:07 +01:00
Strangerke
c8c1c88654 HOPKINS: Remove a lot of useless variables in ObjectsManager 2013-01-17 20:06:00 +01:00
Strangerke
8a41d3c1fc HOPKINS: (on behalf of fuzzie) Fix zoom bug introduced in 1c5a6f8c74 2013-01-17 19:04:44 +01:00
Strangerke
d90720dee1 HOPKINS: Some simplifications in handleOpcode() 2013-01-17 08:35:24 +01:00
Strangerke
4ce218ef00 HOPKINS: Fix a BE issue 2013-01-17 08:20:19 +01:00
Strangerke
b7abcf2bfb HOPKINS: Fix loops on zoom in Affiche_perfect. Thanks fuzzie for the help! 2013-01-17 00:18:53 +01:00
Strangerke
ae4d99b165 HOPKINS: Move 4 int to boolean in TalkManager 2013-01-16 23:48:09 +01:00
Strangerke
4d16fb1bbd HOPKINS: More refactoring in TalkManager 2013-01-16 23:38:03 +01:00
Strangerke
ae93d1f6ee HOPKINS: Some refactoring in TalkManager 2013-01-16 21:15:30 +01:00
Strangerke
fe60baf1df HOPKINS: Fix mouse cursor 25 in nextVerbIcon ("use coffin") 2013-01-16 17:17:13 +01:00
Strangerke
58af4bc675 HOPKINS: More refactoring in Hopkins (Thanks fuzzie for the help) 2013-01-16 02:00:29 +01:00
Strangerke
ec59e1496f HOPKINS: More refactoring in ObjectsManager 2013-01-15 08:39:41 +01:00
Strangerke
4410da443c HOPKINS: More refactoring in ObjectsManager 2013-01-15 08:22:27 +01:00
Strangerke
c7ee7c7ba8 HOPKINS: Refactor several functions in ObjectsManager 2013-01-15 07:29:02 +01:00
Strangerke
5ef0a5ed2c HOPKINS: Rename _newDirection 2013-01-14 21:56:25 +01:00
Strangerke
6d7de82623 HOPKINS: Get rid of GOTOs in GOHOME 2013-01-14 19:24:25 +01:00
Strangerke
ec2feb4aec HOPKINS: Rename old Direction fields 2013-01-14 08:04:38 +01:00
Strangerke
75ba8bfb88 HOPKINS: Rename car related fields, remove map car sprite index 2013-01-14 07:58:06 +01:00
Strangerke
65c61ab6d7 HOPKINS: Add synchronization of car position on the city map 2013-01-14 07:52:24 +01:00
Strangerke
6856556a1a HOPKINS: Fix regression in 5a961b104f. Thanks to Eriktorbjorn for the analysis of the issue 2013-01-13 23:10:06 +01:00
Strangerke
dd7676a37e HOPKINS: Fix regression in Bomb display. This was caused by the use of the wrong sprite file (two files with the same name) 2013-01-13 19:56:04 +01:00