Travis Howell
b959d9d64e
Commit hack to allow simon1amiga to run, for experimenting
...
svn-id: r7995
2003-05-26 08:45:31 +00:00
Travis Howell
689ca53c8c
Error out if unsupport language option is used
...
svn-id: r7992
2003-05-26 07:35:33 +00:00
Travis Howell
2f72a47089
Ooops, added a few too many
...
svn-id: r7990
2003-05-26 04:25:29 +00:00
Travis Howell
2a9e09f33f
A few more hebrew fonts fixes
...
svn-id: r7989
2003-05-26 04:03:26 +00:00
Travis Howell
c2d065d896
Missed space font
...
svn-id: r7987
2003-05-26 02:06:14 +00:00
Travis Howell
b94c3265db
Add italian font set
...
svn-id: r7986
2003-05-26 01:56:37 +00:00
Jamieson Christian
0eb2d798d4
Fixed undefined file read operation
...
svn-id: r7971
2003-05-25 21:32:11 +00:00
Jamieson Christian
11e59488ef
Fixed occassional music crashes when loading games.
...
Thanks to eriktorbjorn for finding this issue.
svn-id: r7959
2003-05-25 15:47:06 +00:00
Travis Howell
8d7fe6febc
Split charset functions into separate file
...
svn-id: r7932
2003-05-25 11:02:39 +00:00
Max Horn
9151ff2636
fixed format string
...
svn-id: r7931
2003-05-25 10:14:21 +00:00
Travis Howell
d81f7ce759
Add newloine at EOF
...
svn-id: r7930
2003-05-25 03:35:20 +00:00
Travis Howell
3e6cf17744
Small midi cleanup
...
svn-id: r7929
2003-05-25 03:31:01 +00:00
Jamieson Christian
64e66a4500
Added new Simon module
...
svn-id: r7928
2003-05-25 03:28:10 +00:00
Jamieson Christian
6cb01ce15c
Added music support for simon1demo
...
svn-id: r7927
2003-05-25 03:19:21 +00:00
Travis Howell
be93277b65
Add a few warnings and todos to simon1cd32
...
svn-id: r7926
2003-05-25 03:03:40 +00:00
Travis Howell
84195fe444
Add some extra code for simon1dos/talkie, doesn't seem to function yet though
...
svn-id: r7886
2003-05-24 13:05:56 +00:00
Travis Howell
cf29056768
Typo
...
svn-id: r7885
2003-05-24 12:28:56 +00:00
Travis Howell
13739f18ef
More renames
...
svn-id: r7884
2003-05-24 12:26:28 +00:00
Travis Howell
e95d717fb1
A few function renames
...
svn-id: r7883
2003-05-24 12:13:23 +00:00
Travis Howell
fa33a173ac
Missed one line
...
svn-id: r7881
2003-05-24 10:01:24 +00:00
Travis Howell
7febca050b
Remove a few old asserts and xxx which was not needed
...
svn-id: r7880
2003-05-24 09:05:25 +00:00
Travis Howell
3fbae51dc0
Small cleanup
...
svn-id: r7879
2003-05-24 07:55:53 +00:00
Jamieson Christian
bc5511c514
Fixed hanging notes when switching tracks
...
svn-id: r7878
2003-05-24 04:39:47 +00:00
Jamieson Christian
807f3e1e86
Fixed MIDI channel conflict between music and MIDI sound effects in simon1dos.
...
Also added notes about the GMF header for posterity's sake.
svn-id: r7877
2003-05-24 03:55:37 +00:00
Travis Howell
cd37b391b2
Correct fixme comment
...
svn-id: r7876
2003-05-24 03:51:33 +00:00
Jamieson Christian
e23f76b742
Hack to prevent bad music looping at end of simon1win
...
svn-id: r7875
2003-05-24 03:26:12 +00:00
Jamieson Christian
1b4b6030fe
Added support for GMF loop specifier
...
svn-id: r7874
2003-05-24 03:10:14 +00:00
Jamieson Christian
bcdf2286f8
Fixed problem with hanging notes when switching music tracks
...
svn-id: r7873
2003-05-24 01:42:57 +00:00
Jamieson Christian
aacbaac131
Added support for simultaneous music and MIDI sound effects to simon1dos.
...
Note that 's' still toggles MIDI sound effects on and off.
svn-id: r7872
2003-05-24 01:26:05 +00:00
Torbjörn Andersson
8feba0dfaf
cleanup
...
svn-id: r7866
2003-05-23 15:48:07 +00:00
Jamieson Christian
e52ca34bb4
Fixed hanging notes when toggling SFX mode in Simon 1
...
svn-id: r7865
2003-05-23 15:27:08 +00:00
Jamieson Christian
790b2e1e9a
Fixed problem with Simon music playing even when paused.
...
svn-id: r7864
2003-05-23 15:14:44 +00:00
Travis Howell
ade97e9fe2
_lock_counter controls seems to control whether mouse cursor should be shown but not sure what the default value should be
...
svn-id: r7855
2003-05-23 11:06:19 +00:00
Jamieson Christian
006d0a5ff8
Removed invalid timer rate
...
svn-id: r7848
2003-05-23 04:16:37 +00:00
Travis Howell
a7a063bd73
MAke debug output a little easier to read, a few corrections
...
svn-id: r7821
2003-05-22 10:21:05 +00:00
Travis Howell
478b62ce45
Simon debug output name update
...
svn-id: r7820
2003-05-22 10:06:39 +00:00
Jamieson Christian
b2f4c34c01
Reset channel volumes on load
...
svn-id: r7813
2003-05-22 00:06:24 +00:00
Jamieson Christian
3b08208879
Fixed premature music load in Simon 2
...
svn-id: r7812
2003-05-22 00:00:42 +00:00
Max Horn
11d29b71ab
pedantic warning fixes
...
svn-id: r7794
2003-05-21 17:49:33 +00:00
Max Horn
f0b12ebfa9
more Simon member var init (that should be all now, I hope)
...
svn-id: r7784
2003-05-21 15:47:51 +00:00
Travis Howell
1294eb35c7
Set midi vars to -1 by default to prevent simon2dos trying to load music during copy protection
...
Correct vc_62 so it is closer to diasm.
svn-id: r7780
2003-05-21 11:49:41 +00:00
Max Horn
c062b73422
fixed warning
...
svn-id: r7779
2003-05-21 11:23:53 +00:00
Travis Howell
0096df9737
Remove warning
...
svn-id: r7774
2003-05-21 07:49:41 +00:00
Jamieson Christian
9986605c46
More Simon music fixes.
...
svn-id: r7767
2003-05-21 06:13:47 +00:00
Jamieson Christian
ff79f10160
Fixed Simon 1 sound effects.
...
More semantic fixes.
svn-id: r7765
2003-05-21 05:26:29 +00:00
Jamieson Christian
98186e59ff
Renamed opcodes whose functions are now known.
...
Cleaned up unused script variables.
Miscellaneous semantic changes.
svn-id: r7763
2003-05-21 05:12:04 +00:00
Jamieson Christian
9c4a1cf657
More Simon music fixes
...
svn-id: r7761
2003-05-21 04:36:09 +00:00
Jamieson Christian
27b7c1287e
Whoops....
...
svn-id: r7759
2003-05-21 00:45:31 +00:00
Jamieson Christian
8860625e46
Various cleanup of Simon music code
...
svn-id: r7758
2003-05-21 00:44:37 +00:00
Jamieson Christian
9780fc9c3e
Fixed thread problem that causes occassional crashes
...
svn-id: r7757
2003-05-21 00:40:08 +00:00
Jamieson Christian
14273bad5e
Fixed buffer allocation problem for GMF resources.
...
Thanks for wjp for tracking this one down.
svn-id: r7748
2003-05-20 17:23:15 +00:00
Travis Howell
87c686df5b
-1
...
svn-id: r7747
2003-05-20 17:11:39 +00:00
Jamieson Christian
c420166f46
Fix for simon2win music
...
svn-id: r7746
2003-05-20 17:10:15 +00:00
Jamieson Christian
e2e23affcf
Fixed memory overrun problem
...
svn-id: r7745
2003-05-20 16:50:16 +00:00
Jamieson Christian
a768deb83f
Simon music fixes
...
svn-id: r7744
2003-05-20 16:43:53 +00:00
Jamieson Christian
733326b727
Fixed file scan alignment problem
...
svn-id: r7742
2003-05-20 16:42:25 +00:00
Travis Howell
d60c78c4eb
Switch to ints
...
svn-id: r7740
2003-05-20 16:24:31 +00:00
Travis Howell
c20a5f8c06
Minor midi change for Jamieson630
...
svn-id: r7737
2003-05-20 15:37:03 +00:00
Max Horn
22320e8271
init SimonSound members
...
svn-id: r7736
2003-05-20 15:17:21 +00:00
Max Horn
b2c823b1e1
oops
...
svn-id: r7731
2003-05-20 14:53:45 +00:00
Max Horn
5e746a188b
init MidiPlayer fully
...
svn-id: r7730
2003-05-20 14:48:24 +00:00
Max Horn
a67d45249d
and more simon member vars
...
svn-id: r7729
2003-05-20 14:43:22 +00:00
Max Horn
5f068688e9
init even more simon member vars
...
svn-id: r7728
2003-05-20 14:34:07 +00:00
Max Horn
d68de1d5e5
init more simon member vars
...
svn-id: r7726
2003-05-20 14:12:57 +00:00
Max Horn
c35ff13a6d
some simon init fixes (needs more)
...
svn-id: r7724
2003-05-20 13:46:53 +00:00
Max Horn
bb9c82ed83
init some member vars
...
svn-id: r7723
2003-05-20 13:20:18 +00:00
Travis Howell
7e8c4f2660
Update opcode 134, although it never seems to be used
...
svn-id: r7712
2003-05-20 09:25:45 +00:00
Travis Howell
c2f8a72cce
Add better support for realizePalette_unk(), patch #740321
...
svn-id: r7711
2003-05-20 08:49:13 +00:00
Travis Howell
6b07f4f397
I broke simon, so revert my last change and added fixmes instead.
...
svn-id: r7709
2003-05-20 07:26:19 +00:00
Travis Howell
16c2fe1436
Opps, that delay change should not have been commited
...
svn-id: r7708
2003-05-20 04:09:14 +00:00
Travis Howell
dad6d27b83
Revert music play change for Simon 2, since it caused brief tunes between location changes on main map area.
...
Clean up midi_play
svn-id: r7707
2003-05-20 04:03:21 +00:00
Travis Howell
b5e5403196
vc_69 update from Jamieson630
...
svn-id: r7705
2003-05-20 02:33:28 +00:00
Travis Howell
1e49486e43
Correction from diasm.
...
svn-id: r7681
2003-05-19 10:24:51 +00:00
Travis Howell
770a0f1d3b
music_unk isn't needed in playmusic, it is always set to 999
...
svn-id: r7680
2003-05-19 09:59:23 +00:00
Travis Howell
aa1ddc6a5a
Minor correction to last commit
...
svn-id: r7679
2003-05-19 09:47:33 +00:00
Travis Howell
7091080e7d
Try and make some sense ot of simon 2 midi systems
...
svn-id: r7678
2003-05-19 09:41:28 +00:00
Jamieson Christian
29fb3e308f
Fixed music looping problem in simon1win
...
svn-id: r7672
2003-05-19 05:40:27 +00:00
Jamieson Christian
ff41896480
Fixed Simon 1 music regression.
...
SMF parser now supports malformed Simon pitch bend events.
Implemented SMF parser jump method.
svn-id: r7669
2003-05-19 05:00:13 +00:00
Travis Howell
f6d745a03b
Music fix from Jamieson630
...
svn-id: r7667
2003-05-19 03:29:39 +00:00
Travis Howell
4a87f8191f
Minor cleanup
...
svn-id: r7666
2003-05-19 01:36:04 +00:00
Travis Howell
3b7270a9c6
Minor correction
...
svn-id: r7662
2003-05-19 00:45:30 +00:00
Jamieson Christian
b66f4416cb
playMusic streamlining, comments cleanup
...
svn-id: r7661
2003-05-19 00:38:35 +00:00
Jamieson Christian
bd326e83f7
Fixed virtual destructor problem
...
svn-id: r7659
2003-05-19 00:24:11 +00:00
Jamieson Christian
c81b58d38e
Implemented new Simon MIDI module, switching from MidiStreamer to MidiParser. Restructuring enables XMIDI support and vc_72 implementation. Various cleanup on MidiParser's and MidiDriver's.
...
svn-id: r7654
2003-05-18 23:55:53 +00:00
Travis Howell
fa82ad65f9
typo
...
svn-id: r7635
2003-05-18 14:13:21 +00:00
Travis Howell
2cd2cc83b2
adlib fix for Simon games from Jamieson630
...
svn-id: r7633
2003-05-18 14:03:47 +00:00
Travis Howell
a91b28848c
Add simon1amiga to debug
...
svn-id: r7602
2003-05-17 08:54:46 +00:00
Travis Howell
34456cf63e
Rename two unknown function
...
svn-id: r7410
2003-05-10 05:20:56 +00:00
Travis Howell
5c987fac47
Add a few Amiga games corrections and todos
...
svn-id: r7238
2003-05-01 07:55:55 +00:00
Jonathan Gray
2a1280621a
remove now uneeded duplicate targets
...
svn-id: r7192
2003-04-29 04:44:00 +00:00
Travis Howell
9041b45fc9
More Spanish font corrections, the . and , fonts were corrupt
...
svn-id: r6899
2003-04-02 09:42:12 +00:00
Travis Howell
539272b387
Hebrew fonts were off by two bytes too.
...
svn-id: r6898
2003-04-02 05:27:59 +00:00
Travis Howell
18ca289dbd
Enable choice between English voice and subtitles in French, Hebrew, Italian and Spanish version of Simon the Sorcerer 1 talkie
...
svn-id: r6897
2003-04-02 04:15:48 +00:00
Travis Howell
10a4324a38
Spanish video fonts were off by two bytes
...
Might be able to merge with main fonts eventually.
svn-id: r6896
2003-04-02 04:00:59 +00:00
Travis Howell
bc9a8b42bb
Add correct use verb words for Italian
...
svn-id: r6895
2003-04-02 01:59:43 +00:00
Travis Howell
0c0ee74449
Add spanish video fonts, not sure why this set is so different.
...
svn-id: r6892
2003-03-31 14:33:54 +00:00
Travis Howell
1e089682a0
Add proper spanish verbs
...
svn-id: r6891
2003-03-31 13:30:45 +00:00
Travis Howell
2ef250423a
Bug fix from ludde
...
svn-id: r6859
2003-03-25 12:25:06 +00:00
Travis Howell
27828682ee
Add Spanish quit key for Simon games
...
svn-id: r6844
2003-03-23 12:40:40 +00:00
Travis Howell
c36c32fd39
simon1amiga should be disabled for now
...
svn-id: r6839
2003-03-20 13:47:26 +00:00
Travis Howell
db7f5f3099
Reduce targets
...
svn-id: r6792
2003-03-10 03:47:29 +00:00
Travis Howell
060cab7bf2
Remove old commented names
...
svn-id: r6786
2003-03-09 04:42:27 +00:00
Travis Howell
ddd54ed3c5
Rename function
...
svn-id: r6761
2003-03-08 00:21:34 +00:00
Paweł Kołodziejski
243c4ffbc0
implemented formating string error for each engine
...
svn-id: r6744
2003-03-07 15:38:11 +00:00
Travis Howell
7b9eba2264
Add two more debug defines as key options
...
svn-id: r6740
2003-03-07 13:39:59 +00:00
Travis Howell
52b1612571
Remove vc_59_helper
...
Make t key work in simon2talkie/win only
svn-id: r6739
2003-03-07 12:52:28 +00:00
Travis Howell
6f65f6f166
Rename variable
...
svn-id: r6738
2003-03-07 12:29:33 +00:00
Max Horn
840184da0c
some cleanup
...
svn-id: r6734
2003-03-07 03:26:30 +00:00
Paweł Kołodziejski
aa3766018f
updated copyrights headers
...
svn-id: r6726
2003-03-06 21:46:56 +00:00
Paweł Kołodziejski
4fe8dcd671
and more cleanup ....
...
svn-id: r6720
2003-03-06 19:16:24 +00:00
Paweł Kołodziejski
7b43dd1754
removed duplicated macro
...
svn-id: r6716
2003-03-06 16:42:07 +00:00
Oliver Kiehl
f8475649da
added mp3 support for simon2mac
...
svn-id: r6711
2003-03-06 13:51:56 +00:00
Travis Howell
d32d4f583a
Ooops
...
svn-id: r6681
2003-03-04 01:34:28 +00:00
Travis Howell
4f9213535a
Add text speed options for Simon games
...
svn-id: r6680
2003-03-04 01:30:56 +00:00
Paweł Kołodziejski
d115e0ad75
fixed warnings
...
svn-id: r6659
2003-03-02 12:36:07 +00:00
Oliver Kiehl
dede168069
change GameIDs to GameFeatures
...
svn-id: r6654
2003-03-01 22:52:49 +00:00
Max Horn
f4e147e5d2
removed the single big VersionSettings list; instead, the simon & scumm modules now keep their target lists seperatly (and when we add BASS, it can have its own target list)
...
svn-id: r6652
2003-03-01 22:04:48 +00:00
Max Horn
956e5e2b3d
don't hardcode the Simon GameID values, rather use the #defines from simon/intern.h. Proper solution pending
...
svn-id: r6651
2003-03-01 21:26:45 +00:00
Max Horn
3c3812d754
no need for a hack if include gameDetector.h anyway...
...
svn-id: r6650
2003-03-01 20:39:17 +00:00
Travis Howell
419761549c
Disable realizePalette_unk() in simon since it causes regressions
...
svn-id: r6647
2003-03-01 13:11:01 +00:00
Travis Howell
faa8170da7
Add example simon2dos/talkie music code
...
svn-id: r6610
2003-02-16 04:07:15 +00:00
Oliver Kiehl
1745e8b600
possible fix for Bug #687059 ?
...
svn-id: r6609
2003-02-15 14:51:24 +00:00
Travis Howell
3e5da6a2f5
Was bad idea to enable this in Simon 1
...
svn-id: r6597
2003-02-10 12:22:54 +00:00
Max Horn
bfced91139
fixed regression I caused
...
svn-id: r6595
2003-02-09 00:20:52 +00:00
Max Horn
3d70c8b2e3
oops
...
svn-id: r6588
2003-02-05 19:50:10 +00:00
Max Horn
53fd53fe4b
fixed a copy&paste bug; rewrote the code in question to streamline it a bit
...
svn-id: r6587
2003-02-05 19:21:23 +00:00
Travis Howell
da26741452
Minor fix to last commmit
...
svn-id: r6586
2003-02-05 09:34:35 +00:00
Travis Howell
465296ef4e
Add guess word for spanish version
...
Add better hebrew support, font doesn't seem quite right though.
Divide quit section into languages
svn-id: r6585
2003-02-05 09:29:37 +00:00
Travis Howell
439046716b
Fix small error in my last commits
...
svn-id: r6576
2003-01-30 09:15:04 +00:00
Travis Howell
32be9261fc
Optional subtitles in Simon 1 (unsupported)
...
Use subtitles by default in all except English and German versions
svn-id: r6572
2003-01-29 12:48:27 +00:00
Travis Howell
4e39e87071
Add some hebrew support and a little cleanup
...
svn-id: r6569
2003-01-29 11:31:10 +00:00
Travis Howell
43d3cbed19
Add improved support for french, german and italian
...
svn-id: r6568
2003-01-29 10:08:56 +00:00
Oliver Kiehl
85ed389cbb
added missing function
...
svn-id: r6517
2003-01-19 15:39:54 +00:00
Travis Howell
639cb13da1
Missed one section
...
svn-id: r6452
2003-01-14 06:52:16 +00:00
Travis Howell
d6e9c1f3a0
Add hopefully the final simon target, not support at all yet.
...
svn-id: r6451
2003-01-14 05:25:31 +00:00
Travis Howell
1814063dc7
Start for Simon 1 amiga cd32 version support, not working right yet.
...
svn-id: r6450
2003-01-14 04:25:38 +00:00
Oliver Kiehl
dfced2a4d0
added F10 support (Hitareas are indicated when F10 is pressed)
...
svn-id: r6429
2003-01-12 15:17:58 +00:00
Travis Howell
f469d84888
Ooops
...
svn-id: r6412
2003-01-12 02:42:59 +00:00
Travis Howell
93184025d9
Add warning when voice files are missing in simon2amiga/mac
...
Work if voice file is missing in simon2amiga/mac
svn-id: r6411
2003-01-12 02:01:07 +00:00
Oliver Kiehl
237783a24d
added voice support for simon 2 mac and simon 3 amiga
...
svn-id: r6398
2003-01-11 16:00:55 +00:00
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
Oliver Kiehl
4fefb1a679
added [ and ] for volume control on US keyboards and changed volume change to 16
...
svn-id: r5597
2002-11-18 10:20:56 +00:00
Jamieson Christian
5214cb3463
Added support for volume and pause control to Simon music.
...
Note that MidiStreamer is now used as a streaming wrapper
for ALL MidiDriver types, even those that natively support
streaming. This is because MidiStreamer supports a hybrid
of streamed and non-streamed MIDI, which is necessary to
support interactive events.
svn-id: r5596
2002-11-18 09:08:45 +00:00
Oliver Kiehl
fd5f110269
added the ability to pause effects (s) and ambient sound (b)
...
svn-id: r5593
2002-11-17 18:44:33 +00:00
Oliver Kiehl
128580df1e
added structures for midi pause/volume
...
svn-id: r5591
2002-11-17 17:15:29 +00:00
Oliver Kiehl
5ae9b1e05b
quit_if_user_presses_y() added
...
svn-id: r5590
2002-11-17 15:42:05 +00:00
Oliver Kiehl
5f4d594150
implemented quit_if_user_presses_y()
...
svn-id: r5589
2002-11-17 15:15:26 +00:00
Travis Howell
0c61461124
Cursors should now be hidden during cut scenes (I hope)
...
svn-id: r5586
2002-11-16 16:49:39 +00:00
Oliver Kiehl
c654b9edbd
added cursor for simon1
...
svn-id: r5585
2002-11-16 16:42:25 +00:00
Travis Howell
3f0e42b7da
Ooops
...
svn-id: r5584
2002-11-16 15:59:40 +00:00
Travis Howell
16d154abee
Don't show cursor during cut scenes
...
svn-id: r5583
2002-11-16 15:51:49 +00:00
