Commit Graph

88 Commits

Author SHA1 Message Date
Torbjörn Andersson
d8b0a38718 When showMenu() redraws the menu, redraw the empty slots as well. This
fixes the "ghost" items left behind when combining two inventory objects in
such a way that one of them is used up.

svn-id: r12001
2003-12-28 18:10:18 +00:00
Torbjörn Andersson
302c9f72fc I believe this is the evil bug that's been corrupting my SAVEGAME.INF. (I
can't reproduce the problem under Windows though.)

svn-id: r11996
2003-12-28 15:02:21 +00:00
Torbjörn Andersson
db5a2ba1c8 Not all sound effects are mono, so we need to check.
svn-id: r11995
2003-12-28 15:01:44 +00:00
Travis Howell
8640153331 Search additional folder for BS1
svn-id: r11956
2003-12-27 05:43:03 +00:00
Jonathan Gray
a3b09e7313 look for data/speech1/2.clu and data/speech/speech.clu, instead of data/speech1/2.clu and data/speech/speech1/2.clu fixes running from cd or using the same layout as the cd
svn-id: r11934
2003-12-26 03:07:01 +00:00
Max Horn
859a9c0129 o Added SoundMixer::isReady()
o Removed SoundMixer::bindToSystem()
o In scumm, replaced _silentMixer, _silentDigitalImuse and _noDigitalSamples by SoundMixer::isReady()

svn-id: r11893
2003-12-24 17:42:22 +00:00
Max Horn
e9269257f3 turned PlayingSoundHandle into an 'opaque' (well not really :-) data type, mainly because people kept (accidentally and sometimes on purpose :-) misusing them
svn-id: r11881
2003-12-24 00:25:18 +00:00
Robert Göffringmann
88d7cd586d fix control panel bug
svn-id: r11878
2003-12-23 17:34:23 +00:00
Robert Göffringmann
e35a7a2b90 control panel changes
svn-id: r11877
2003-12-23 16:58:06 +00:00
Nicolas Bacca
a1831ee4fb Microsoft Compilers : Which part of the standard do you want to break today ?
svn-id: r11866
2003-12-23 00:59:18 +00:00
Max Horn
13d0571018 fix warnings
svn-id: r11863
2003-12-22 23:45:55 +00:00
Robert Göffringmann
e9ff3a1146 fixed some animation bugs
svn-id: r11862
2003-12-22 23:38:23 +00:00
Robert Göffringmann
2df01e0abb fixed screen and music fading
svn-id: r11861
2003-12-22 23:21:28 +00:00
Torbjörn Andersson
1605103a06 Change to arrow cursor when displaying the inventory menu
svn-id: r11854
2003-12-22 17:38:49 +00:00
Robert Göffringmann
7fec7cc1ae another change to verticalMask(). this should fix the remaining sprite priority issues
svn-id: r11853
2003-12-22 11:51:27 +00:00
Robert Göffringmann
42cea0975a added fnSetPaletteToFade/fnSetPaletteToCut
svn-id: r11851
2003-12-22 11:23:40 +00:00
Robert Göffringmann
44f1ed75fd added code for non-looping music and implemented fading
svn-id: r11845
2003-12-22 02:47:43 +00:00
Robert Göffringmann
fd4417e6bb changed the way the control panel is started
svn-id: r11844
2003-12-22 01:20:47 +00:00
Robert Göffringmann
6b0fb6585c work around a GCC bug.
svn-id: r11843
2003-12-22 00:34:02 +00:00
Robert Göffringmann
7def9b7efb added workaround for scriptbug (fixes ending sequence).
Sword1 is completable now with some graphical glitches left to fix.

svn-id: r11841
2003-12-21 21:58:36 +00:00
Robert Göffringmann
e342d624d0 fix mouse bugs (fixes chess puzzle)
svn-id: r11834
2003-12-21 18:50:05 +00:00
Torbjörn Andersson
a5eca2df04 Highlight the correct (I hope!) menu icon during conversation, and do the
cheesy menu fade-in/fade-out.

