Commit Graph

493 Commits

Author SHA1 Message Date
Max Horn
5e7988ae6f checkin for LavosSpawn: 'work around bug #778105 (line width exceeded)'
svn-id: r9262
2003-07-28 20:59:53 +00:00
Joost Peters
fa2d02ce6d applied eriktorbjorn's patch (#776225 - 'BASS CD intro fixes')
svn-id: r9150
2003-07-23 19:33:34 +00:00
Travis Howell
dc25058c3e Add game specific scaler override to sky
Add game specific scaler and full screen override to simon

svn-id: r9067
2003-07-18 15:37:06 +00:00
Robert Göffringmann
76de27e097 fix additional array read
svn-id: r9054
2003-07-17 00:35:32 +00:00
Robert Göffringmann
301f1cdf08 reprogrammed sky intros.
svn-id: r9053
2003-07-17 00:17:42 +00:00
Joost Peters
91ee8e1c10 Quick-Fix for the OOB access in RNC decoder.
Obviously this should be fixed in the decoder itself,
but for some reason I couldn't get it to work in a short period of time.
(before every offending READ_UINT16(), I had a call to function that was like this: "if ((_srcPtr - _startPtr) >= _packLen) { _srcPtr -= 2; }", note that _srcPtr is the current position in the buffer, _startPos is the starting position of the buffer and _packLen is the (supposed?) size.
but I would still get "Invalid Read of 2" with this in Valgrind ..maybe someone knows what I did wrong?)

svn-id: r9050
2003-07-16 13:55:18 +00:00
Travis Howell
2b7227679a Use debug output instead of warnings for simon
Fix debug output in sky

svn-id: r9039
2003-07-15 16:40:24 +00:00
Robert Göffringmann
66823befe2 maybe this fixed those random crashes...
svn-id: r9021
2003-07-14 20:01:54 +00:00
Robert Göffringmann
ffb65a9e04 fix bug #770784: Talking characters stay at last frame
svn-id: r9010
2003-07-14 10:05:32 +00:00
Robert Göffringmann
e997d05b3c fixed toggling music on/off after savegame restore
svn-id: r9007
2003-07-14 09:26:50 +00:00
Robert Göffringmann
d971845fab fixed text drawing bug and made sure autosave doesn't save if engine is in logic_choose mode
svn-id: r9006
2003-07-14 09:16:12 +00:00
Max Horn
963ecad362 debug/warning/error all automatically output a newline
svn-id: r8991
2003-07-13 16:22:17 +00:00
Robert Göffringmann
3304c40f26 changed "sprite not loaded" printfs to debug()s.
svn-id: r8989
2003-07-13 15:38:59 +00:00
Robert Göffringmann
43ab712892 sound support for v.0.0109
svn-id: r8967
2003-07-13 06:04:39 +00:00
Robert Göffringmann
3b8a146152 music support for BASS floppy demo v.0.0109.
adlib doesn't really work, but the rest of the game doesn't either... so who cares, anyway.

