Commit Graph

324 Commits

Author SHA1 Message Date
Travis Howell
8b9e8cb812 More simon 2 targets (amiga/mac ports)
svn-id: r6396
2003-01-11 15:38:37 +00:00
Travis Howell
e8b784e18a This isn't a fixme
svn-id: r6337
2003-01-05 12:38:04 +00:00
Travis Howell
3224d39f65 Alter fix me comment
svn-id: r6336
2003-01-05 12:20:31 +00:00
Travis Howell
6414e9a255 Remove fixme
svn-id: r6335
2003-01-05 10:40:44 +00:00
Travis Howell
c502a72f6e Fix error in my last commit
svn-id: r6334
2003-01-05 00:58:30 +00:00
Travis Howell
98578cbfff Small cleanup
svn-id: r6333
2003-01-05 00:47:49 +00:00
Max Horn
c2f816b246 use proper C++ now so that it compiles again on GCC 3
svn-id: r6332
2003-01-04 19:11:45 +00:00
Travis Howell
b989a3a934 Fix crashes in simon2dos/talkie caused by my music changes awhile back.
svn-id: r6328
2003-01-04 08:46:10 +00:00
Travis Howell
5111eede5e Don't crash if sound effect file doesn't exist
svn-id: r6327
2003-01-03 12:33:53 +00:00
Travis Howell
3a4782f166 Add olki's patch for sound effects in simon1dos
Plus hack to allow choice between midi music and sound effects via 's' key

svn-id: r6326
2003-01-03 12:06:30 +00:00
Travis Howell
758dca49c9 Improve error message when data files are missing
svn-id: r6324
2003-01-03 10:36:13 +00:00
Travis Howell
303acc02bb Remove sion 1 music warning
Change warning about missing vga file to error

svn-id: r6323
2003-01-03 04:24:16 +00:00
Max Horn
2c01dc8536 even more -peantic fixes
svn-id: r6111
2002-12-25 00:48:13 +00:00
Travis Howell
2e66c05f47 Remove the fixme
svn-id: r6058
2002-12-22 09:26:42 +00:00
Travis Howell
a3dae7bc3c Add default skip cut scene keys from original games.
Fix error in last commit

svn-id: r6057
2002-12-22 09:04:27 +00:00
Travis Howell
987a823ffe First attempt at proper simon 2 midi support
Thanks to olki's previous work

svn-id: r6056
2002-12-22 08:08:53 +00:00
Travis Howell
0c3626c9f4 Some _lock_word corrections
svn-id: r6054
2002-12-22 03:54:51 +00:00
Jamieson Christian
e4b1a7e709 MidiStreamer no longer derives from MidiDriver.
Removed MidiStreamer methods that weren't actually needed.
That's one layer of indirection removed from Simon music.

svn-id: r6050
2002-12-21 21:32:45 +00:00
Travis Howell
e347600e11 Fix some comments and add missing variable change
svn-id: r6027
2002-12-19 15:46:02 +00:00
Travis Howell
4811fe5bc2 *** empty log message ***
svn-id: r6026
2002-12-19 14:45:14 +00:00
Travis Howell
fb408bb00d Fix error in last commit
svn-id: r6025
2002-12-19 14:43:17 +00:00
Travis Howell
f1ee93b898 Add missing code
svn-id: r6024
2002-12-19 14:34:26 +00:00
Travis Howell
5233fbc7bd Fix error in my last commit
Remove hack

svn-id: r6009
2002-12-17 14:05:44 +00:00
Marcus Comstedt
fadf55aad0 Added missing include of "stdafx.h".
svn-id: r6006
2002-12-17 01:06:04 +00:00
Travis Howell
29ea4a4c49 Missed one
svn-id: r5957
2002-12-14 15:56:17 +00:00
Travis Howell
490dbf25a2 Remove commented code thats no longer needed.
svn-id: r5956
2002-12-14 15:48:58 +00:00
Travis Howell
2c16f43c8a Enable missing code
svn-id: r5954
2002-12-14 15:35:32 +00:00
Travis Howell
6338b96639 Fix error in last commit
svn-id: r5913
2002-12-12 11:23:43 +00:00
Travis Howell
a454add929 Small code cleanup
svn-id: r5912
2002-12-12 11:07:01 +00:00
Travis Howell
1b10fcbdbb Remove fixme which is no longer required
svn-id: r5910
2002-12-12 02:55:57 +00:00
Jamieson Christian
d577b2ece6 Changed handling of malformed pitchbend events.
Added related warning output for future reference.

