libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-25 11:15:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,284 Commits 5 Branches 5 Tags 1.8 GiB
a2dad74da1
Commit Graph

426 Commits

Author SHA1 Message Date
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
Jamieson Christian
839cb1c4f7 Fixed VC++ warnings 
svn-id: r8417
 2003-06-09 16:38:47 +00:00
Robert Göffringmann
0fabcc6571 fixed SkyLogic bug and made font highlightning finally correct. 
svn-id: r8416
 2003-06-09 14:31:38 +00:00
Robert Göffringmann
0eac9a00cf whoops. 
svn-id: r8413
 2003-06-09 02:53:00 +00:00
Robert Göffringmann
68bb844d63 some talk-related bugs fixed 
svn-id: r8412
 2003-06-09 02:33:27 +00:00
Max Horn
be9e6e85db added quit event 
svn-id: r8398
 2003-06-08 12:11:14 +00:00
Max Horn
4b227da824 Preparations for removing GF_AFTER_V? flags 
svn-id: r8364
 2003-06-06 22:51:33 +00:00
Joost Peters
0f9d447bd4 add fnRandom() 
svn-id: r8359
 2003-06-06 20:54:52 +00:00
Robert Göffringmann
89c6d29c95 forgot to remove that 
svn-id: r8358
 2003-06-06 18:08:16 +00:00
Robert Göffringmann
4d5a284704 changed sprite priority, changed some errors to warnings and added hack to get past the first scene 
svn-id: r8357
 2003-06-06 17:59:22 +00:00
Robert Göffringmann
1fcbdf792b forgot to activate that code again 
svn-id: r8356
 2003-06-06 17:02:10 +00:00
Robert Göffringmann
09b1baf731 misc fixes 
svn-id: r8355
 2003-06-06 16:40:44 +00:00
Joost Peters
64ffbe6021 add some (mouse) stubs 
svn-id: r8354
 2003-06-06 14:40:46 +00:00
Robert Göffringmann
1326772037 whoops. 
svn-id: r8353
 2003-06-06 14:04:16 +00:00
Robert Göffringmann
e02875be67 fix logic script bugs. 
svn-id: r8352
 2003-06-06 13:55:16 +00:00
Joost Peters
d813deb5e8 changed warning() to error(), this is how it is in the original, and this seems to happen when you try to exit the underground-bar currently, don't know why yet. 
svn-id: r8351
 2003-06-06 13:44:49 +00:00
Robert Göffringmann
8e8c702e65 forgot to implement right mousebutton. :) 
svn-id: r8343
 2003-06-06 01:14:17 +00:00
Robert Göffringmann
ddf44b0275 small bugfix, menu still doesn't work. -_- 
svn-id: r8342
 2003-06-06 00:56:59 +00:00
Joost Peters
ba81aa9f76 proper mouse transparancy fix, should work for all cursors now 
svn-id: r8338
 2003-06-05 23:18:10 +00:00
Oliver Kiehl
1200d5997e fixed switch opcode 
svn-id: r8337
 2003-06-05 22:26:06 +00:00
Joost Peters
717bdd9223 fixed mouse cursor/transparency 
svn-id: r8336
 2003-06-05 21:46:59 +00:00
Robert Göffringmann
4a934a5519 make mouse move to middle of screen at start and let skystate initialize its _objectList 
svn-id: r8335
 2003-06-05 20:37:52 +00:00
Robert Göffringmann
98b3712163 fixed caching routines 
svn-id: r8334
 2003-06-05 19:45:27 +00:00
Robert Göffringmann
8e253b1937 fixed sprite drawing, added some mouse support and some logic routines. 
svn-id: r8332
 2003-06-05 18:54:26 +00:00
Robert Göffringmann
0845c0adf0 fixed two mouse bugs 
svn-id: r8296
 2003-06-04 18:02:41 +00:00
Joost Peters
d496cecc98 some more mouse stuff.. 
svn-id: r8295
 2003-06-04 17:13:24 +00:00
Robert Göffringmann
fc350e6be6 some more inits to make compiler happy. 
svn-id: r8287
 2003-06-03 18:35:18 +00:00
Robert Göffringmann
5d70cc1b10 reduced number of copy_rects() during sequences. 
svn-id: r8286
 2003-06-03 18:10:32 +00:00
Max Horn
bedd8c4d39 fixxed warning 
svn-id: r8277
 2003-06-02 21:43:45 +00:00
Oliver Kiehl
6c24f7dc44 fix disappearing foster bug 
svn-id: r8268
 2003-06-02 09:35:08 +00:00
Robert Göffringmann
9a450413cd forgot to remove debug printfs and to make sequenceRunning volatile. 
svn-id: r8267
 2003-06-02 06:48:36 +00:00
Robert Göffringmann
3ac5b4ccfa added some functions to SkyLogic, -Screen, -Talk and -Disk, moved SkyGrid out of SkyState 
svn-id: r8266
 2003-06-02 06:42:42 +00:00
Robert Göffringmann
ee886a6be2 fixed sprite animation bug in stdSpeak, cleaned fnTalk and made text timing in cd version depending on the end of the voc files being reached. 
svn-id: r8262
 2003-06-02 03:30:41 +00:00