svn-id: r8966
2003-07-13 06:04:11 +00:00
Robert Göffringmann
61b8b227c0 fix set-volume crash.
svn-id: r8964
2003-07-13 04:26:55 +00:00
Oliver Kiehl
a87fd1011d fix intro
svn-id: r8960
2003-07-12 23:29:31 +00:00
Travis Howell
9e8dcf879d Didn't help
svn-id: r8950
2003-07-12 17:07:53 +00:00
Travis Howell
6ea1d54f50 A few mino changes for pc gamer demo
svn-id: r8949
2003-07-12 16:54:30 +00:00
Robert Göffringmann
7c92fb40ae try all languages, if selected one can't be found.
svn-id: r8946
2003-07-12 15:26:07 +00:00
Robert Göffringmann
5825d77e37 added khalek's huffman tree for 0.0109
svn-id: r8945
2003-07-12 15:21:34 +00:00
Nicolas Bacca
ad66be2b57 Add WinCE virtual keyboard
svn-id: r8944
2003-07-12 13:15:12 +00:00
Jonathan Gray
97b67117d3 add some stuff for v0.0109
svn-id: r8936
2003-07-12 10:02:12 +00:00
Oliver Kiehl
99cd9df6f7 add newline at end of file to make gcc happy
svn-id: r8933
2003-07-12 08:55:23 +00:00
Robert Göffringmann
2ccaa6f1af fix Swedish quit message
svn-id: r8932
2003-07-12 06:39:55 +00:00
Robert Göffringmann
8e776dea07 fixed mt32 key velocities
svn-id: r8931
2003-07-12 06:20:40 +00:00
Robert Göffringmann
3e578daa01 get music volume from command line
svn-id: r8930
2003-07-12 06:12:54 +00:00
Robert Göffringmann
4e406387ad one more small fix
svn-id: r8929
2003-07-12 05:57:53 +00:00
Robert Göffringmann
fbb0ddcc34 keep virgin logo from flashing up when using -x
svn-id: r8928
2003-07-12 05:52:28 +00:00
Robert Göffringmann
67a760d10c floppy versions don't seem to have all languages in their datafiles.
svn-id: r8927
2003-07-12 05:38:04 +00:00
Robert Göffringmann
cb48b4fca0 implemented -x command line option
svn-id: r8926
2003-07-12 05:26:23 +00:00
Robert Göffringmann
b241be004d removed useless _backScreen from SkyScreen
svn-id: r8923
2003-07-12 04:21:20 +00:00
Robert Göffringmann
8b36d14696 added support for different languages and fixed memory leak and screen refreshes in load/save dialogs
svn-id: r8921
2003-07-12 03:40:44 +00:00
Robert Göffringmann
4dd927f1cf added dialog skipping by pressing '.'
svn-id: r8920
2003-07-12 02:07:37 +00:00
Robert Göffringmann
a857771521 implemented dialog skipping and cleaned up mouse code
svn-id: r8919
2003-07-12 01:12:00 +00:00
Robert Göffringmann
24be1e1682 fix endian specific color palette bugs.
svn-id: r8917
2003-07-11 23:56:28 +00:00
Robert Göffringmann
fa921ad6d6 fixed screen blit during fnDrawScreen
svn-id: r8916
2003-07-11 22:59:56 +00:00
Robert Göffringmann
f89c68c6f1 added autosaving every 5 minutes
svn-id: r8915
2003-07-11 22:19:16 +00:00
Robert Göffringmann
021aa93c6c removed useless additional mapping tables and fixed crash in LINC section
svn-id: r8914
2003-07-11 22:09:21 +00:00
Robert Göffringmann
693ea1d6f2 fixed item descriptions
svn-id: r8913
2003-07-11 19:41:37 +00:00
Robert Göffringmann
226543582e big endian fix
svn-id: r8912
2003-07-11 18:56:57 +00:00
Nicolas Bacca
333ea0e300 Avoid deadlock
svn-id: r8911
2003-07-11 15:52:46 +00:00
Jamieson Christian
378856a693 Post FMOPL-reversion cleanup.
svn-id: r8906
2003-07-11 10:23:13 +00:00
Jamieson Christian
8b8b964aad Reverted to "old" YM3812 (FMOPL) emulator code.
Until specific information regarding the benefits
of migrating to the new emulator can be made
available, the "old" code will remain in effect
for the benefit of slower hardware platforms such
as some WinCE-based devices.

svn-id: r8903
2003-07-11 07:14:21 +00:00
Oliver Kiehl
85ef932330 fix compile
svn-id: r8901
2003-07-10 20:22:26 +00:00
Robert Göffringmann
49cd3bdfff forgot a #endif
svn-id: r8900
2003-07-10 20:15:11 +00:00
Robert Göffringmann
b3247c5e5f fixed endian specific palette bugs for restarting game and control panel
svn-id: r8899
2003-07-10 20:09:19 +00:00
Jonathan Gray
71ca768c67 abide by command line request for no subtitles if running the cd version
svn-id: r8898
2003-07-10 10:36:24 +00:00
Robert Göffringmann
a9ae95a64e implemented fnOpenHand/fnCloseHand, added debug cheats
svn-id: r8896
2003-07-10 08:24:16 +00:00
Robert Göffringmann
6ae8144929 whoops.
svn-id: r8895
2003-07-10 07:56:35 +00:00
Torbjörn Andersson
989b155044 Slight cleanup. Fixes a few minor memory leaks, I believe.
svn-id: r8894
2003-07-10 07:09:25 +00:00
Robert Göffringmann
1bedb9ebbf forgot to allow restarting from control panel
svn-id: r8887
2003-07-10 02:13:53 +00:00
Robert Göffringmann
5aba29ae2d this fixes bug #768724 (text width exceeded in LINC terminal).
I wonder though, if this isn't in fact a bug in the huffman tree.