svn-id: r5909
2002-12-12 02:39:33 +00:00
Max Horn
bf62494fd5 ripped out obsolete midi streaming code from backends (this may break Alsa/SEQ/Windows/Morphos compile, I tried my best, but you'll have to clean up after me)
svn-id: r5905
2002-12-11 16:09:58 +00:00
Travis Howell
5bf87dd368 Simon 2 music correction
svn-id: r5904
2002-12-11 15:02:12 +00:00
Oliver Kiehl
6582e62e14 fixed compile error in VC++
svn-id: r5897
2002-12-10 09:50:22 +00:00
Oliver Kiehl
4598518dbc now simon versions with trailing dots after filenames also load correctly
svn-id: r5891
2002-12-08 23:06:11 +00:00
Max Horn
4dc93957da fix backspace key on OS X
svn-id: r5887
2002-12-08 19:43:11 +00:00
Travis Howell
2986adb53d Correct error in last commit
svn-id: r5884
2002-12-08 15:39:57 +00:00
Travis Howell
3472a5c1e7 A few video opcode renames
svn-id: r5883
2002-12-08 14:48:56 +00:00
Oliver Kiehl
6102cca2a1 fixed Plato's two-fold error
svn-id: r5878
2002-12-08 13:37:38 +00:00
Travis Howell
42d24ba562 small code cleanup
svn-id: r5877
2002-12-08 12:44:57 +00:00
Travis Howell
149aa08ba2 Cut scenes can only be skipped by Esc key now
A right mouse click allows skips of speech, even in intro.

svn-id: r5875
2002-12-08 02:01:28 +00:00
Travis Howell
1715a60b26 Prevent another pointless warning
svn-id: r5874
2002-12-08 01:30:19 +00:00
Oliver Kiehl
6049cc9035 cleanup
svn-id: r5871
2002-12-07 18:00:25 +00:00
Oliver Kiehl
a42d84f01e added the possibility to interrupt conversations in simon2 as in the original game
svn-id: r5870
2002-12-07 17:36:38 +00:00
Oliver Kiehl
0ecd439fe1 added function to interrupt voice
svn-id: r5869
2002-12-07 17:35:34 +00:00
Oliver Kiehl
5f756f5cca fixed speach getting turned off
added <escape> to skip cutscenes
cleanup

svn-id: r5867
2002-12-07 13:05:58 +00:00
Travis Howell
ad1ad142d0 Add debug levels for simon games
svn-id: r5860
2002-12-06 15:24:14 +00:00
Travis Howell
927c2920dc Fix vc++ warning
svn-id: r5858
2002-12-06 14:40:40 +00:00
Travis Howell
1c5c851913 Add support for 'u' german umlaut
svn-id: r5854
2002-12-06 06:50:07 +00:00
Travis Howell
710a311c0e Enable debug keys and warnings only if debug mode selected.
Fix fast mode

svn-id: r5851
2002-12-06 02:14:37 +00:00
Oliver Kiehl
6e49b481fc cleanup
svn-id: r5844
2002-12-05 22:57:12 +00:00
Oliver Kiehl
632f44a1a4 cleanup
svn-id: r5841
2002-12-04 22:40:16 +00:00
Travis Howell
79c5861a52 Remove silly warning
svn-id: r5820
2002-12-03 05:39:30 +00:00
Travis Howell
fdcdb9e4fa Last minute simon fixes
Full simon 2 intro now works
All simon 2 cut scenes can be skipped
One simon 2 freeze completely fixed

svn-id: r5819
2002-12-03 05:34:55 +00:00
Nicolas Bacca
c60306cc44 better ...
svn-id: r5808
2002-12-02 00:11:22 +00:00
Nicolas Bacca
718b935d48 Fix WinCE keyboard + change quit key for foreign languages (fixme ?)
svn-id: r5806
2002-12-02 00:05:05 +00:00
Oliver Kiehl
7e77138a3f new randimizer for simon
svn-id: r5784
2002-12-01 15:36:36 +00:00
Travis Howell
1c8599066b Change dump start vgascript into separate option again.
svn-id: r5769
2002-12-01 08:56:04 +00:00
Travis Howell
5f0aa9c15a Prevent pointless warning about missing sound file
svn-id: r5768
2002-12-01 08:02:35 +00:00
Oliver Kiehl
ae7310ff28 cleanup
svn-id: r5758
2002-11-30 11:07:06 +00:00
Oliver Kiehl
613423037f renamed simonsound
svn-id: r5755
2002-11-29 22:13:20 +00:00
Oliver Kiehl
485d0cab81 renamed simonsound to sound
svn-id: r5754
2002-11-29 22:11:23 +00:00
Oliver Kiehl
a3415fb798 renamed simonsound on Fingolfin's request
svn-id: r5753
2002-11-29 22:09:52 +00:00
Travis Howell
50e2752ba1 phase 3
svn-id: r5751
2002-11-29 16:50:15 +00:00
Travis Howell
7dd2bd4dc6 Fix dump_vga_bitmaps and restrict to win32 only
svn-id: r5750
2002-11-29 16:06:15 +00:00
Travis Howell
a4df406569 add license
svn-id: r5748
2002-11-29 15:19:45 +00:00
Travis Howell
61a7d1cc86 Add missing comments
svn-id: r5743
2002-11-29 12:01:03 +00:00
Travis Howell
189a686916 phase two
svn-id: r5742
2002-11-29 11:42:00 +00:00
Travis Howell
6d3decb597 Rename video opcodes phase one
svn-id: r5741
2002-11-29 10:18:32 +00:00
Travis Howell
82b2ab3be5 Disable extra debug output again since it causes crashes when viewing debug output
svn-id: r5739
2002-11-29 09:09:35 +00:00
Travis Howell
66c6879d45 Add work around to allow vc_65 to be enabled
svn-id: r5735
2002-11-28 05:52:55 +00:00
Travis Howell
3c96baa2e4 Add Named unknown variable in simon, patch #644907
svn-id: r5733
2002-11-28 00:22:24 +00:00
Oliver Kiehl
36e4281c42 removed no longer used NUM_EFFECTS_RESOURCES and NUM_VOICE_RESOURCES from GameSpecificSettings
svn-id: r5730
2002-11-27 15:46:48 +00:00
Oliver Kiehl
e6883de2ff moved game enum to intern.h
svn-id: r5728
2002-11-27 15:08:24 +00:00
Oliver Kiehl
1aa1a77f05 fixed a stupid mistake of mine
svn-id: r5725
2002-11-26 22:00:17 +00:00
Oliver Kiehl
c7054d514e had forgotten to add the GPL header
svn-id: r5722
2002-11-26 16:55:57 +00:00
Oliver Kiehl
4544d24fe2 oops
svn-id: r5720
2002-11-26 16:43:50 +00:00
Oliver Kiehl
a51c1eb5b7 cleanup
svn-id: r5719
2002-11-26 16:35:20 +00:00
Oliver Kiehl
656fa878b0 removed some no longer used variable declarations
svn-id: r5713
2002-11-24 15:26:19 +00:00
Travis Howell
dd2ada5741 Use command line/config file setting for music volume
svn-id: r5712
2002-11-24 14:47:07 +00:00
Travis Howell
37f43fe2ba Missed a few disabled debugs
svn-id: r5711
2002-11-24 13:44:24 +00:00
Travis Howell
40983dcf68 The vc_62 warning should be for simon 2 only
svn-id: r5710
2002-11-24 13:37:50 +00:00
Travis Howell
5888d9b16d Disable/remove some warnings
Enable more debugging

svn-id: r5709
2002-11-24 13:31:38 +00:00
Oliver Kiehl
ba94e0ac40 fixed last commit
svn-id: r5708
2002-11-24 13:21:31 +00:00
Travis Howell
f63dda7ecf Add back changes that were reverted by mistake
svn-id: r5707
2002-11-24 13:05:44 +00:00
Oliver Kiehl
9098225910 split simon sound
svn-id: r5706
2002-11-24 12:53:01 +00:00
Travis Howell
347662f91e Add vc_65 (commented out for now, since it requires another function)
Add warning to vc_62 where it should be playing music.

svn-id: r5703
2002-11-24 03:07:52 +00:00
Travis Howell
6ed12bc6aa Simon stuff
svn-id: r5700
2002-11-23 16:08:38 +00:00
Travis Howell
f2eeb91ca8 Music volume just uses + and - now, key mapping works
svn-id: r5698
2002-11-23 02:22:54 +00:00
Jamieson Christian
e68d425cdc Broke MidiStreamer into .h and .cpp components.
svn-id: r5682
2002-11-21 19:26:44 +00:00
Max Horn
69bceafc6e revamped build system somewhat: 'modules' like scumm, simon, gui etc. now all build into a lib, and all have a module.mk file that lists all their file. Advantage: further modularizes the build system, seperating all parts of ScummVM
svn-id: r5653
2002-11-21 04:08:37 +00:00
Travis Howell
85fe6a1ac5 Include simon debug options by default
svn-id: r5642
2002-11-20 14:45:00 +00:00
Max Horn
94db771a02 fixed compilation for now <shudder>
svn-id: r5638
2002-11-20 13:19:50 +00:00
Travis Howell
53a05353b5 Add back missing simon debug function
svn-id: r5637
2002-11-20 13:08:01 +00:00
Travis Howell
2bba56a34f Another ooops
svn-id: r5635
2002-11-20 11:26:53 +00:00
Travis Howell
aa7f3b6df6 Ooops
svn-id: r5634
2002-11-20 08:17:31 +00:00
Travis Howell
3d2648e55f Revert earlier change for optional text support in simon1talkie/win since the data files don't have complete text.
I have left TEXT_HACK removed for the same reason.

svn-id: r5633
2002-11-20 08:05:56 +00:00
Travis Howell
9162f9cc64 Main debug output can now be controlled by 'o' and 'v' keys
svn-id: r5631
2002-11-20 06:33:12 +00:00
Travis Howell
493485763b Split debug opcode table into separate file.
Clean up debug, debug now uses correct opcode table automatically

svn-id: r5630
2002-11-20 05:43:43 +00:00
Travis Howell
47c4b25bfd Auto enable text when no voice file is available.
Allow 't' to toggle speech on and off in simon1talkie/win

svn-id: r5629
2002-11-20 05:12:10 +00:00