Robert Göffringmann
1014c98fcb screen combine rectangles now. even a bit less cpu usage. 
svn-id: r8258
 2003-06-02 00:53:31 +00:00
Robert Göffringmann
e95a72f7c4 fix intro timing + text 
svn-id: r8256
 2003-06-02 00:01:34 +00:00
Robert Göffringmann
f8ead8a776 remove useless screen updates, make non-seq intro parts escapable. 
svn-id: r8255
 2003-06-01 22:53:44 +00:00
Robert Göffringmann
5bb59b4755 cleaned code a bit, added SYSTEM_FLAGS and MOUSE_FLAG 
svn-id: r8253
 2003-06-01 21:21:10 +00:00
Robert Göffringmann
674a34a392 fixing sprite commit from yesterday 
svn-id: r8252
 2003-06-01 19:34:28 +00:00
Oliver Kiehl
3e87539b5c use FROM_LE_16, indentation cleanup 
svn-id: r8239
 2003-06-01 13:29:28 +00:00
Joost Peters
4cef98bf6d add fnNormalMouse() 
svn-id: r8238
 2003-06-01 13:20:55 +00:00
Oliver Kiehl
41c1e94ea5 some VERY hacky SkyLogic::talk support 
svn-id: r8237
 2003-06-01 13:12:10 +00:00
Joost Peters
a29074ed08 actually show mouse this time 
svn-id: r8234
 2003-06-01 13:07:20 +00:00
Joost Peters
063c310917 added some buggy, incomplete mouse code 
svn-id: r8233
 2003-06-01 12:49:39 +00:00
Robert Göffringmann
b3e1668970 I hope(!) SkyScreen is big endian compatible now. 
svn-id: r8227
 2003-06-01 05:02:14 +00:00
Robert Göffringmann
20893a2d23 fixed sprite animation bug. Door closes completely now. 
svn-id: r8226
 2003-06-01 04:34:11 +00:00
Robert Göffringmann
22b5009a35 whoops 
svn-id: r8221
 2003-06-01 03:49:05 +00:00
Robert Göffringmann
d67c53d756 basic ingame speech support 
svn-id: r8220
 2003-06-01 03:44:07 +00:00
Robert Göffringmann
557be6cbfa fixed screen coordinates bug for stdSpeak 
svn-id: r8204
 2003-06-01 00:47:57 +00:00
Joost Peters
69db2c0515 oops. forgot this. 
svn-id: r8200
 2003-06-01 00:02:51 +00:00
Joost Peters
6b64849acd fixed sillty mistakes - must've been on crack when I coded this.. 
svn-id: r8199
 2003-05-31 23:42:23 +00:00
Oliver Kiehl
30b0702ef5 that wasn't meant to get commited 
svn-id: r8192
 2003-05-31 20:53:55 +00:00
Oliver Kiehl
e1e7daa1c5 Some really cheap doxygen documentation 
svn-id: r8191
 2003-05-31 20:53:00 +00:00
Oliver Kiehl
9a56d08fe8 forgot to commit this file earlier 
svn-id: r8187
 2003-05-31 17:19:42 +00:00
Oliver Kiehl
7497828734 cleanup, add some doxygen docs 
svn-id: r8184
 2003-05-31 16:25:15 +00:00
Paweł Kołodziejski
945dacb247 cleanup endlines 
svn-id: r8168
 2003-05-31 11:53:28 +00:00
Oliver Kiehl
693b7126d6 add .cvsignore 
svn-id: r8149
 2003-05-30 16:08:21 +00:00
Oliver Kiehl
68a2e52889 some temporary debug cleanup 
svn-id: r8148
 2003-05-30 16:06:43 +00:00
Oliver Kiehl
32e4e1aa51 fix bug 
svn-id: r8147
 2003-05-30 16:01:07 +00:00
Joost Peters
6eca1c98c7 fixed stupid bug 
svn-id: r8144
 2003-05-30 14:48:09 +00:00
Joost Peters
60df623fee stdSpeak() - buggy 
svn-id: r8141
 2003-05-30 14:20:32 +00:00
Joost Peters
4e3e0aac3a added fnSpeak* functions 
svn-id: r8139
 2003-05-30 13:47:33 +00:00
Oliver Kiehl
9c98000f25 cleanup 
svn-id: r8138
 2003-05-30 13:35:34 +00:00
Oliver Kiehl
a7c5dbf7aa bugfix 
svn-id: r8137
 2003-05-30 13:08:13 +00:00
Joost Peters
f88dc73bb3 fixed bug 
svn-id: r8136
 2003-05-30 13:07:27 +00:00
Joost Peters
7dc20e84fe added talk animations 
svn-id: r8135
 2003-05-30 12:55:20 +00:00
Oliver Kiehl
ab3e5f8d40 add sound effects 
svn-id: r8134
 2003-05-30 11:07:30 +00:00
Travis Howell
864fbb1d99 Fix compile 
svn-id: r8122
 2003-05-30 00:00:49 +00:00
Robert Göffringmann
c1dfd566d5 stop sounds when escaping intro 
svn-id: r8120
 2003-05-29 23:15:36 +00:00