svn-id: r8886
2003-07-10 01:55:48 +00:00
Robert Göffringmann
96f442923c implemented fnRestartGame() and skipping of 2nd intro part
svn-id: r8885
2003-07-10 00:08:07 +00:00
Robert Göffringmann
5f9845b2cb added toggling music on/off
svn-id: r8884
2003-07-09 18:12:58 +00:00
Robert Göffringmann
2c065bcffe activated speed slider in SkyControl, fixed different charsets in control panel when entering from LINC terminal, etc.
svn-id: r8883
2003-07-09 17:50:57 +00:00
Robert Göffringmann
a8b9b2a180 SoundMixer::setMusicVolume() doesn't seem to do anything, so set music volume manually....
svn-id: r8882
2003-07-09 17:22:45 +00:00
Torbjörn Andersson
f3a1aa73b3 Fix character spacing for LINC terminals in v0.0288 as well. I've only
tested is a little on a borrowed copy of BASS, but I think it should look
the same as v0.0372 now.

svn-id: r8881
2003-07-09 16:54:34 +00:00
Torbjörn Andersson
2b127e74af The charSpacing values for _controlCharacterSet and _linkCharacterSet
appear to have been swapped. Now the LINC terminal texts should fit in
the screen area, and text in LINC space should look less "squashed".

svn-id: r8877
2003-07-09 07:02:57 +00:00
Jonathan Gray
345c368cf0 revert to last revision of musicbase that doesn't cause a segfault here anymore
svn-id: r8876
2003-07-09 04:31:24 +00:00
Robert Göffringmann
6d84c67906 /me slaps himself
svn-id: r8875
2003-07-09 00:35:41 +00:00
Robert Göffringmann
bae011dbd6 script data is the same for 0.0365, 0.0368 and 0.0372, so allow switching saved games.
svn-id: r8874
2003-07-09 00:31:49 +00:00
Robert Göffringmann
6c66bf2ee4 this is for letting BASS wait for the end of the ending theme before starting the next song. It's kinda hacky to put it into the music code, but I can't think of another way to do it while keeping the engine running like usual.
svn-id: r8873
2003-07-08 23:25:51 +00:00
Robert Göffringmann
4fb3e9a448 another fix for the swing seqs
svn-id: r8869
2003-07-08 22:27:17 +00:00
Robert Göffringmann
3d9b20bb86 fixed file loading bugs for v.0.0331, control panel works now
svn-id: r8868
2003-07-08 22:08:29 +00:00
Robert Göffringmann
d33d562ce5 button text for save and restore doesn't disappear anymore.
+ fixed screen updates for swing seqs.

svn-id: r8844
2003-07-07 17:00:55 +00:00
Robert Göffringmann
b53435dfce applied patch #766751 (BASS: Waiting for floppy intro music to finish) and fixed music bug (jukebox at St. James didn't stop playing)
svn-id: r8843
2003-07-07 16:40:27 +00:00
Torbjörn Andersson
2e35b6b330 Fixed warning.
svn-id: r8842
2003-07-07 15:21:37 +00:00
Robert Göffringmann
2ad7b1e796 applied patch #766979 (BASS: Possible fix for problem with cut-off speech).
added small change to SFX samplerate, sparky doesn't sound like a bird now, either.

svn-id: r8840
2003-07-07 14:58:53 +00:00
Torbjörn Andersson
c3150fea58 This seems to fix the inventory sprite for the glass, and is more
consistent with the rest of the loadFixedItems() function.

