libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-05 09:10:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
10,228 Commits 5 Branches 5 Tags 1.8 GiB
b5c11e4660
Commit Graph

548 Commits

Author SHA1 Message Date
Joost Peters
63be7c1323 Allow using a real MT-32 (can someone with one please test this?) 
svn-id: r12641
 2004-01-27 23:05:02 +00:00
Joost Peters
829df83f79 minor cleanup 
svn-id: r12640
 2004-01-27 21:28:17 +00:00
Joost Peters
33e613b5c7 Proper fix for bug #884712 
svn-id: r12635
 2004-01-27 16:56:11 +00:00
Nicolas Bacca
a2038809b2 Yet another stupid EVC fix 
svn-id: r12606
 2004-01-26 07:38:26 +00:00
Oliver Kiehl
663b81a4d7 fix compile 
svn-id: r12600
 2004-01-26 01:07:17 +00:00
Joost Peters
0d974b9daa Seperate SFX and Speech. 
this fixes the 'pauses' in the car-chase scene and other scene which use
speech and sfx simultaneously.

svn-id: r12599
 2004-01-25 22:10:23 +00:00
Joost Peters
b106eb1e43 Fix missing song at airport. Thanks for investigating, Kirben! 
svn-id: r12598
 2004-01-25 18:41:26 +00:00
Travis Howell
fde0a08cc9 Song 17 should be silence in demos. 
svn-id: r12597
 2004-01-25 16:57:05 +00:00
Travis Howell
04bb7fff2d Check for demo version. 
svn-id: r12596
 2004-01-25 16:48:06 +00:00
Travis Howell
3f757058f6 A music table from original demo exes. 
svn-id: r12595
 2004-01-25 16:29:19 +00:00
Travis Howell
a5f45c0323 Change debug level 
svn-id: r12593
 2004-01-25 14:21:37 +00:00
Travis Howell
6dbd03acea Remove old debug msg. 
svn-id: r12592
 2004-01-25 14:18:14 +00:00
Joost Peters
2bd86191a0 demos never have speech 
svn-id: r12591
 2004-01-25 14:10:29 +00:00
Joost Peters
b3a9071118 - Cope better with invalid music (fixes 100% CPU usage) 
- Some const'ness

svn-id: r12590
 2004-01-25 12:50:29 +00:00
Joost Peters
5fa9dfa87e The Floppy version has speech in the intro. (it doesn't hurt if speechToggle is set for the floppy version) 
svn-id: r12588
 2004-01-25 11:47:22 +00:00
Travis Howell
10a37c8c25 Small correction to my last commit. 
svn-id: r12587
 2004-01-25 07:53:03 +00:00
Travis Howell
f4e26c9412 Add support for music in fotaq demos 
svn-id: r12585
 2004-01-25 05:03:35 +00:00
Joost Peters
d40d9b7f0d - Added MT32 -> GM mapping, this fixes the wrong sound for the clock in the beginning as well as various tunes. 
- Don't try to play invalid music (list probably is incomplete)
- Work around annoying notes bug in 2 pieces of Floda music
- Stop music when loading savegames

svn-id: r12584
 2004-01-24 22:55:09 +00:00
Gregory Montoir
7bd31d615c change sscanf() calls to atoi() to please PalmOS :) 
svn-id: r12582
 2004-01-23 16:58:13 +00:00
Gregory Montoir
7401421b1d update 
svn-id: r12581
 2004-01-23 10:40:32 +00:00
Gregory Montoir
82e005fe5a use BobSlot::clear instead of Graphics::clearBob 
svn-id: r12580
 2004-01-23 10:34:57 +00:00
Gregory Montoir
28b365803b MSVC warnings 
svn-id: r12579
 2004-01-23 10:28:20 +00:00
Gregory Montoir
46f25d440f use BobSlot::clear instead of Graphics::clearBob 
svn-id: r12578
 2004-01-23 10:27:30 +00:00
Joost Peters
0bece175e4 - Some refactoring/clean-up. 
- Handle special music types (> 1000)
- Implemented random looping (untested)

svn-id: r12577
 2004-01-22 23:10:05 +00:00
Gregory Montoir
99e3175d54 (slightly) less hackish bounding box code 
svn-id: r12576
 2004-01-22 22:28:57 +00:00
Gregory Montoir
2d7f1b9d0f clear user input before entering Journal (no more load problems occuring when journal is started as joe is about to do sthg) 
svn-id: r12568
 2004-01-21 22:04:39 +00:00
