Commit Graph

560 Commits

Author SHA1 Message Date
Max Horn
ceb1005f6c some more memory inits; cleanup
svn-id: r8581
2003-06-21 15:42:20 +00:00
Max Horn
3de24123e7 fix some memory leaks
svn-id: r8580
2003-06-21 15:36:19 +00:00
Max Horn
0cb2053d9d init some member vars previously not inited
svn-id: r8579
2003-06-21 15:32:35 +00:00
Max Horn
ece6f28fd7 fix (?) for an invalid read report in valgrin
svn-id: r8578
2003-06-21 15:32:25 +00:00
Max Horn
0832c1f662 reuse file, remove file2 usage
svn-id: r8573
2003-06-20 12:25:37 +00:00
Travis Howell
b95ad27849 misc.
svn-id: r8514
2003-06-16 08:28:15 +00:00
Travis Howell
81eeff479d Change GF_AMIGAS back to GF_AMIGA
svn-id: r8510
2003-06-15 14:07:53 +00:00
Max Horn
e6455a9dd2 cleanup
svn-id: r8509
2003-06-15 13:07:06 +00:00
Max Horn
9ef0657c5c renamed Sound -> BaseSound to avoid conflicts with the scumm class of the same name (we really should start to put all the Scumm/Simon/Sky code into namespaces
svn-id: r8508
2003-06-15 12:22:19 +00:00
Max Horn
7f7ce14d5e cleanup
svn-id: r8507
2003-06-15 11:52:42 +00:00
Max Horn
0d85cd1ee6 small reorg (keep private classes out of header files, if possible -> decreases compile times a bit); fixed a small memory leak for Simon2mac; don't delete _file twice in Sound subclasses
svn-id: r8506
2003-06-15 11:48:04 +00:00
Travis Howell
8446d7d67e Stop simon1win crashing on loading of save game
svn-id: r8504
2003-06-15 10:48:21 +00:00
Oliver Kiehl
ce51902d7a fix for simon2
svn-id: r8503
2003-06-15 10:30:08 +00:00
Oliver Kiehl
4d5db88535 cleanup
svn-id: r8502
2003-06-15 09:55:10 +00:00
Travis Howell
16e5c50bad Small cleanup
Fix small memory leak

svn-id: r8501
2003-06-15 05:19:00 +00:00
Travis Howell
346e697f40 Small cleanup
svn-id: r8500
2003-06-15 05:04:17 +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
Max Horn
f7a8cbf7c7 Patch #754151: Removed READ_*_UNALIGNED and always read stuff bytewise; augmented by some more changes of mine
svn-id: r8482
2003-06-14 18:52:30 +00:00
Jonathan Gray
e3b2ca8e2f revert some changes as simon uses dynamic file objects for sound objects later on
svn-id: r8477
2003-06-14 15:19:41 +00:00
Jonathan Gray
eb808a8d4c make file objects stack based where possible, fixes a bunch of leaks
svn-id: r8476
2003-06-14 14:58:08 +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
Travis Howell
bec1130148 Typo
svn-id: r8327
2003-06-05 14:05:48 +00:00
Travis Howell
e97b91161c Adjust default _subtitle values
svn-id: r8326
2003-06-05 13:47:07 +00:00
Travis Howell
ceb1a34b05 Last commit should have been made simon1 only
svn-id: r8325
2003-06-05 13:21:03 +00:00
Travis Howell
33dceea477 Commit combined speech and subtitles patch
Add support for nosubtitles config option

svn-id: r8324
2003-06-05 12:20:05 +00:00
Travis Howell
cee02068ca Revert my last change, was correct according to disasm. but casued other problems.
svn-id: r8265
2003-06-02 06:39:54 +00:00
Travis Howell
803d53dd4b simon2dos uses different VGA_DELAY_BASE, fixes text disappearing in copy protection.
svn-id: r8264
2003-06-02 05:59:07 +00:00
Travis Howell
771dcfaad7 Rename SimonState to SimonEngine
svn-id: r8228
2003-06-01 09:41:56 +00:00
Travis Howell
719b34f36b Add german font set
svn-id: r8167
2003-05-31 11:40:32 +00:00
Travis Howell
f5758f3f49 A few notes, correction and a few more errors
svn-id: r8164
2003-05-31 10:33:25 +00:00
Travis Howell
c26389164f Fix simon1dos regression
svn-id: r8163
2003-05-31 07:39:39 +00:00
Travis Howell
4458704250 Broke simon
svn-id: r8133
2003-05-30 09:57:52 +00:00
Travis Howell
a5b2774685 Small cleanup
svn-id: r8132
2003-05-30 09:39:21 +00:00
Travis Howell
fb5bd02b40 Rename two unknown functions
svn-id: r8131
2003-05-30 07:46:45 +00:00
Travis Howell
0324ae9145 Correct simon2 timing
Remove unused function

svn-id: r8130
2003-05-30 05:39:14 +00:00
Max Horn
f0a9f4fb2c added some doxygen comments to common/system.h; cleaned up the OSystem interface a bit
svn-id: r8116
2003-05-29 21:45:26 +00:00
Travis Howell
19684947df Add some errors to check if these opcodes are actually used
svn-id: r8084
2003-05-29 07:59:21 +00:00
Travis Howell
fd3d2ac8ad More sprite renames
svn-id: r8083
2003-05-29 07:02:14 +00:00
Travis Howell
45a9ff6341 Missed a few sections
svn-id: r8082
2003-05-29 06:39:26 +00:00
Travis Howell
1855dba9d3 Correct name
svn-id: r8081
2003-05-29 06:36:52 +00:00
Travis Howell
c4088b56e6 Missed one section
svn-id: r8080
2003-05-29 06:06:32 +00:00
Travis Howell
6416c7d25d Use shutdown function before quiting
svn-id: r8079
2003-05-29 06:05:34 +00:00
Travis Howell
40c698ef20 Shorten Simon 1/2 title name to match others
svn-id: r8045
2003-05-28 02:09:18 +00:00
Travis Howell
e9d422a39c Add french font set
svn-id: r8042
2003-05-28 00:39:18 +00:00
Travis Howell
4ca99c1c89 Add / remove warning
svn-id: r7996
2003-05-26 10:21:22 +00:00
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