svn-id: r8832
2003-07-07 06:45:33 +00:00
Robert Göffringmann
2a334f176c fixed M$VC++ warnings in text.cpp and added code to disk.cpp which may or may not fix graphics problems in hobbins' room on big endian systems (can't test that).
svn-id: r8830
2003-07-07 02:54:59 +00:00
Max Horn
001e7bb717 another fix kudos to LavosSpawn
svn-id: r8829
2003-07-07 02:32:20 +00:00
Max Horn
e72f9e813b endian fix by LavosSpawn (helps a lot :-)
svn-id: r8828
2003-07-07 01:36:24 +00:00
Max Horn
37ec2a14bb undo this change after discussion with LavosSpawn (doesn't work in either case anyway :-)
svn-id: r8827
2003-07-07 00:39:22 +00:00
Max Horn
0a51114708 naother dataFileHeader change
svn-id: r8826
2003-07-07 00:27:31 +00:00
Max Horn
9091a516a2 don't convert to LE, dataFileHeader is in native endianess
svn-id: r8825
2003-07-07 00:22:41 +00:00
Max Horn
41912bc685 use our standard cast style
svn-id: r8824
2003-07-07 00:14:16 +00:00
Max Horn
3dca18c935 cleanup this doxygen comment (li and arg are the same; we are using autobrief; don't mix the JavaDoc and Qt styles; don't duplicate the function signature, there is no need for that and it gets out of sync (as in this case)
svn-id: r8823
2003-07-06 23:48:17 +00:00
Max Horn
70973f69be run mouse script on BE systems (not that it works)
svn-id: r8822
2003-07-06 23:47:25 +00:00
Max Horn
297aaa9f4e don't use FROM_LE_16 here since loadFile already convertes the header to the correct endianess
svn-id: r8820
2003-07-06 23:06:53 +00:00
Max Horn
4e373ffb8e endian fix, cleanup
svn-id: r8819
2003-07-06 22:52:15 +00:00
Max Horn
68ee2e9051 add const qualifier
svn-id: r8818
2003-07-06 22:50:37 +00:00
Robert Göffringmann
2061741bd5 fix bug #766744 (BASS: Crash when quitting while quitting)
svn-id: r8817
2003-07-06 21:33:22 +00:00
Robert Göffringmann
f13b228ac4 fixed decoding for special characters. 0.0303 is still incorrect, need joost's help for that.
svn-id: r8815
2003-07-06 21:03:39 +00:00
Torbjörn Andersson
7de3870c13 This fixes the drawing order of the pillow and magazine in Reich's
apartment. Look out for regressions, though I haven't seen any yet myself.

svn-id: r8804
2003-07-06 15:56:13 +00:00
Robert Göffringmann
bd160e09cf fixed bug #765892 (bottom bar in F5 menu not used)
svn-id: r8783
2003-07-05 16:40:12 +00:00
Robert Göffringmann
d3bdb565fc Dont show cursor when restoring game
+ warn user when he tries loading an old savegame (not that pretty, yet)

svn-id: r8781
2003-07-05 15:47:45 +00:00
Max Horn
d098334fe6 updated code to use type MutexRef; added class StackLock (from sdl backend, now in util.*)
svn-id: r8777
2003-07-05 15:19:11 +00:00
Joost Peters
455eb4ea44 fix warning
svn-id: r8774
2003-07-05 11:47:15 +00:00
James Brown
d5aa3bd41c Fix sky fullscreen from launcher
svn-id: r8766
2003-07-05 09:08:53 +00:00
Robert Göffringmann
e22e3438e2 fixed cursor and allowed pressing enter for loading and saving, too.
svn-id: r8760
2003-07-05 03:32:41 +00:00
Robert Göffringmann
9f277f1ed0 hope this fixes problems about cut-off speech.
svn-id: r8759
2003-07-05 03:05:54 +00:00
Joost Peters
2abe6a9126 better mouse hotspot, seems the same as in the original now...only tested on first few scenes & control panel though
svn-id: r8758
2003-07-05 03:00:26 +00:00
Joost Peters
a476409d81 added hufftext.o
svn-id: r8757
2003-07-05 02:52:11 +00:00
Robert Göffringmann
2a33eb6cbe fixed control panel palette for v. 0.0348
svn-id: r8756
2003-07-05 02:33:56 +00:00
Robert Göffringmann
989d67951c corrected all huffman trees and moved them out of text.cpp
svn-id: r8755
2003-07-05 02:21:19 +00:00
Joost Peters
934611c348 applied eriktorbjorn's floppy-intro-with-cd-version patch (#765885)
svn-id: r8753
2003-07-05 00:57:03 +00:00
Joost Peters
39509be92c fixed warning
svn-id: r8752
2003-07-05 00:29:16 +00:00
Robert Göffringmann
5854c6a7de make sky detect v.0.0348 (even though not existing ;)
svn-id: r8751
2003-07-04 23:26:46 +00:00
Robert Göffringmann
a4bd31578b support text and speech at the same time
svn-id: r8750
2003-07-04 22:39:10 +00:00
Robert Göffringmann
67ba28170f don't let user enter too long save names
svn-id: r8749
2003-07-04 20:31:41 +00:00
Robert Göffringmann
f24ca1fcdc removed some useless lines
svn-id: r8748
2003-07-04 20:17:26 +00:00
Robert Göffringmann
484d0a84c5 SFX is working correctly now. also implemented queued fx and fx saving.
The bass version is now included in the savegames, too.

svn-id: r8747
2003-07-04 20:14:11 +00:00
James Brown
c419e8d3dc Make 80 column people happy. Sheesh, it's only an egg.
svn-id: r8745
2003-07-04 15:14:47 +00:00
James Brown
bb267e7191 Remove homage to original's misspelling of pseudo. Honest.
svn-id: r8744
2003-07-04 15:10:49 +00:00
James Brown
ca3eb3f9d0 Because I can.
svn-id: r8743
2003-07-04 15:03:54 +00:00
Joost Peters
8d4c6d7999 show detected game version at startup. (hopefully this will stop the wave of 'how do I find out what version I have' questions. we still need to alter the detection to allow 0.0348 to be the detected since it can't be uniquely identified by the number of dnr-entries (i.e. it has the same amount as v0.0331)
svn-id: r8734
2003-07-04 10:19:39 +00:00
Max Horn
097a2bc9d1 fixed warning
svn-id: r8730
2003-07-03 22:52:17 +00:00
Robert Göffringmann
16031e1b00 whoops
svn-id: r8729
2003-07-03 22:36:45 +00:00
Robert Göffringmann
396c34d44b fixed showGameQuitMsg() and temporarily disabled sfx looping
svn-id: r8728
2003-07-03 22:32:18 +00:00
Robert Göffringmann
2ea85c6d4e Compact data for v. 0.0288, works as well as 0.0368 now.
svn-id: r8723
2003-07-03 17:17:32 +00:00
Max Horn
3e902944eb added .cvsignore
svn-id: r8711
2003-07-02 13:47:48 +00:00
Torbjörn Andersson
cd269445f5 Initialize midiChannelNumber to 0. I don't know if this is always the right
thing to do, but leaving it unintialized isn't a good idea either since
that will cause stopMusic() to send bad commands to the MIDI driver in some
cases.

At least in the case of the ALSA driver, this will cause ScummVM to
terminate with an "Unknown Command" error.

svn-id: r8705
2003-07-02 06:43:24 +00:00
Robert Göffringmann
1b5ea45887 fixed save/restore grid problems
svn-id: r8703
2003-07-02 01:46:25 +00:00
Joost Peters
14cfa71ab7 oops
svn-id: r8702
2003-07-02 01:31:35 +00:00
Joost Peters
4248c08555 Control panel should be disabled for ALL demo versions
svn-id: r8701
2003-07-02 01:24:05 +00:00
Joost Peters
cff9817d44 removed unnecessary variables
svn-id: r8694
2003-07-01 23:44:31 +00:00
Robert Göffringmann
c66457664e removed useless AR saving leftovers and implemented fnRestoreGame()
svn-id: r8693
2003-07-01 23:31:29 +00:00
Joost Peters
b7f9b1a5d8 fixed warnings
svn-id: r8692
2003-07-01 22:51:49 +00:00
Robert Göffringmann
665ab4a8d9 bass is completable now.
svn-id: r8691
2003-07-01 22:21:20 +00:00
Robert Göffringmann
ffaeb5424f fixed mouse restore on savegame restore and bug in fnTheyStartSub
svn-id: r8690
2003-07-01 16:06:09 +00:00
Max Horn
89be032afd fixed warning
svn-id: r8687
2003-07-01 13:07:17 +00:00
Robert Göffringmann
6e3cfa8a4e bypassed copy protection, fixed crash when disconnecting from link space, fixed logix swing seqs
svn-id: r8686
2003-07-01 13:04:00 +00:00
Robert Göffringmann
2c9a784be8 finished loading and saving, fixed grid bugs (some debugging code not yet removed), implemented fnLincTextModule
svn-id: r8682
2003-07-01 01:29:29 +00:00
Robert Göffringmann
ec64f23f22 fixed race condition when loading different sections
svn-id: r8681
2003-07-01 01:27:50 +00:00
Robert Göffringmann
b421c9fde9 finally fixed this stupid animation bug
svn-id: r8675
2003-06-30 16:59:41 +00:00
Robert Göffringmann
1ba62a6598 bugfix. doesn't seem to affect anything, though.
svn-id: r8670
2003-06-27 14:42:45 +00:00
Max Horn
9218b70b0c fixed warnings
svn-id: r8669
2003-06-27 13:23:01 +00:00
Robert Göffringmann
ca0ebf3aef fixed text decoding bug
svn-id: r8668
2003-06-27 12:11:50 +00:00
Robert Göffringmann
1785e0e305 some more loading & saving work (still unfinished)
svn-id: r8663
2003-06-27 02:54:05 +00:00
Max Horn
d3c7f26850 another warning
svn-id: r8637
2003-06-22 22:36:28 +00:00
Max Horn
2e634be4e9 fixed warnings
svn-id: r8636
2003-06-22 22:34:25 +00:00
Robert Göffringmann
a61fda9948 whoops
svn-id: r8633
2003-06-22 22:00:56 +00:00
Robert Göffringmann
f891aceee3 native mt32 support and basic control panel (incomplete)
doesn't work with all versions, probably file numbers were changed

svn-id: r8632
2003-06-22 21:42:59 +00:00
Robert Göffringmann
7f20bdfeba removed send(0) command.
svn-id: r8530
2003-06-17 12:34:56 +00:00
Robert Göffringmann
81b7b265b9 fixed grid position calculation
svn-id: r8529
2003-06-17 12:27:03 +00:00
Robert Göffringmann
61491fb295 don't restart music if the same track is already playing
svn-id: r8528
2003-06-17 12:26:25 +00:00
Max Horn
101df28e0b moved GameId declaration to common/engine.h (more logical); moved scumm specific stuff from gameDetector.h to scumm.h; cleaned up some #includes (ideally, never #include something in a header file if you can avoid it - this cuts down interdepencies)
svn-id: r8496
2003-06-15 01:42:19 +00:00
Oliver Kiehl
90b96f2e16 fix bug #754378 (I hope)
svn-id: r8466
2003-06-14 11:48:09 +00:00
Oliver Kiehl
e1c655f10f fix 0.0368 text decoding bug
svn-id: r8465
2003-06-14 10:14:28 +00:00
Jamieson Christian
a26c74c108 Added MSVC6 truncation warning to #pragma
svn-id: r8430
2003-06-11 05:06:22 +00:00
Robert Göffringmann
70fa08ab52 Sky shouldn't error() if no speech file exists for a sentence
svn-id: r8426
2003-06-09 23:37:51 +00:00
Robert Göffringmann
8f0bdc4657 Sky shouldn't error() if no speech file exists for a sentence
svn-id: r8425
2003-06-09 23:27:31 +00:00
Max Horn
4c5501d0c3 fixed warning
svn-id: r8424
2003-06-09 23:21:31 +00:00
Robert Göffringmann
797eaee433 removed debugging leftovers, fixed one more sprite clipping issue.
svn-id: r8423
2003-06-09 23:02:56 +00:00
Robert Göffringmann
d95e9d09dd whoops.
svn-id: r8422
2003-06-09 20:45:00 +00:00
Robert Göffringmann
1f6a8b4fb8 fixed issue about file decompression.
svn-id: r8421
2003-06-09 20:41:08 +00:00
Robert Göffringmann
d899de98ba fixed compact data
svn-id: r8420
2003-06-09 20:38:26 +00:00
Joost Peters
74bacc470f mouse-fixes, note that: buttonPressed() keeping track of a repeated push DOES NOT WORK YET, _bMouseB gets cleared elsewhere, so we obviously need to come up with something else. and we still need a wait_relative equivalent to have a proper fnLookAt() ...hmm...this commit message is starting to look like a todo list. oh, well. :)
svn-id: r8419
2003-06-09 18:58:37 +00:00
Joost Peters
d398b818f8 added fnLookAt()
svn-id: r8418
2003-06-09 18:15:02 +00:00