Gregory Montoir
15a5fd20a3 fix 'conversation options still displayed after hitting esc' bug (noticeable in plane when speaking to Sparky) 
svn-id: r12565
 2004-01-20 22:35:53 +00:00
Gregory Montoir
ff43b1f8d5 - fixed bug #880415 (only setup bam scene after all _vm->update() calls) 
- constness

svn-id: r12564
 2004-01-20 21:58:26 +00:00
Joost Peters
4ea5f7225d initialise _channel array 
svn-id: r12535
 2004-01-20 12:44:00 +00:00
Joost Peters
c78bab1c62 AFAICT this is only used for caching in the original, which we don't care much about - seeing how rarely it's used. 
svn-id: r12531
 2004-01-20 01:13:07 +00:00
Joost Peters
698eefae58 - Enable music queueing (I don't really like the levels of indirection, but it'll do for now) 
- Handle special music type '2000' (restart previously queued music)

svn-id: r12529
 2004-01-19 23:54:50 +00:00
Gregory Montoir
95891f95c7 *temporary* fix for LineReader to handle files not terminated by an empty string (*.crd) 
svn-id: r12527
 2004-01-19 22:31:21 +00:00
Gregory Montoir
392940e7dd re-use BobFrame 
svn-id: r12526
 2004-01-19 21:47:20 +00:00
Gregory Montoir
3de67205c3 increase Credits::_list size to match the German version requirements (thanks Alexander Holler) 
svn-id: r12525
 2004-01-19 21:46:02 +00:00
Gregory Montoir
993fba68f1 prevents bank re-loading (cutaways animations) 
svn-id: r12524
 2004-01-19 21:38:07 +00:00
Joost Peters
7a53d9ba7b Added MusicPlayer class (MidiDriver derivate) for greater flexibility 
svn-id: r12523
 2004-01-19 21:23:42 +00:00
Paweł Kołodziejski
afa3ceb07f fix warning 
svn-id: r12500
 2004-01-18 20:29:00 +00:00
Paweł Kołodziejski
856b2dd825 fix warning 
svn-id: r12499
 2004-01-18 20:22:32 +00:00
Gregory Montoir
05c71be222 redundant check 
svn-id: r12442
 2004-01-16 20:48:08 +00:00
Gregory Montoir
99500a0112 - removed noisy warning in talk code 
- set _entryObj only if verb is WALK_TO
- changed setConditions code in Command::openOrCloseAssociatedObject to be
  consistent with Command::setConditions ; this isn't like the original, but
  more logical to me.

svn-id: r12441
 2004-01-16 20:26:30 +00:00
Gregory Montoir
770d94b607 some assert() calls 
svn-id: r12435
 2004-01-16 15:51:23 +00:00
Gregory Montoir
3c521dc288 rewritten Logic::setupJoeInRoom(), in order to only get objectData(_entryObj) when necessary 
svn-id: r12434
 2004-01-16 15:03:52 +00:00
Gregory Montoir
899843443f it seems entryObj can be <0, check for it 
svn-id: r12433
 2004-01-16 14:15:44 +00:00
Gregory Montoir
968436767c got rid of timer stuff to handle display sync 
svn-id: r12416
 2004-01-15 21:07:17 +00:00
Gregory Montoir
391f4e92e5 reset _lastSoundIndex in car animation too 
svn-id: r12409
 2004-01-15 13:08:24 +00:00
Gregory Montoir
b1141ae717 bumped Cutaway::_personFace array size, as during intro Cutaway::_personFaceCount max value is 12 
svn-id: r12388
 2004-01-14 15:51:54 +00:00
Gregory Montoir
6c78f2a6b8 - tweaked a bit walking functions to make persons stop walking when a cutaway is canceled 
- removed unpack to bob frame 2 (as it is never used)
- changed some error() calls to assert()
- minor cleanups

svn-id: r12385
 2004-01-14 14:34:05 +00:00
Gregory Montoir
b218cb93fe cleanup 
svn-id: r12378
 2004-01-14 10:40:25 +00:00
Gregory Montoir
2f85714c60 - wrong sentence was spoken when Joe was trying to 'pick up' a person 
- clear command before switching rooms
- clear texts at the end of cutaway (fix minor glitch in interview intro)

svn-id: r12361
 2004-01-13 14:43:13 +00:00