svn-id: r11831
2003-12-21 17:55:40 +00:00
Robert Göffringmann
6df4db88cd fixed scrolling
svn-id: r11830
2003-12-21 17:45:15 +00:00
Robert Göffringmann
44887cc33d fixed parallax drawing for room 54
svn-id: r11828
2003-12-21 17:34:44 +00:00
Torbjörn Andersson
ed991734a3 warning fix
svn-id: r11827
2003-12-21 17:16:07 +00:00
Robert Göffringmann
5d8516f2ec now two inventory items can be combined
svn-id: r11823
2003-12-21 16:50:02 +00:00
Robert Göffringmann
71057255ea changed speech code, should now play all waves correctly
svn-id: r11815
2003-12-21 15:55:55 +00:00
Marcus Comstedt
e7cf0557f8 stdafx.h first, please.
svn-id: r11814
2003-12-21 15:54:26 +00:00
Max Horn
f19f73eb50 Make it possible for game detection functions to detect language/platform (not yet done by any detector, but will come with the MD5 detection code)
svn-id: r11811
2003-12-21 15:29:52 +00:00
Max Horn
ff83b4cb24 fix warning
svn-id: r11790
2003-12-20 21:56:48 +00:00
Robert Göffringmann
2554ced5e9 fixed crashes after restoring a savegame, added fnSetPaletteToFade and changed speech code to distinguish between CD1 and CD2. (now needs SPEECH1.CLU and SPEECH2.CLU)
svn-id: r11789
2003-12-20 20:20:53 +00:00
Robert Göffringmann
1007e8256f fix memory leak
svn-id: r11788
2003-12-20 19:19:42 +00:00
Robert Göffringmann
be120d1289 fix recently introduced mouse bugs.
svn-id: r11787
2003-12-20 17:55:09 +00:00
Robert Göffringmann
2c19e18fc8 I hope this fixes the control panel for other BS1 versions.
svn-id: r11785
2003-12-20 16:30:58 +00:00
Robert Göffringmann
f533de72e4 sprites should now be rendered correctly.
svn-id: r11784
2003-12-20 15:26:44 +00:00
Torbjörn Andersson
8789ca10e3 Modified the calculation of where to draw parallaxes to be more like the
one in Broken Sword II. At least the first room appears to behave like the
original now. (Except for a masking bug, which is almost certainly
unrelated to parallaxes.)

svn-id: r11781
2003-12-20 13:43:40 +00:00
Torbjörn Andersson
456f01b8fd A comment in decompressRLE0() said that the images are vertically flipped,
but I'm not so sure. I've changed the code to assume that they're not, and
this fixes both the drawing of the worker in the background of the first
room, and of the fan at the police station.

svn-id: r11780
2003-12-20 13:35:00 +00:00
Travis Howell
030236fe62 Add new object
svn-id: r11777
2003-12-20 09:20:14 +00:00
Robert Göffringmann
da3eed35b5 forgot these. :)
svn-id: r11776
2003-12-20 09:18:43 +00:00
Robert Göffringmann
59654b1719 added SwordControl (the control panel). Not yet finished.
svn-id: r11775
2003-12-20 09:12:54 +00:00
Torbjörn Andersson
34433d87bb Changed abs() to ABS(), and changed a sorting function to use SWAP()
svn-id: r11761
2003-12-19 14:16:31 +00:00
Torbjörn Andersson
b179e8f6ec Whitespace changes
svn-id: r11760
2003-12-19 14:07:12 +00:00
Torbjörn Andersson
a3310a5de9 Make sure that playSample() gets a pointer to the original QueueElement
instead of a copy of it. Otherwise the sound engine will never notice when
a sample finishes playing since it's looking at the wrong sound handle.

For whatever reason, this also seems to fix the "game crashes occasionally
on startup with completely useless stack trace" bug for me. The crash was
easily repeatable in Valgrind for me, but the messages it produced were
just as unhelpful as the stack trace. These messages are also gone now.

svn-id: r11757
2003-12-19 06:51:32 +00:00
Max Horn
0cddca5f43 unregister the premix proc when you go away
svn-id: r11755
2003-12-19 01:08:30 +00:00
Robert Göffringmann
ee2c8b2ddb fix mouse cursor animations
svn-id: r11748
2003-12-18 14:38:17 +00:00
Robert Göffringmann
501b7d687a fixed endian bug in animDriver()
svn-id: r11747
2003-12-18 14:16:08 +00:00
Robert Göffringmann
a74f8eb717 endian conversion for music system
svn-id: r11746
2003-12-18 13:17:33 +00:00
Robert Göffringmann
461abf1b9e another big endian
svn-id: r11745
2003-12-18 12:52:04 +00:00
Robert Göffringmann
65583e28da SwordText big endian fixes
svn-id: r11744
2003-12-18 12:45:40 +00:00
Robert Göffringmann
312abd7486 endian fix for router.
svn-id: r11743
2003-12-18 12:15:59 +00:00