Gregory Montoir
95de2117a2 New save/load code, this *breaks* compatiblity with the previous 
savefile format. Use the 'qsc' tool to convert your old files
(http://0x.7fc1.org/fotaq/qsc.[cpp|exe]).

svn-id: r12339
 2004-01-12 13:40:02 +00:00
Gregory Montoir
bbf32c0076 oops 
svn-id: r12337
 2004-01-12 09:43:06 +00:00
Gregory Montoir
a6d1540d49 turned Logic::useJournal() into a virtual method 
svn-id: r12336
 2004-01-12 09:40:57 +00:00
Joost Peters
14eeb574d3 fixes compilation for our *cough* favourite *cough**cough* compiler: MSVC! 
svn-id: r12331
 2004-01-12 00:34:27 +00:00
Gregory Montoir
df985747e1 minor display code changes 
svn-id: r12323
 2004-01-11 17:20:29 +00:00
Gregory Montoir
6dc8407297 cleanup 
svn-id: r12318
 2004-01-11 14:11:36 +00:00
Gregory Montoir
f2874733b0 tweaked a bit dirty blocks display code, this fixes the minor glitch in interview intro 
svn-id: r12317
 2004-01-11 14:08:07 +00:00
Joost Peters
9cd7d79596 - stop voice when skipping dialogue 
- scroll 4 inventory items when right-clicking

svn-id: r12314
 2004-01-11 01:36:00 +00:00
Gregory Montoir
3be8219bd9 cleanup 
svn-id: r12312
 2004-01-10 22:31:41 +00:00
Gregory Montoir
5616955701 new Talk::splitOption() code (same value for text margins, word width is computed without the ending space char) 
svn-id: r12310
 2004-01-10 21:56:47 +00:00
Gregory Montoir
3e8a551d8b removed old hack to prevent speaking sentence 0 
svn-id: r12308
 2004-01-10 20:33:05 +00:00
Gregory Montoir
40651928dc removed some debug() calls 
svn-id: r12307
 2004-01-10 19:59:11 +00:00
Gregory Montoir
615e0df8da enabled arrows in dialogue (non english versions) 
svn-id: r12306
 2004-01-10 19:55:54 +00:00
Joost Peters
3589c2f776 added stopSfx() method 
svn-id: r12305
 2004-01-10 17:46:26 +00:00
David Eriksson
72d54f173e Never mind. 
svn-id: r12304
 2004-01-10 16:54:00 +00:00
Gregory Montoir
3d1c883970 workaround for final room sound issues 
svn-id: r12302
 2004-01-10 16:23:34 +00:00
David Eriksson
aab4e7a011 Correct previous fix :-) 
svn-id: r12301
 2004-01-10 16:13:21 +00:00
David Eriksson
5d50f01b2f Text position for talking heads. 
svn-id: r12300
 2004-01-10 16:03:41 +00:00
David Eriksson
c27915b46d Correct comment 
svn-id: r12299
 2004-01-10 16:03:08 +00:00
David Eriksson
2f82a5c573 Honor speech and subtitle toggles 
svn-id: r12298
 2004-01-10 15:53:51 +00:00
David Eriksson
102cf0254a - Honor speech and subtitle toggles 
- Make text stay on screen longer

svn-id: r12297
 2004-01-10 15:52:00 +00:00
David Eriksson
c13a04f570 - Must have either subtitles or speech 
- Should not be possible to disable text on non-CD-ROM versions

svn-id: r12296
 2004-01-10 15:48:13 +00:00
David Eriksson
f2e8f65cb0 Add test for CD-ROM version 
svn-id: r12295
 2004-01-10 15:46:02 +00:00
Gregory Montoir
9439e09e45 this should fix : 
- minor sound glitch in room 50 (temple zombies)
- panel undisplayed at the end of cutaway c62c
- wrong dirty blocks in room 76
- Cutaway::_cutAnim is now a 21x30 elements array. This is needed for cutaway c69g, where we setup
  frames for bob num 20 (the original game uses the same value)
- Credits::_list is now a 18 elements array (that's what credits2.crd need)

svn-id: r12294
 2004-01-10 12:56:07 +00:00
Gregory Montoir
657333aaf0 fix mouse pointer glitch occuring when exiting Debugger 
svn-id: r12281
 2004-01-09 15:14:15 +00:00
Gregory Montoir
634df6923d renamed some methods and moved some code to Display 
svn-id: r12276
 2004-01-09 13:36:37 +00:00
Gregory Montoir
c4e9d55acb minor Logic::initPerson() tweak 
svn-id: r12270
 2004-01-08 23:28:29 +00:00
Gregory Montoir
1b1ce1faf7 moved the remaining 'graphics' stuff from Logic to Graphics 
svn-id: r12266
 2004-01-08 22:46:42 +00:00
Gregory Montoir
370589dde5 cleanup, xref update 
svn-id: r12256
 2004-01-08 16:41:03 +00:00
Gregory Montoir
85f8b442f2 - new Grid class to handle all zones / areas stuff 
- adapted Logic/Walk code to use it

svn-id: r12250
 2004-01-08 14:10:32 +00:00
Gregory Montoir
74829245d9 mostly cleanup : 
- moved main update() method to QueenEngine
- merged update() & checkPlayer()
- added a method in Logic class to handle the CUTAWAY_SPECIAL stuff
- Journal remembers last seen page
- no need to call loadPanel() to restore panel palette, use palSetPanel() instead

svn-id: r12240
 2004-01-08 10:25:18 +00:00
Gregory Montoir
c46d2f0530 fix 'panel still displayed during dialogue' bug (this was noticeable when trying to bypass the floda receptionist) 
svn-id: r12219
 2004-01-07 15:46:45 +00:00
Gregory Montoir
272eb21287 - moved some Person/Anim code to Graphics 
- some renaming

svn-id: r12218
 2004-01-07 15:45:24 +00:00
Gregory Montoir
74e588b854 - minor cleanup in Person/Actor stuff 
- minor tweak in Graphics::bobSetText()
from previous commit (message was erroneous) :
- moved config stuff to QueenEngine
- added 3 Logic subclasses to handle the specific parts of each game version (demo, intv...)

svn-id: r12195
 2004-01-06 20:00:46 +00:00
Gregory Montoir
e90f846df9 - enabled debugger in QueenEngine::errorString 
- initialise Cutaway::_personCount* when the Cutaway starts
- minor tweaks in BankManager

svn-id: r12185
 2004-01-06 16:53:35 +00:00
Gregory Montoir
ceda8aec02 moved animation stuff to Graphics class 
svn-id: r12182
 2004-01-06 14:21:50 +00:00
Max Horn
033ff78ae9 updated copyright notice 
svn-id: r12176
 2004-01-06 12:45:34 +00:00
Gregory Montoir
d62d44d29c simplified room switching code a bit 
svn-id: r12165
 2004-01-06 09:29:33 +00:00
Gregory Montoir
5e413ceb5c - enabled debugger in QueenEngine::errorString 
- initialise Cutaway::_personCount* when the Cutaway starts
- minor tweaks in BankManager

svn-id: r12163
 2004-01-05 20:46:37 +00:00
Gregory Montoir
232a709fd4 added a class to manage banks, Queen::Graphics cleanup 
svn-id: r12157
 2004-01-05 13:40:28 +00:00
David Eriksson
c21e5d797c At last - credits! 
svn-id: r12155
 2004-01-05 11:58:20 +00:00
Gregory Montoir
143b5bea80 - added code to only redraw changed blocks in order to avoid full screen refresh 
- minor code cleanup in Graphics/Display

svn-id: r12147
 2004-01-04 20:25:21 +00:00
Max Horn
d1e6c6059e renamed global var _debugLevel to g_debugLevel; let Engine constructor init it (this way all engines get it for free, allows further cleanup); removed some useless/duplicate member vars in SwordEngine 
svn-id: r12134
 2004-01-04 14:00:58 +00:00
Joost Peters
7cc9727916 respond to 'alter'-type overrides 
svn-id: r12126
 2004-01-04 03:37:12 +00:00
Joost Peters
5f85df5ed6 Allow queen to use adlib driver as well (that was surprisingly easy :)) 
svn-id: r12100
 2004-01-03 02:08:04 +00:00
Gregory Montoir
8bd9ce2949 - added missing MOVE_SPEAK code (only CHEF.DOG seems to use that) 
- clear Talk::_dialogueTree[0] to avoid problems when accessing oldLevel / level 0

svn-id: r12093
 2004-01-02 20:05:18 +00:00
Joost Peters
539002e23a spelling mistake 
svn-id: r12090
 2004-01-02 14:26:39 +00:00
Joost Peters
e5ba3b172e Tell adlib people they won't hear music 
svn-id: r12089
 2004-01-02 14:21:14 +00:00
Gregory Montoir
5b97c9308d minor rewrite of some asm funcs 
svn-id: r12088
 2004-01-02 14:17:42 +00:00
Gregory Montoir
5cc0191417 some debugger commands for bobs 
svn-id: r12087
 2004-01-02 14:17:25 +00:00
Gregory Montoir
c7965a7a04 minor rewrite of screenblanker code 
svn-id: r12086
 2004-01-02 14:15:45 +00:00