Commit Graph

6127 Commits

Author SHA1 Message Date
Johannes Schickel
15f798d48a Added filename check before header check when trying to detect archives types, this should lower the file i/o need a lot when starting up kyra2.
svn-id: r30835
2008-02-09 15:18:35 +00:00
Johannes Schickel
b3bab9afb9 Implemented proper PAK archive detector.
svn-id: r30834
2008-02-09 15:08:49 +00:00
Johannes Schickel
40b19365be Added another check if PAK file is corrupted.
svn-id: r30833
2008-02-09 14:43:43 +00:00
Johannes Schickel
166698d29d Cleanup.
svn-id: r30832
2008-02-09 14:40:52 +00:00
Johannes Schickel
c98b51e40c - cleanup.
- kyra.dat shouldn't be load by default.

svn-id: r30831
2008-02-08 18:45:25 +00:00
Johannes Schickel
02522a3a14 Should fix regression which prevented kyra.dat to be detected corretly when in game path.
svn-id: r30830
2008-02-08 18:43:13 +00:00
Johannes Schickel
b7717705ae Should make load message appear in CD version while loading talk files.
svn-id: r30829
2008-02-08 11:09:49 +00:00
Jordi Vilalta Prat
e3852c92a7 Remove undesired spaces and an old TODO
svn-id: r30827
2008-02-08 01:45:46 +00:00
Jordi Vilalta Prat
c103290e2b Initial support for plugin types
svn-id: r30825
2008-02-08 00:02:23 +00:00
Johannes Schickel
49d0b1f91e Fixed memory leak.
svn-id: r30824
2008-02-07 23:38:17 +00:00
Johannes Schickel
8f0712a439 Fixed kyra3 related regression (should show the menu now again).
svn-id: r30823
2008-02-07 23:31:13 +00:00
Johannes Schickel
31938bc071 Fixed kyra3 code.
svn-id: r30822
2008-02-07 23:27:08 +00:00
Johannes Schickel
9b5839082d Fixed regression introduced while reworking resource loading code.
svn-id: r30821
2008-02-07 23:14:53 +00:00
Johannes Schickel
ae0b605ad4 Reworked Kyrandia resource loading code.
svn-id: r30820
2008-02-07 23:13:13 +00:00
Max Horn
356ae3b9ce Fix code formatting and grammar ;)
svn-id: r30819
2008-02-07 22:53:23 +00:00
Nicola Mettifogo
58d58d5100 Implemented scroll command and added a couple more debug variables.
svn-id: r30814
2008-02-07 12:49:46 +00:00
Nicola Mettifogo
4be7dac9c3 Fix system hang under linux.
svn-id: r30813
2008-02-06 19:50:45 +00:00
Filippos Karapetis
edab25743e Silence MSVC warning about uninitialized variables
svn-id: r30812
2008-02-06 18:13:22 +00:00
Nicola Mettifogo
509f2f6659 Enabled moving projector in Nippon Safes. This should fix long standing bug #1729309.
svn-id: r30811
2008-02-06 15:38:33 +00:00
Nicola Mettifogo
c03cb964c0 Fixed broken halfbrite implementation from some time ago (nobody complained!!!).
svn-id: r30810
2008-02-06 14:56:10 +00:00
Nicola Mettifogo
014511f380 Made font handling stateless.
svn-id: r30809
2008-02-06 14:12:59 +00:00
Nicola Mettifogo
246fbfd1e4 Added experimental debug feature: variables influencing the rendering that can be set via console using the 'set' command. The implementation is still partial. Leveraging on this, the engine can now selectively display the current background mask instead of the background itself.
svn-id: r30808
2008-02-06 14:05:08 +00:00
Nicola Mettifogo
715e33d63d Correctly implemented little-endian masks in BRA.
svn-id: r30807
2008-02-06 13:57:44 +00:00
Nicola Mettifogo
782563f749 Implemented some more opcodes in BRA. Animations should now be visible in most locations.
svn-id: r30806
2008-02-06 13:44:31 +00:00
Nicola Mettifogo
249c0b0a05 Corrected mask and path loading in BRA.
svn-id: r30805
2008-02-06 13:44:01 +00:00
Torbjörn Andersson
441ec75a71 I think this is slightly easier to read...
svn-id: r30803
2008-02-05 21:39:29 +00:00
Eugene Sandulenko
9f6282defc Fix compilation
svn-id: r30800
2008-02-05 15:33:01 +00:00
Nicola Mettifogo
dabefdce05 Changed main loop to allow BRA to return to menu after intro.
svn-id: r30798
2008-02-05 10:24:22 +00:00
Nicola Mettifogo
17fdd182b6 Enhanced parser to handle multi-line comments in scripts.
svn-id: r30797
2008-02-05 09:55:17 +00:00
Nicola Mettifogo
265621de58 Fixes to make BRA introduction run:
- fixed location command parser
- implemented stop command
- temporary disabled speak zones (audio is not yet supported)

svn-id: r30796
2008-02-05 09:30:58 +00:00
Nicola Mettifogo
50ff4a4603 Fixed size of temporary buffer for unpacking animation frames.
svn-id: r30795
2008-02-05 09:26:28 +00:00
Nicola Mettifogo
e1cff6a7c3 Added new debug command to show global game flags.
svn-id: r30794
2008-02-05 09:25:25 +00:00
Paweł Kołodziejski
f8fe01b9fd silency ignored, we handle it differently
svn-id: r30793
2008-02-05 08:16:52 +00:00
Jordi Vilalta Prat
9d81f3602c Fix indentation (spaces to tabs)
svn-id: r30792
2008-02-05 01:04:31 +00:00
Nicola Mettifogo
ea15cf7236 Adjusted random number generator, thus improving animation quality in the intro. The general still acts like he is on amphetamines.
svn-id: r30791
2008-02-04 20:35:18 +00:00
Nicola Mettifogo
a2101c0c6c Added FIXME comment about wrong color for subtitles in BRA.
svn-id: r30790
2008-02-04 19:57:17 +00:00
Jordi Vilalta Prat
e4ab5dd339 Change MetaEngine references to PluginObject where possible to make its semantics more generic.
svn-id: r30789
2008-02-04 18:38:22 +00:00
Max Horn
5fb7f7a4d6 Commited updated version of my own patch #1868402: Basic savestate plugin API
svn-id: r30786
2008-02-04 10:15:21 +00:00
Max Horn
8a73356a2d Revised Engine plugin API to only provide a single func which returns a MetaEngine instance. Used this to simplify the rest of the plugin system
svn-id: r30780
2008-02-03 18:56:47 +00:00
Max Horn
015e73b792 cleanup
svn-id: r30777
2008-02-03 18:23:27 +00:00
Nicola Mettifogo
fea63a5181 Fixed maximum token length for the parser.
svn-id: r30776
2008-02-03 17:06:45 +00:00
Nicola Mettifogo
da98d10ebd instOp_on and instOp_off are now implemented, so removed warnings.
svn-id: r30771
2008-02-03 16:56:25 +00:00
Nicola Mettifogo
aea99780ef Implemented a couple more opcodes and added capability to load/display static images in BRA.
svn-id: r30770
2008-02-03 16:51:38 +00:00
Nicola Mettifogo
a53d87791d - Character is now initialized when needed (for the moment only by NS)
- Forward lists are now bigger since BRA scripts are larger

svn-id: r30769
2008-02-03 16:02:21 +00:00
Nicola Mettifogo
85171eadaa Programs are now handled in their own list, instead of being accessed via the referring Animation.
svn-id: r30768
2008-02-03 14:58:16 +00:00
Robin Watts
f486fd35b3 Previous commit to enable ARM proc3 stuff for WinCE was broken, as I'd
forgotten to define the enabling symbol in cpp files. Consequently
I'd cocked up when copying the call to the ARM code across from my hacked 
costume.cpp into a fresh one.

svn-id: r30766
2008-02-03 13:12:51 +00:00
Lars Persson
c852940818 Added asmCopy8Col from DS implementation. Changed names to match GFX.cpp (and DS names)
svn-id: r30759
2008-02-03 12:32:19 +00:00
Lars Persson
c6595e3bd2 Changed ASM names to match those in the ARM asm implementations
svn-id: r30758
2008-02-03 12:30:11 +00:00
Nicola Mettifogo
2e28552a7e Fixed location switching in BRA a bit more.
svn-id: r30757
2008-02-03 11:00:55 +00:00
Nicola Mettifogo
c561a9487c Animations are now displayed in the right spots in BRA.
svn-id: r30756
2008-02-03 10:53:42 +00:00
Nicola Mettifogo
748a90ca23 Added code to unpack and render animations in BRA.
svn-id: r30755
2008-02-03 10:48:07 +00:00
Torbjörn Andersson
e51bf80218 Changed "COMPATIBLITY" to "COMPATIBILITY".
svn-id: r30754
2008-02-03 10:15:36 +00:00
Jordi Vilalta Prat
c070f0d04f Converted queen and sky to use MetaEngine (forgot them because they don't use the AdvancedDetector).
svn-id: r30752
2008-02-03 09:39:26 +00:00
Lars Persson
53ef575dba Missing ( in ASM_COSTUME code
svn-id: r30751
2008-02-03 09:35:04 +00:00
Robin Watts
5b64d512ab Introduce ARM code for commonest case of "proc3" costume blitting (as
used for animation in SamNMax). Enabled by the USE_ARM_COSTUME_ASM
define. Currently enabled for WinCE only.

svn-id: r30750
2008-02-03 01:26:12 +00:00
Nicola Mettifogo
899fdcb367 Enabled rudimentary location switch in BRA.
svn-id: r30748
2008-02-02 22:45:31 +00:00
Nicola Mettifogo
d8349d66ff Subtitles are now displayed in the intro for BRA, though in wrong color (and I don't know why).
svn-id: r30747
2008-02-02 21:22:05 +00:00
Sven Hesse
22ead25049 Fixed the description for the Gob2 Amiga demo (bug report #1883801)
svn-id: r30745
2008-02-02 20:26:19 +00:00
Sven Hesse
23ca56961c Added the MD5 for Gob2 English Amiga as supplied by fac76 in bug report #1883808
svn-id: r30744
2008-02-02 20:18:29 +00:00
Torbjörn Andersson
97ef53a652 Fixed warning.
svn-id: r30742
2008-02-02 16:38:51 +00:00
Travis Howell
fc78c57fab Fix GCC compile.
svn-id: r30741
2008-02-02 14:08:13 +00:00
Nicola Mettifogo
ed09766acc BRA now loads and displays location backgrounds (at least in the intro).
svn-id: r30740
2008-02-02 13:57:29 +00:00
Nicola Mettifogo
9f3ecd6409 Cleanup of BRA menu code.
svn-id: r30739
2008-02-02 12:36:06 +00:00
Nicola Mettifogo
36d863f94e Reworked menu in BRA (now functioning).
svn-id: r30737
2008-02-02 12:18:36 +00:00
Max Horn
34b35348be Moved AdvancedMetaEngine to namespace Common
svn-id: r30736
2008-02-02 11:52:04 +00:00
Nicola Mettifogo
5306701eab Allowed BackgroundInfo to display bitmaps smaller than the screen and other small tweaks to re-enable splash screens in BRA.
svn-id: r30732
2008-02-02 10:18:31 +00:00
Nicola Mettifogo
015ad5e469 Some more integration of background code into BackgroundInfo.
svn-id: r30731
2008-02-02 09:48:07 +00:00
Torbjörn Andersson
4227c0f7ce Fixed warning.
svn-id: r30730
2008-02-02 07:18:49 +00:00
Jordi Vilalta Prat
a938260362 Fix a typo
svn-id: r30729
2008-02-02 02:36:57 +00:00
Jordi Vilalta Prat
5165ff448d Converted the remaining engines to use MetaEngine
svn-id: r30728
2008-02-02 02:35:13 +00:00
Max Horn
ec715ea1ec Converted parallaction engine to use MetaEngine
svn-id: r30727
2008-02-02 00:56:02 +00:00
Max Horn
dc979b03cf New MetaEngine class (work in progress to replace the current Engine plugin API with a more object oriented approach)
svn-id: r30726
2008-02-02 00:54:52 +00:00
Nicola Mettifogo
249877fa82 Moved depth buffer and palette rotation data into BackgroundInfo.
svn-id: r30725
2008-02-02 00:41:31 +00:00
Max Horn
7adfb1a295 engine.h was moved from base/ to engines/ ages ago -- update header file protector accordingly
svn-id: r30724
2008-02-01 23:37:16 +00:00
Max Horn
511019bd83 Change InSaveFile -> SeekableReadStream where possible
svn-id: r30722
2008-02-01 23:32:20 +00:00
Nicola Mettifogo
ccc0f6b92d Slightly simplified Archive selection when loading resources.
svn-id: r30714
2008-01-31 10:38:15 +00:00
Filippos Karapetis
f2a16e4f56 Changed the parameter types of setFlags() and clearFlags() to match their definitions
svn-id: r30711
2008-01-30 23:12:51 +00:00
Filippos Karapetis
289d18ed07 Fix shadowing warning
svn-id: r30710
2008-01-30 23:09:18 +00:00
Kari Salminen
d92dbac672 Fix for bug #1881170 (AGI: palette-related glitches reported). Made AGIPAL use only the lowest 6 bits of each color component (This should be the way the original AGIPAL-hack behaves too).
svn-id: r30708
2008-01-30 01:58:43 +00:00
Lars Persson
fe52777943 clibable menus for symbian
svn-id: r30706
2008-01-29 22:39:09 +00:00
Lars Persson
ec0804eb23 - Updated default char signing to signed (as per PC) in makefiles
- Fix for Symbian scrolling problem in GOB3, expressions not evaluated properly resulting in offset beeing set to -1 and not the right offset.

svn-id: r30703
2008-01-29 21:19:45 +00:00
Kari Salminen
04dda32485 Combined two cases that did the exact same thing (In a switch-clause).
svn-id: r30702
2008-01-29 21:18:33 +00:00
Nicola Mettifogo
fb4ef4b394 More cleanup: kBit2 is now replaced by the BackgroundInfo structure.
svn-id: r30697
2008-01-29 10:04:49 +00:00
Nicola Mettifogo
d6f45b451b Fixed regression when displaying animation: the issue could only be noticed when characters appeared out of their sketches in the intro.
svn-id: r30696
2008-01-29 09:58:21 +00:00
Nicola Mettifogo
0e02a9398a Cleanup (step 2). No code outside Gfx reference screen buffers anymore.
svn-id: r30695
2008-01-29 09:37:03 +00:00
Johannes Schickel
c4ad0a1c0d Commit slightly modified patch #1880670 "KYRA: Hof: Zanthia chat fix for towns and floppy versions".
svn-id: r30694
2008-01-28 22:21:47 +00:00
Max Horn
0150ada2d7 Replace lock/unlock/lock/unlock by lock/unlock for efficency
svn-id: r30693
2008-01-28 22:20:55 +00:00
Johannes Schickel
d8e1f5a060 - make Common::sort supporting a function object to compare two entries instead of operator <
- adapt parallaction to use the new Common::sort function

svn-id: r30692
2008-01-28 22:05:23 +00:00
Torbjörn Andersson
7aac83007d Fixed typo in debug message.
svn-id: r30691
2008-01-28 21:54:44 +00:00
Nicola Mettifogo
1a36ba488c Cleanup (step 1).
svn-id: r30689
2008-01-28 20:40:05 +00:00
Torbjörn Andersson
8e4f5b6f82 Fixed warning.
svn-id: r30688
2008-01-28 20:06:40 +00:00
Nicola Mettifogo
68fc3f1dee Removed usage of kBitFront and kBitBack. Only the old kBit2 buffer is kept to store the background picture.
svn-id: r30687
2008-01-28 19:56:29 +00:00
Nicola Mettifogo
b80419efb4 Made halfbrite work again.
svn-id: r30685
2008-01-28 18:15:06 +00:00
Nicola Mettifogo
efdc6f646f Changed _c_moveSheet to work with only 1 buffer.
svn-id: r30684
2008-01-28 18:10:16 +00:00
Nicola Mettifogo
5fb19e226c Oops. Forgot to update this in the last commit.
svn-id: r30683
2008-01-28 17:37:15 +00:00
Nicola Mettifogo
a206f6e873 Changed guiSelectCharacter to work with only screen buffer.
svn-id: r30682
2008-01-28 17:36:08 +00:00
Nicola Mettifogo
56eed45317 Move low level background management into Gfx.
svn-id: r30681
2008-01-28 17:28:16 +00:00
Nicola Mettifogo
3c2c16c705 Fixed animation sorting: everything should be drawn like before revision 30673 now. Character may still disappear when changing location because of wrong resource management, though.
svn-id: r30680
2008-01-28 16:52:41 +00:00
Max Horn
1bba7bd04e Fix 'member var shadowed' warning
svn-id: r30679
2008-01-28 15:20:47 +00:00
Sven Hesse
57a862b2a0 Fix compilation
svn-id: r30676
2008-01-28 14:45:54 +00:00
Nicola Mettifogo
cce8e25960 Removed all job routines. Stubs have been left for future reference in the code for BRA.
svn-id: r30675
2008-01-28 13:10:49 +00:00
Nicola Mettifogo
1888cbe50b Oops. Forgot ScummVM header in new source file.
svn-id: r30674
2008-01-28 12:31:14 +00:00
Nicola Mettifogo
be2c5d3c87 All interactive objects are now drawn in the framebuffer instead of using the old kBitBack/kBitFront buffers. Animation are not sorted yet, so they can overlap in an inconsistent fashion for the time being.
svn-id: r30673
2008-01-28 12:20:53 +00:00
Paul Gilbert
e32e1b732c Changed array of method pointers to case statement to fix compiler error in earlier versions of gcc
svn-id: r30672
2008-01-28 11:28:49 +00:00
Jordi Vilalta Prat
d6c34bdc4b Fixed the spaces before tabs.
svn-id: r30667
2008-01-28 00:14:17 +00:00
Jordi Vilalta Prat
66e9d4f5e8 Removed trailing spaces.
svn-id: r30664
2008-01-27 19:47:41 +00:00
Filippos Karapetis
278857698d Possible fix for the errors under older versions of GCC (e.g. under BeOS)
svn-id: r30661
2008-01-27 16:52:50 +00:00
Johannes Schickel
bcdfb48172 Cleanup.
svn-id: r30657
2008-01-27 15:56:56 +00:00
Filippos Karapetis
e431f827ec Disabled a debug function which throws warnings in older versions of GCC (e.g. under BeOS)
svn-id: r30655
2008-01-27 15:54:16 +00:00
Johannes Schickel
dd3a8672be Fix for some problems introduced (like wrong text display) with last commit.
svn-id: r30654
2008-01-27 15:53:09 +00:00
Johannes Schickel
fec6e22cc9 - slightly refactored user settings handling
- added user some settings handling for HoF

svn-id: r30653
2008-01-27 15:30:53 +00:00
Eugene Sandulenko
fa5271d836 Really fix bug #1846886: "PUTTZOO: Windows version cursor/pointer drawn wrong".
Also replace default HE cursor (used in Lost) with correct one.

svn-id: r30650
2008-01-27 15:10:56 +00:00
Filippos Karapetis
5b6dbecb62 Limit the number of simultaneous open files in IHNM to 7, down from 12. This is necessary for devices that can keep a limited amount of files open simultaneously, like the PSP
svn-id: r30648
2008-01-27 14:32:08 +00:00
Johannes Schickel
33a90c1e00 Commit patch #1869752 "KYRA: HoF startup patch for towns and floppy". (Slightly modified)
svn-id: r30645
2008-01-27 02:05:37 +00:00
Paweł Kołodziejski
4204371c19 fix for wrong imuse table entry fixes #1879940
svn-id: r30634
2008-01-25 20:16:55 +00:00
Kari Salminen
af4d740757 Fully fix bug #1660424 (KQ4: Zombie bug). The bug also affected room 18 in addition to the room 16 that was already taken care of in revision 30482.
svn-id: r30631
2008-01-25 12:32:38 +00:00
Kari Salminen
3423fc8971 Added detection for fanmade AGI game Enclosure v1.03.
svn-id: r30630
2008-01-24 10:15:01 +00:00
Paul Gilbert
2195528ca0 Got rid of the experimental NPC Schedule store in favour of moving the NPC schedules from the active hotspot class back into the hotspot data class, similiar to how the original game implements them
svn-id: r30629
2008-01-24 08:14:48 +00:00
Filippos Karapetis
8e178f2e60 Commit of patch #1877134 - "Drascula: Remove Spanish characters"
svn-id: r30621
2008-01-23 08:08:15 +00:00
Kari Salminen
b8a455db9b Define and use enumerations for AGI Mouse protocol 1.0's button states.
svn-id: r30620
2008-01-23 00:06:10 +00:00
Filippos Karapetis
c577c0ea81 Code simplification
svn-id: r30617
2008-01-22 21:55:14 +00:00
Nicola Mettifogo
dd45b7ad45 Some refactoring of text drawing routines.
svn-id: r30615
2008-01-22 20:53:29 +00:00
Kari Salminen
f7a05a6d20 Fixed typo in comment.
svn-id: r30614
2008-01-22 19:45:06 +00:00
Paul Gilbert
00796bb598 Bugfix for transformation sparkle to finish if the player changes room partway through animation
svn-id: r30609
2008-01-22 09:46:11 +00:00
Paweł Kołodziejski
2204661dd6 moved debug log
svn-id: r30605
2008-01-21 23:24:11 +00:00
Paweł Kołodziejski
fec313a1ac final fix for bug #1757010
svn-id: r30604
2008-01-21 22:06:14 +00:00
Kari Salminen
8d1dd18bda Implements 2 arguments version of the adj.ego.move.to.x.y-command. Should fix bug #1733297 (GR: Actor stuck (Amiga version)). Savegames when using adj.ego.move.to.x.y-command may be broken at the moment.
svn-id: r30602
2008-01-21 21:09:42 +00:00
Nicola Mettifogo
6b188943ac Merged low level blitting functions into one single routine.
svn-id: r30600
2008-01-21 20:03:37 +00:00
Eugene Sandulenko
86456702f9 Move tag2str() to common/
svn-id: r30598
2008-01-21 12:44:39 +00:00
Paweł Kołodziejski
5084530348 disabled force restore state music, it seems fix bug #1757010, at least i see/hear difference :)
svn-id: r30596
2008-01-21 00:42:05 +00:00
Paweł Kołodziejski
41e478d142 fix debug output
svn-id: r30595
2008-01-21 00:39:44 +00:00
Paweł Kołodziejski
fe8c2b89b1 for debug logs for dimuse
svn-id: r30594
2008-01-21 00:10:14 +00:00
Travis Howell
369948a5a2 Add Spanish Amiga version of Elvira 2.
svn-id: r30592
2008-01-20 23:06:09 +00:00
Paweł Kołodziejski
ec66f6765c added experimental hack to code to prevent the same start music again if old one didn't have chance finish. it's fix bug #1861704, it may fix other similiar things when seq is to null. added few changes to debug logs.
svn-id: r30590
2008-01-20 19:30:48 +00:00
Paweł Kołodziejski
77838d91e6 fix/workaround for bug #1624464, as we do not support game playing on two different CDs
svn-id: r30588
2008-01-20 17:02:28 +00:00
Paweł Kołodziejski
eafc9f58f2 rename to prevent confusion
svn-id: r30587
2008-01-20 13:19:05 +00:00
Paul Gilbert
c9b6822438 Fixed shadowing warning that I missed
svn-id: r30584
2008-01-20 03:42:42 +00:00
Paul Gilbert
99e2c7c1d6 Fixed bug with saving of cached actor schedules and added saving of talk data flags
svn-id: r30582
2008-01-20 03:38:16 +00:00
Max Horn
08a0caa17f Added MD5 checksum of japanese mac FOA
svn-id: r30580
2008-01-19 22:24:43 +00:00
Paweł Kołodziejski
b74d38586d fixed potential unitialized variable
svn-id: r30574
2008-01-19 20:53:28 +00:00
Paweł Kołodziejski
d0f80d2743 one byte more for array :)
svn-id: r30573
2008-01-19 20:50:58 +00:00
Paweł Kołodziejski
51565663cc increase a bit more
svn-id: r30572
2008-01-19 20:07:44 +00:00
Paweł Kołodziejski
604d4d96ea fixed potential unitialized variables, one array overflow
svn-id: r30571
2008-01-19 20:00:36 +00:00
Paweł Kołodziejski
703667b606 allow force flush fade track, it happen while very fast switching rooms
svn-id: r30570
2008-01-19 19:32:40 +00:00
Paweł Kołodziejski
78166fb40b changed warning into error, to be know for sure if it still trigger
svn-id: r30568
2008-01-19 17:35:06 +00:00
Paweł Kołodziejski
35fb2055b0 moved fadeDelay
svn-id: r30567
2008-01-19 17:30:49 +00:00
Paweł Kołodziejski
62d4b44502 revert code to fade out first region if jump hit
svn-id: r30566
2008-01-19 17:13:53 +00:00
Paweł Kołodziejski
72d59da6cb missed setting trackId while starSound,
added more debug output,
verification of jump code, it might have regressions

svn-id: r30565
2008-01-19 16:06:20 +00:00
Paweł Kołodziejski
00de511335 fixed support for compressed streams in dimuse
svn-id: r30564
2008-01-19 13:26:53 +00:00
Torbjörn Andersson
4cbd3e6af8 Fixed a crash in the rat maze (reported on the forum) that made the game
uncompletable. I sense a great disturbance in the Force... as if millions of
voices cried out "ScummVM 0.11.1" and were suddenly silenced.

svn-id: r30562
2008-01-19 11:20:15 +00:00
Paweł Kołodziejski
2671e5083c malloc -> new, free -> delete, added few asserts
svn-id: r30561
2008-01-19 11:14:28 +00:00
Paweł Kołodziejski
f0e131c9c3 fixed, it might overflow int32
svn-id: r30560
2008-01-19 10:58:43 +00:00
Max Horn
9a1e7a0c35 Possible fix for bug #1874516 (QUEEN: Lockup on quit)
svn-id: r30551
2008-01-18 17:23:10 +00:00
Max Horn
eb03de63bc iMuse Digital: Moved track & table definition from dimuse.h into separate header files
svn-id: r30550
2008-01-18 17:08:53 +00:00
Max Horn
c2d1554c7d Don't hardcode value for which we have wonderful and nice constants defined ;)
svn-id: r30549
2008-01-18 16:38:11 +00:00
Paul Gilbert
e6c20003c0 Enhanced Surface::writeSubstring to crop any string that exceeds the width of the surface - this fixes a visual glitch in the German version where some lines were so long they were exceeding the size of the screen
svn-id: r30547
2008-01-18 10:49:48 +00:00
Paul Gilbert
586ef72e96 Increase talk dialog size by 2 pixels to accommodate a very long word in the German version
svn-id: r30545
2008-01-18 10:43:51 +00:00
Paweł Kołodziejski
d85e148f4f restore TrackId meaning
svn-id: r30541
2008-01-17 22:55:22 +00:00
Paweł Kołodziejski
9a699c9705 reduction a bit of code
svn-id: r30538
2008-01-17 21:46:17 +00:00
Paweł Kołodziejski
51ad8e29be fixed regression in allocSlot in dimuse, that fix bug #1874045
svn-id: r30536
2008-01-17 21:06:29 +00:00
Kari Salminen
0bfbd62ce7 Fixed obsolete comment.
svn-id: r30535
2008-01-17 12:21:31 +00:00
Kari Salminen
931b4abe5e Confirmed that the Amiga version of Space Quest II v2.0F using Amiga AGI 2.202 uses value 5 for v20 (i.e. the computer type variable). Thanks to Raziel for the info!
svn-id: r30533
2008-01-17 11:36:54 +00:00
Paul Gilbert
4511ba81a4 Bugfix for logging the description of actions being done
svn-id: r30532
2008-01-17 11:18:30 +00:00
Kari Salminen
5a2440ce1b Fix for isalpha() assertions (Almost identical to revision 29924's fix). Added the rationale for this fix in comments so hopefully this won't happen a third time at the same point in code ;).
svn-id: r30531
2008-01-17 11:16:00 +00:00
Paul Gilbert
3a0f7b4ea8 Updated required lure.dat version number
svn-id: r30526
2008-01-17 09:50:42 +00:00
Paul Gilbert
00ecb126e3 Bugfix for the position and size of the copy protection dialog instructions in the German version
svn-id: r30524
2008-01-17 09:05:56 +00:00
Oystein Eftevaag
2ef04f972c Fixed some warnings
svn-id: r30523
2008-01-16 22:41:48 +00:00
Paweł Kołodziejski
0db783608b forgot disable that too
svn-id: r30522
2008-01-16 22:24:23 +00:00
Paweł Kołodziejski
bd32e7a6b0 experimental seek in compressed streams in dimuse in time ms resolution
svn-id: r30521
2008-01-16 22:20:34 +00:00
Paweł Kołodziejski
6b33041172 ops
svn-id: r30519
2008-01-16 20:03:54 +00:00
Paweł Kołodziejski
bb2c102cbb clarify warning
svn-id: r30518
2008-01-16 20:01:35 +00:00
Kari Salminen
d6e2e1431c Confirmed that Amiga version of King's Quest III (v1.01 1986-11-08) using Amiga AGI 2.090 uses value 5 for v20 (i.e. the computer type variable). Thanks to Raziel for the info!
svn-id: r30516
2008-01-16 15:19:33 +00:00
Paul Gilbert
019624e3c1 Added code fragment to correctly set the walk to position for Goewin (for interacting with her) both when she's in the Apothecary and when she's out walking
svn-id: r30515
2008-01-16 10:06:19 +00:00
Travis Howell
72dc3dcc0d Set the number of speech segments in The Feeble File.
svn-id: r30508
2008-01-15 23:40:01 +00:00
Torbjörn Andersson
fe12cf8096 Fixed bad memory access. (Wrong index variable when reading sound->marker[].)
svn-id: r30506
2008-01-15 21:56:53 +00:00
Torbjörn Andersson
08f1357451 Use scumm_stricmp() instead of plain stricmp().
svn-id: r30505
2008-01-15 21:46:12 +00:00
Paweł Kołodziejski
552353663d ops
svn-id: r30504
2008-01-15 21:38:06 +00:00
Paweł Kołodziejski
6bb2f44472 implement dimuse transition 12, not tested yet
svn-id: r30503
2008-01-15 21:35:03 +00:00
Torbjörn Andersson
8935c574d5 Fixed warnings.
svn-id: r30502
2008-01-15 20:36:54 +00:00
Torbjörn Andersson
5dc2caa307 Since the mixer uses 'delete' to free memory, we should allocate it with 'new'.
I don't know if I got all cases, but I no longer get any Valgrind warnings at
the beginning of CoMI when using the original sound/music files.

svn-id: r30501
2008-01-15 20:30:48 +00:00
Paweł Kołodziejski
d0e5df5bfa ops
svn-id: r30500
2008-01-15 20:11:28 +00:00
Paweł Kołodziejski
c3d4abe4b7 fix last commit to release, and add version 2 fallback for compressed files
svn-id: r30499
2008-01-15 20:09:56 +00:00
Torbjörn Andersson
173988960b Initialise _lastTableWidth. (Fixes Valgrind warning.)
svn-id: r30497
2008-01-15 20:06:41 +00:00
Paweł Kołodziejski
75099c6c20 forgot release string in the 'marker'
svn-id: r30495
2008-01-15 19:34:35 +00:00
Paweł Kołodziejski
4b9d2e9370 implement loading markers "exit". dumped version 3 for compressed bun files, compress tools are not ready
svn-id: r30494
2008-01-15 12:51:26 +00:00
Paweł Kołodziejski
86714835f1 back to previous way of copying stream, so it continue old stream
svn-id: r30491
2008-01-15 01:35:05 +00:00
Paweł Kołodziejski
9639666629 if track sound data is compressed reset data offset to beginning of region. we need implement seek in stream anyway or drop support
svn-id: r30490
2008-01-15 00:37:37 +00:00
Paweł Kołodziejski
f433c62112 implement force flush old fadeTrack. fixed trackId in new fadeTrack, it wasn't set properly, caused switching regions.
svn-id: r30489
2008-01-14 23:41:42 +00:00
Paweł Kołodziejski
8ada12d3d8 revert last experimental dimuse change, force flush
svn-id: r30488
2008-01-14 21:42:39 +00:00
Paweł Kołodziejski
6992238026 experimental force flush fade track if it's in use
svn-id: r30487
2008-01-14 20:35:58 +00:00
Paweł Kołodziejski
c36b44878a put 'break' here too, only one music in non fade tracks allowed
svn-id: r30486
2008-01-14 20:17:19 +00:00
Paweł Kołodziejski
f2f0d084e7 i forgot 'break' in the loop
svn-id: r30485
2008-01-14 20:12:35 +00:00
Paweł Kołodziejski
f15b41596b implement special case for playing music with beginning offset where other one stopped
svn-id: r30483
2008-01-14 17:26:49 +00:00
Kari Salminen
d167ad4066 Workaround for bug #1660424 (KQ4: Zombie bug) which is a script bug present in the original game.
svn-id: r30482
2008-01-14 17:03:14 +00:00
Paweł Kołodziejski
5870bebd6d fixed setting hookId for music, it doesn't worked before
svn-id: r30481
2008-01-14 14:48:35 +00:00
Paweł Kołodziejski
a6f8e5c89a correction fade out music times in comi demo
svn-id: r30480
2008-01-13 23:48:56 +00:00
Paweł Kołodziejski
758c4b1655 not need call refreshScripts in demo version of comi
svn-id: r30479
2008-01-13 23:44:52 +00:00
Kari Salminen
a493647076 Indentation
svn-id: r30478
2008-01-13 23:43:17 +00:00
Torbjörn Andersson
9948b667ba Indentation.
svn-id: r30477
2008-01-13 22:16:46 +00:00
Torbjörn Andersson
7b15433572 Removed unnecessary semi-colons.
svn-id: r30476
2008-01-13 22:12:35 +00:00
Paweł Kołodziejski
16717ce5e1 revert updateFadeMusicTrack
svn-id: r30475
2008-01-13 22:02:27 +00:00
Paweł Kołodziejski
bf07f977e2 revert experimental hack
svn-id: r30466
2008-01-13 01:08:22 +00:00
Paweł Kołodziejski
9483400812 fixed fadeOutMusic in transitions
svn-id: r30465
2008-01-13 01:03:15 +00:00
Paweł Kołodziejski
d27c118acc additional missing stoppingSequence to music transitions.
svn-id: r30464
2008-01-13 00:15:43 +00:00
Paweł Kołodziejski
6b34fcc2b4 added missing stoppingSequence to music transitions. still i'm not sure if it trigger properly in our imuse implementation
svn-id: r30463
2008-01-13 00:10:30 +00:00
Paweł Kołodziejski
ae9e25b30f refreshScripts should check for music state not sequence. it will create regressions in comi :) that part need more investigation.
svn-id: r30462
2008-01-12 23:54:19 +00:00
Paweł Kołodziejski
68f41bd71b seqId 4 should pass fadeout music not silence ignore
svn-id: r30461
2008-01-12 23:30:07 +00:00
Torbjörn Andersson
323aafcf78 The dummy ("narration only") cutscene player misbehaved a bit if the cutscene
soundtrack was present. It should work better now.

svn-id: r30455
2008-01-12 20:18:41 +00:00
Nicola Mettifogo
7d635a4b9c Added function to encapsulate/protect manipulation of background.
svn-id: r30441
2008-01-12 10:46:51 +00:00
Johannes Schickel
48bd0ca6b6 Removed warning in Screen::getOverlayPtr for now.
svn-id: r30440
2008-01-12 08:31:36 +00:00
Johannes Schickel
3629d64413 Use getMousePos in checkInput.
svn-id: r30439
2008-01-12 08:18:37 +00:00
Johannes Schickel
4f8cf19292 Commit patch #1869749 "KYRA: HoF Towns Audio fix".
svn-id: r30438
2008-01-12 08:04:00 +00:00
Johannes Schickel
afd8743465 Commit patch #1869747 "KYRA: HoF sjis patch".
svn-id: r30437
2008-01-12 07:59:39 +00:00
Paul Gilbert
a5a4a6fde5 Bugfix for actors getting stuck (losing their schedule)
svn-id: r30435
2008-01-12 06:34:11 +00:00
Paul Gilbert
dde154c3ed Removed old copyright 2005-2006 line from several files so that their headers are consistant with the other files
svn-id: r30433
2008-01-12 01:30:11 +00:00
Torbjörn Andersson
b97c9ef136 Work around bug #1324106 again. Apparently, I was mistaken the other day when I
said the timer changes fixed it. This time, I've made the workaround a bit
simpler to understand, though.

svn-id: r30429
2008-01-11 22:59:13 +00:00
Max Horn
6bc4a9a35e The SCUMM timer fix makes the workaround for bug #1324106 obsolete
svn-id: r30419
2008-01-11 22:13:34 +00:00
Max Horn
3e980392d5 Fixed bug #1861582 (COMI: Banjo duel seems harder than in the original) by changing the way SCUMM updates the timer vars (matches disasm now). Beware of regressions\!
svn-id: r30418
2008-01-11 22:12:06 +00:00
Filippos Karapetis
b460e0880b Cleanup
svn-id: r30412
2008-01-11 14:27:07 +00:00
Filippos Karapetis
561a5a4b22 Fixed capitalization
svn-id: r30411
2008-01-11 14:22:46 +00:00
Filippos Karapetis
5abe3db577 Added support for the Italian fan translations of Inherit the Earth. The original DOS CD, DOS floppy and the Wyrmkeep multi OS re-release CD have been translated to Italian
svn-id: r30410
2008-01-11 13:48:06 +00:00
Travis Howell
00ad56bb08 Fix assert that can be triggered in non-English versions of The Feeble Files for Amiga/Macintosh.
svn-id: r30406
2008-01-11 12:53:31 +00:00
Filippos Karapetis
05b28340bf Cleanup and simplification
svn-id: r30405
2008-01-11 10:59:43 +00:00
Filippos Karapetis
5a652c9471 Don't show help when the alt or shift keys are pressed
svn-id: r30404
2008-01-11 10:20:31 +00:00
Filippos Karapetis
1603afe632 Cleanup and simplification
svn-id: r30403
2008-01-11 09:52:06 +00:00
Johannes Schickel
2a28b40512 Added some paranoia checks.
svn-id: r30398
2008-01-11 00:35:39 +00:00
Johannes Schickel
f510fb6b14 Fix regression introduced with last commit. (Caused crash in Amiga version)
svn-id: r30397
2008-01-11 00:33:45 +00:00
Johannes Schickel
2dd6db4ca5 Commit slighty modified patch #1865509 "KYRA: kyradat support for hof".
svn-id: r30394
2008-01-10 23:25:19 +00:00
Kostas Nakos
1f6237567e add virtual keyboard show/hide calls
svn-id: r30388
2008-01-10 22:04:00 +00:00
Paul Gilbert
b14da0b02c Fix for debug logging of the current action name
svn-id: r30386
2008-01-10 21:32:49 +00:00
Torbjörn Andersson
89f15fe482 Fixed warnings.
svn-id: r30379
2008-01-10 19:06:38 +00:00
Paul Gilbert
d804bad551 Replaced the Blacksmith hack with an NPC Schedules list that stores the active schedule of an NPC when it's deactivated in case it's later reactivated again.
svn-id: r30378
2008-01-10 13:37:34 +00:00
Kari Salminen
286a3da49b Remove disabling of moving using mouse in mines in Amiga's Gold Rush introduced in r30375. So bug #1733297 remains although not stricly in its original form (Moving using mouse in the mines bugs still but not identically as when the bug report was given).
svn-id: r30377
2008-01-10 12:40:57 +00:00
Kari Salminen
6b372d97ee Disable moving using mouse in mines (Rooms 147-162) and 'adj.ego.move.to.x.y'-command (Which uses 2 arguments) in Amiga's Gold Rush. This temporary hack fixes bug #1733297 (GR: Actor stuck (Amiga version)).
svn-id: r30375
2008-01-10 12:02:03 +00:00
Paul Gilbert
8b9c7b2137 Corrected the name of script method #39 which closes the town hall door
svn-id: r30371
2008-01-10 10:48:04 +00:00
Filippos Karapetis
947608cd91 Changed an assertion to a warning
svn-id: r30369
2008-01-10 10:34:23 +00:00
Paul Gilbert
1d4efdcaa1 Added proper reset of barmen data when game is restarted, and added missing barman data to savegames
svn-id: r30367
2008-01-10 09:42:51 +00:00
Paul Gilbert
fee6362147 Bugfix for incorrect data being saved for the current NPC the barmen are serving
svn-id: r30365
2008-01-10 09:22:46 +00:00
Filippos Karapetis
1886d498ed Change an error to a warning
svn-id: r30363
2008-01-09 22:58:55 +00:00
Nicola Mettifogo
3ed0ddd375 Refactored some text drawing code.
svn-id: r30362
2008-01-09 22:03:51 +00:00
Nicola Mettifogo
605c9d0fd6 Turned Gfx::setFont into a protected member, since now Gfx can automatically detect which font to use. Gfx still needs setFont internally to select fonts. The font shadowing introduced in revision 30221 has been removed as well, since the new approach handles it better.
svn-id: r30361
2008-01-09 21:54:58 +00:00
Nicola Mettifogo
bdf440fdae Replaced the remaining old string code with the new label code. All the text is now drawn in the framebuffer instead of being blitted onto the internal game screen buffer.
svn-id: r30360
2008-01-09 21:46:57 +00:00
Filippos Karapetis
29d1749db5 Added handling of home/end keys in input dialogs and properly filtered out non-alphanumeric keys
svn-id: r30358
2008-01-09 21:26:38 +00:00
Filippos Karapetis
6f4acae161 Fixed some issues with AGI keyboard input
svn-id: r30356
2008-01-09 12:59:11 +00:00
Paul Gilbert
6d4d02a27f Bugfix for #1866784 - Castle Skorl can be activated multiple times
svn-id: r30354
2008-01-09 12:36:58 +00:00
Paul Gilbert
af443ba924 Bugfix for #1866782 - fixes the issue with the Blacksmith being reactivated after earlier being deactivated in the middle of hammering the anvil
svn-id: r30353
2008-01-09 11:14:15 +00:00
Filippos Karapetis
85b3a4a59e Added a debug command, did some cleanup
svn-id: r30351
2008-01-09 10:31:52 +00:00
Filippos Karapetis
b0f2e823e0 Cleanup of the debugger commands, added some more commands, removed now obsolete debug code
svn-id: r30350
2008-01-09 09:46:26 +00:00
Filippos Karapetis
c14d420141 Added a debug console for Mickey's Space Adventures
svn-id: r30349
2008-01-09 09:19:17 +00:00
Paul Gilbert
34c3c89267 Fix for #1866777 - adds saving of hotspot layer to savegames
svn-id: r30347
2008-01-09 09:13:39 +00:00
Paul Gilbert
241c337dc3 Fixed popup menu height so bottom action doesn't partially overlap the bottom border
svn-id: r30346
2008-01-09 02:32:18 +00:00
Nicola Mettifogo
e21fd496f8 Restructured label handling and moved all related code to Gfx.
svn-id: r30345
2008-01-08 20:46:58 +00:00
Nicola Mettifogo
359f56cd35 Removed useless members.
svn-id: r30344
2008-01-08 20:37:31 +00:00
Nicola Mettifogo
1b80eedaa1 Added a proper _name member to Zone, instead of using the label text.
svn-id: r30343
2008-01-08 20:32:29 +00:00
Paul Gilbert
cd23db6ce8 Changed method parameter name to prevent shadowing warning
svn-id: r30340
2008-01-08 06:18:33 +00:00
Paul Gilbert
965eddf0dc Enhanced NPC walk-to logic to handle separately several special Ids that were previously handled identically
svn-id: r30339
2008-01-08 06:13:55 +00:00
Paul Gilbert
660d9a89d7 Bugfix for #1865552 - crash when waiting for patrol. Incorrect value was being passed to retrieve a hotspot pointer
svn-id: r30336
2008-01-08 03:09:00 +00:00
Nicola Mettifogo
c1c8b10fbe Merged dos monospaced fonts subclasses into parent class. Handling is the same, and readability is more important than performance, especially when you call a routine only twice.
svn-id: r30335
2008-01-07 23:13:45 +00:00
Eugene Sandulenko
14d4a515f2 Revert temporary change.
svn-id: r30334
2008-01-07 22:47:54 +00:00
Eugene Sandulenko
aedd732cef Add Buddha and david_corrales to credits.
svn-id: r30330
2008-01-07 22:42:58 +00:00
Max Horn
5dbc89c119 typo
svn-id: r30328
2008-01-07 19:41:27 +00:00
Kari Salminen
2f50a2416c Reject AGIPAL-files with over 6 bits per color component. Makes at least fanmade AGI game Naturette II's colors not be messed up anymore.
svn-id: r30326
2008-01-07 18:58:30 +00:00
Kari Salminen
e9f3b27c03 Add detection data for a finished fanmade AGI game Naturette IV (2007-10-05).
svn-id: r30324
2008-01-07 18:29:33 +00:00
Paul Gilbert
a137ff2cf1 Changed debug keys enablement to be on by default if a Debug Level is specified
svn-id: r30322
2008-01-07 10:32:54 +00:00
Kari Salminen
01a256455d Add partial implementation of obj.status.v-command (Based on observations of the command's output in the Amiga version of Gold Rush!).
svn-id: r30321
2008-01-07 08:57:28 +00:00
Filippos Karapetis
4fb5f9274d Removed some obsolete defines
svn-id: r30320
2008-01-07 08:44:19 +00:00
Filippos Karapetis
f3b99816c6 Fixed an MSVC warning
svn-id: r30319
2008-01-07 08:43:20 +00:00
Paul Gilbert
841cc77e5c Made debugging keys disabled by default, with a debugger command to allow them to be turned on
svn-id: r30317
2008-01-07 03:53:30 +00:00
Torbjörn Andersson
1ddc8ab0fa Indent with tabs instead of spaces.
svn-id: r30315
2008-01-06 20:57:46 +00:00
Nicola Mettifogo
5ff1ccabe6 Removed now useless functions.
svn-id: r30314
2008-01-06 20:51:05 +00:00
Nicola Mettifogo
35b7021fac Fixes wrong type.
svn-id: r30313
2008-01-06 20:46:03 +00:00
Torbjörn Andersson
eeb212c7e0 Indent with tabs instead of spaces.
svn-id: r30312
2008-01-06 20:42:28 +00:00
Nicola Mettifogo
db51514dd3 Moved balloons management into Gfx, which is now responsible for positioning and drawing. All balloons are now drawn on a different layer than the game graphics, thus simplifying screen management. Dialogue code has undergone a major revision, and the superior implementation of answer selection in the Amiga version is now used in place of the poor PC one. Other bits (where some changes had already been introduced) have been updated, too.
svn-id: r30311
2008-01-06 19:29:41 +00:00
Max Horn
84e5398b1c store the disk sounds/music were actually *loaded* from, instead of the 'current' disk
svn-id: r30310
2008-01-06 16:02:38 +00:00
Max Horn
690d38cfc4 Unify mixer pan/vol setting code
svn-id: r30308
2008-01-06 14:59:46 +00:00
Travis Howell
022c5a27e3 Remove unused Amiga OCS font data, the AGA font data can by used by all Amiga versions of Simon the Sorcerer 1.
svn-id: r30300
2008-01-06 14:04:18 +00:00
Travis Howell
9b45c2c994 Split charset font data.
svn-id: r30299
2008-01-06 14:00:43 +00:00
Max Horn
79ba9686eb Fix bug #1864932: COMI: Game crashes on difficulty selection screen
svn-id: r30298
2008-01-06 13:54:19 +00:00
Travis Howell
743858b097 Fix regression in Let's Explore the Farm with Buzzy demo.
svn-id: r30296
2008-01-06 13:27:42 +00:00
Johannes Schickel
e462bf55b3 Committed patch #1864214 "KYRA2: correct platform and talkie flags for sequence player".
svn-id: r30290
2008-01-06 11:01:56 +00:00
Travis Howell
f31b835fda Resort a few cases and opcodes in HE code.
svn-id: r30289
2008-01-06 06:21:04 +00:00
Paul Gilbert
c43a851e13 Changed the frame delay for part of the introduction sequence to match the original game and prevent the music from running out before the next animation begins
svn-id: r30287
2008-01-06 02:59:41 +00:00
Paul Gilbert
b535b070f3 Fix to show talk dialogs in EGA mode using the EGA palette
svn-id: r30286
2008-01-06 02:09:18 +00:00
Filippos Karapetis
71980d0fbd Fixed compilation
svn-id: r30285
2008-01-06 00:28:36 +00:00
Max Horn
1194495ad3 cleanup
svn-id: r30284
2008-01-06 00:09:05 +00:00
Max Horn
e52591ac0e clarify comment
svn-id: r30283
2008-01-06 00:00:53 +00:00
Max Horn
d340e77f24 Made IMuseDigital::stopSound use flushTrack instead of setting track->toBeRemoved = true; cleanup in flushTrack()
svn-id: r30282
2008-01-05 23:58:27 +00:00
Torbjörn Andersson
273c5b5cf1 Removed unnecessary newline in debug message.
svn-id: r30279
2008-01-05 23:57:12 +00:00
Max Horn
1d34ce3baa Let the audio mixer take care of (i.e. dispose) the Track::stream object, too
svn-id: r30277
2008-01-05 23:53:28 +00:00
Max Horn
ef9dac103f stop low priority sounds which we want to override immediatly
svn-id: r30275
2008-01-05 23:44:05 +00:00
Max Horn
dce7a57cad VAR_TMR_4 has a special role from VAR_TMR_1 till 3 (in particular, it exists across far more SCUMM versions), so rename it to VAR_TIMER_TOTAL
svn-id: r30271
2008-01-05 23:05:16 +00:00
Torbjörn Andersson
063aecaf7a Fixed warning.
svn-id: r30269
2008-01-05 23:01:25 +00:00
Max Horn
56ad5f493e Play SOU data instantly, not slightly delayed -> allows us to get rid of Track::streamSou & Track::mixerStreamRunning (have not yet removed the latter to avoid introducing a new savegame version)
svn-id: r30268
2008-01-05 22:57:36 +00:00
Max Horn
7ebdffb0cd Seems IMuseDigital::cloneToFadeOutTrack was using the wrong pan value all the time
svn-id: r30267
2008-01-05 22:45:35 +00:00
Max Horn
f68d84b54f Moved some code which was being duplicated to methods of class Track
svn-id: r30266
2008-01-05 22:44:39 +00:00
Max Horn
923ad313dc Let the audio mixer delete the streamSou object
svn-id: r30265
2008-01-05 22:35:30 +00:00
Kari Salminen
64601d446f Workaround for Amiga Gold Rush's broken picture 147 by patching it.
svn-id: r30263
2008-01-05 21:10:49 +00:00
Max Horn
3f6b2c97b7 When loading and before starting an iMuse Digitial track, reset it completely to zero
svn-id: r30262
2008-01-05 20:59:33 +00:00
Max Horn
1f364f54e7 Clarified some iMuse Digital code as I understand it
svn-id: r30260
2008-01-05 20:52:42 +00:00
Kari Salminen
5f7a037bda Implement a workaround to hide.mouse-command for Amiga's Gold Rush. Fixes walking with mouse in room 192 (The hanging scene i.e. the copy protection failure scene).
svn-id: r30259
2008-01-05 20:52:30 +00:00
Max Horn
077026e088 As far as I can tell / understand, IMuseDigital::getSoundStatus can safely just use isSoundHandleActive for both stream and streamSou (warning: might cause regressions)
svn-id: r30258
2008-01-05 20:50:10 +00:00
Max Horn
8b12998c72 Use souStreamUsed to distinguish between 'stream' and 'streamSou' usage
svn-id: r30257
2008-01-05 20:49:18 +00:00
Max Horn
c9a8d02f6e Do not busy wait in IMuseDigital::allocSlot on *any* platform
svn-id: r30255
2008-01-05 20:43:07 +00:00
Kari Salminen
d604f51d42 Implement unknown test command 19 (hopefully) properly and name it unofficially as the in.motion.using.mouse-command.
svn-id: r30251
2008-01-05 20:35:18 +00:00
Torbjörn Andersson
aa38a8eb96 Fixed regression that would cause ScummEngine_v80he to leak polygon slots at an
alarming rate.

svn-id: r30249
2008-01-05 17:43:33 +00:00
Paul Gilbert
6b5b4f8015 Fix to remove a tab character from the GPL header
svn-id: r30242
2008-01-05 12:55:22 +00:00
Paul Gilbert
2dcfa224e3 Removed tabs in front of GPL header
svn-id: r30241
2008-01-05 12:51:07 +00:00
Paul Gilbert
6eb64102a4 Fix to remove a tab character from the GPL header
svn-id: r30238
2008-01-05 12:45:14 +00:00
Paul Gilbert
62fdf1afa0 Changed room change code for an immediate transition when in EGA mode (which can't do fades)
svn-id: r30236
2008-01-05 12:09:24 +00:00
Paul Gilbert
705bd9236c Fix for popup menus to work in EGA mode
svn-id: r30234
2008-01-05 11:25:30 +00:00
Paul Gilbert
9e02b32220 Made standard EGA background colour a constant
svn-id: r30233
2008-01-05 11:24:37 +00:00
Paul Gilbert
735ea1eaaa Fix to show credits screen correctly in EGA mode
svn-id: r30232
2008-01-05 10:53:27 +00:00
Paul Gilbert
140d914c18 Brought waitForPress into line with other similar methods to not register control characters
svn-id: r30231
2008-01-05 10:38:50 +00:00
Paul Gilbert
13cb1e710f Fix to use correct EGA/VGA colour when displaying talk conversation options
svn-id: r30230
2008-01-05 10:37:36 +00:00
Paul Gilbert
2c86089264 Fix for showing the correct colour in the status line in EGA mode
svn-id: r30229
2008-01-05 10:36:36 +00:00
Paul Gilbert
65399321eb Added support for the EGA style menu
svn-id: r30228
2008-01-05 10:35:47 +00:00
Paul Gilbert
f5577f8470 Removed redundant parameters and clarified EGA and VGA specific definitions
svn-id: r30227
2008-01-05 10:35:22 +00:00
Paul Gilbert
10719d5a12 Added extra handling for EGA dialogs, and added formalised parameters/methods for text positioning
svn-id: r30226
2008-01-05 10:34:34 +00:00
Paul Gilbert
610880dc67 Corrected the RGB values generated for a given EGA palette index
svn-id: r30224
2008-01-05 07:20:26 +00:00
Nicola Mettifogo
b75d196e88 In revision 30221, the correct font wasn't selected in the character selection screen. Always ask things twice.
svn-id: r30222
2008-01-04 21:26:53 +00:00
Nicola Mettifogo
3e04d8b215 Fix for bug# 1729307. Fonts are now displayed with shadows when needed on Amiga. The correct font for intro screen has also been selected.
svn-id: r30221
2008-01-04 21:24:51 +00:00
Torbjörn Andersson
3451d1c30f Applied my alternative patch for feature request #1266599 ("BS1: Invert stereo
channels for traffic sounds in Rue Jarry"). Now let's see if it breaks any
other scenes. :-)

svn-id: r30220
2008-01-04 18:46:08 +00:00
Filippos Karapetis
063f7df4d3 Slight cleanup
svn-id: r30217
2008-01-04 13:34:38 +00:00
Kari Salminen
28bbae1745 Make AGIPAL also accept 'pal.100' (Original hacked interpreter also does this).
svn-id: r30213
2008-01-04 00:24:29 +00:00
Max Horn
a1503bf7c8 Fix another -Wuninitialized warnings - n could have been returned w/o having been set first
svn-id: r30211
2008-01-03 23:55:42 +00:00
Max Horn
67d14ed322 Silence a -Wuninitialized warning
svn-id: r30205
2008-01-03 23:36:55 +00:00
Filippos Karapetis
1411c9f3f1 Fix compilation
svn-id: r30204
2008-01-03 21:57:54 +00:00
Torbjörn Andersson
11efbda297 Made the Loom Roland music fix a bit more specific. Only one song in EGA Loom
is affected and, according to Kirben, none in Monkey Island 1 VGA. I don't know
about Monkey Island 1 EGA, but I've assumed it uses the same music as the VGA
versions.

svn-id: r30202
2008-01-03 19:43:43 +00:00
Johannes Schickel
9b4fc2f70b Resolve portabillity issues introduced with last commit.
svn-id: r30201
2008-01-03 15:20:33 +00:00
Johannes Schickel
fbcba1a573 - got rid of hardcoding "KYRA.DAT" in all places, where it's used
- now using "kyra.dat" rather than "KYRA.DAT"

svn-id: r30200
2008-01-03 14:53:18 +00:00
Johannes Schickel
58f0d4e632 Committed slightly modified patch #1862758 "KYRA: audio data assignment patch".
svn-id: r30198
2008-01-03 14:42:49 +00:00
Filippos Karapetis
2bb81e2d20 Properly fixed bug #1861863 - "ITE: Crash when using Eeah with Eeah"
svn-id: r30195
2008-01-03 10:42:18 +00:00
Kari Salminen
e75207d9d7 Made AGIPAL-loading more lenient with errors. Added AGIPAL-flag to Naturette 3. These together fix Naturette 3's intro (No more long shakings).
svn-id: r30193
2008-01-03 09:43:50 +00:00
Kari Salminen
0ddfc0a64e Fix for the Space Trek sprite duplication bug (#1659209). Makes commands position and position.v use coordinate clipping for Space Trek.
svn-id: r30190
2008-01-03 08:41:40 +00:00
Filippos Karapetis
6ed43e7505 Fix for bug #1861863 - "ITE: Crash when using Eeah with Eeah"
svn-id: r30181
2008-01-03 07:29:13 +00:00
Travis Howell
6c6a2a57b5 Fix endian issue in checkArrayLimits().
svn-id: r30178
2008-01-03 03:34:25 +00:00
Travis Howell
639929a09e Fix endian issue in redimArray.
svn-id: r30176
2008-01-03 03:20:32 +00:00
Paul Gilbert
9efa3a5ec3 Added MD5 for English EGA version
svn-id: r30175
2008-01-03 00:34:52 +00:00
Nicola Mettifogo
9bb72bf188 Fixed bug in Nippon Safes for Amiga, Italian version. Game now doesn't crash anymore when starting introduction.
svn-id: r30173
2008-01-02 22:06:49 +00:00
Nicola Mettifogo
b91300e1cc Fix for bug #1829409. Character now changes expression accordingly with available dialogue answers.
svn-id: r30171
2008-01-02 21:33:18 +00:00
Nicola Mettifogo
da3d85c755 Removed debug printf.
svn-id: r30169
2008-01-02 21:29:23 +00:00
Eugene Sandulenko
0f6246bab8 Fix for bug #896489: "DIG: Missing subtitles when talking to Brink"
svn-id: r30167
2008-01-02 21:15:23 +00:00
Kari Salminen
5e7cc8b2d9 Add GF_OLDAMIGAV20 game flag for correctly setting computer type (v20 i.e. vComputer) for particular old Amiga AGI games (Space Quest I v1.2 at the moment).
svn-id: r30164
2008-01-02 19:10:01 +00:00
Eugene Sandulenko
040a7b54fa Oops. Moved too much code in the last commit.
svn-id: r30162
2008-01-02 18:59:15 +00:00
Eugene Sandulenko
2d94049bea Workaround for bug #1804278: "MONKEY: Mouse is invisible after loading"
svn-id: r30160
2008-01-02 18:44:20 +00:00
Eugene Sandulenko
a4cbfa354b Fix bug #1846886: "PUTTZOO: Windows version cursor/pointer drawn wrong"
svn-id: r30154
2008-01-02 17:33:57 +00:00
Kari Salminen
6dfaaf3018 Set AGI's computer type variable (v20 i.e. vComputer) according to the used platform. Now using different values for IBM-PC, Atari ST, Amiga and Apple IIGS platforms.
svn-id: r30153
2008-01-02 16:36:47 +00:00
Eugene Sandulenko
082bed8898 Narrow fix for bug #1206994 only to FOA.
svn-id: r30149
2008-01-02 13:11:26 +00:00
Eugene Sandulenko
312346bdb4 Fix for bug #1206994: "FOA AMIGA: Black cursor and text in Dig Site"
svn-id: r30147
2008-01-02 12:58:18 +00:00
Paul Gilbert
b6f39fb8fb Adjusted the colour of the EGA cursors to match the original game
svn-id: r30146
2008-01-02 11:45:59 +00:00
Travis Howell
01c611385e Fix regression when skipping cutscenes in Maniac Mansion (C64).
svn-id: r30144
2008-01-02 11:25:17 +00:00
Paul Gilbert
977c9fb5f3 Enhanced cursor code to handle cursors in EGA mode
svn-id: r30143
2008-01-02 11:15:36 +00:00
Paul Gilbert
eff113c486 Fixed Palette constructor parameter to be uint16 rather than uint8
svn-id: r30142
2008-01-02 11:14:42 +00:00
Travis Howell
273ce5d924 Correct verbs names in German version of Maniac Mansion (C64).
svn-id: r30141
2008-01-02 11:11:09 +00:00
Paul Gilbert
3b658492f5 Fix to make EGA sprites appear correctly
svn-id: r30140
2008-01-02 07:14:02 +00:00
Paul Gilbert
b2d2bd6f2d Room backgrounds now display in EGA mode
svn-id: r30138
2008-01-02 03:36:19 +00:00
Kari Salminen
9db76278ef Set amount of free memory (v8 i.e. vFreePages) to maximum value (Also when loading a saved game!). Fixes Gold Rush's help screen and bible passage showing.
svn-id: r30136
2008-01-02 00:35:32 +00:00
Torbjörn Andersson
f72b094c69 When fixing the EGA Loom Roland music, I accidentally broke music looping.
Should be fixed again now.

svn-id: r30135
2008-01-02 00:08:27 +00:00
Torbjörn Andersson
46368eac5f Added what I hope is the proper fix for bug #1498785 ("LOOM: Unknown Roland
MIDI music events"). It would probably be safe to commit to the 0.11 branch,
but I don't know for sure which games would be affected other than EGA Loom.

svn-id: r30132
2008-01-01 23:30:29 +00:00
Paul Gilbert
86aeae4a74 Bugfix to show the final text screen correctly in EGA mode
svn-id: r30131
2008-01-01 22:55:54 +00:00
Max Horn
f4f963800d Fix a long standing bug in playComiMusic (no idea whether this caused any bugs, though)
svn-id: r30128
2008-01-01 18:08:12 +00:00
Eugene Sandulenko
7aadf6c191 Slightly modified patch #1848173: "ScriptVars class implementation for CinE"
svn-id: r30125
2008-01-01 16:57:03 +00:00
Eugene Sandulenko
23313cb82e Patch #1733017: "SWORD1: Possible patch for bug #1730183"
svn-id: r30124
2008-01-01 16:42:05 +00:00
Eugene Sandulenko
308b02f4ca Fix for bug #1766072: MANIACNES: Music Doesn't Start On Load Game
svn-id: r30122
2008-01-01 16:26:04 +00:00
Eugene Sandulenko
e5e53a0017 Split out charset font data for easier maintenance
svn-id: r30121
2008-01-01 15:36:50 +00:00
Eugene Sandulenko
43a18a4cdd Fix bug #1811732: "MANIAC C64: German version not supported"
svn-id: r30119
2008-01-01 15:25:12 +00:00
Paweł Kołodziejski
604bf6fff3 experimental change to fade out to 120 ms instead from table for state music with opcode 3 when few songs have the same attribute value
svn-id: r30118
2008-01-01 15:08:20 +00:00
Paweł Kołodziejski
cd84daf7f8 experimental change to prevent play first region with fade out if jump opcode is attached
svn-id: r30117
2008-01-01 15:05:27 +00:00
Paul Gilbert
79a9074548 Added support for the EGA introduction sequence
svn-id: r30116
2008-01-01 13:00:47 +00:00
Paul Gilbert
4308e6ab10 Added EGA related constants
svn-id: r30115
2008-01-01 12:59:40 +00:00
Paul Gilbert
e3c60fea4e Extended PaletteCollection class to handle EGA palettes
svn-id: r30114
2008-01-01 12:58:50 +00:00
Paul Gilbert
87ed2bf0cb Extended animation class to handle EGA animations
svn-id: r30113
2008-01-01 12:58:04 +00:00
Max Horn
0ad70c7d84 SCUMM: Moved tick duration into a constant
svn-id: r30112
2008-01-01 11:41:47 +00:00
Max Horn
305f60e0db Patch #1839861 (Possible workaround for bugs related to cloneToFadeOutTrack): Fixes bug #1848399 and apparently also #1527274 & #1763227
svn-id: r30111
2008-01-01 11:27:29 +00:00
Filippos Karapetis
a8d3967f63 Fix for bug #1861126 - "IHNM: Crash when Gorrister cuts sheet in the mooring ring"
svn-id: r30109
2007-12-31 22:45:30 +00:00
Max Horn
be11104d70 Removed obsolete _insaneRunning flag
svn-id: r30107
2007-12-31 16:34:30 +00:00
Eugene Sandulenko
b87b0f21f0 Used new AdvancedDetector flag to distinguish between EGA and VGA versions
of italian Lure when their datafiles sit in same directory.

svn-id: r30106
2007-12-31 14:46:37 +00:00
Paul Gilbert
10686b04ab Bugfix to data position start in vga decoder, and made ega/vga decoder methods public visibility
svn-id: r30104
2007-12-31 13:37:14 +00:00
Paweł Kołodziejski
08020444f6 verified differences in play music code of the dig and comi
svn-id: r30103
2007-12-31 13:26:29 +00:00
Max Horn
a826cd36dd cleanup
svn-id: r30102
2007-12-31 13:05:32 +00:00
Paul Gilbert
1804ae6639 Added code to handle EGA title screens being immediately shown rather than faded in
svn-id: r30098
2007-12-31 05:59:58 +00:00
Paul Gilbert
1dd2e32fc0 Added extra palette handling for EGA palettes
svn-id: r30097
2007-12-31 05:58:22 +00:00
Paul Gilbert
ccc822fd1c Added support for decoding EGA screens
svn-id: r30096
2007-12-31 05:57:11 +00:00
Paul Gilbert
abd3f45359 Added code to support reading .ega files
svn-id: r30095
2007-12-31 05:56:22 +00:00
Paul Gilbert
d45fe1e37e Added detection for Italian EGA version
svn-id: r30094
2007-12-31 05:55:20 +00:00
Oystein Eftevaag
1c88ab2c47 Enabling the SMUSH/sound ARM optimizations for the iPhone. Converting any numerical expressions in the asm to absolute values (moving the expression to comments) since the iPhone assembler can't handle them, and prepending an underscore to the exported symbols (with some preprocessor magic similar to the hq3x asm for handle ports where it's not needed)
svn-id: r30093
2007-12-31 01:50:18 +00:00
Torbjörn Andersson
a38fa007bb I thought only Full Throttle used the VAR_BLAST_ABOVE_TEXT variable, but I see
now that it's defined for v8 games as well, so call processUpperActors() from
that case too, just to be safe.

svn-id: r30091
2007-12-31 01:20:24 +00:00
Torbjörn Andersson
41f29f0504 Draw subtitles over the verb coin in CoMI, not under. This is noticeable early
in the game, when Murray is talking to himself. I've verified this against the
behaviour of the original interpreter. (Should this go into 0.11 as well?)

svn-id: r30088
2007-12-30 22:22:38 +00:00
Max Horn
1489235f8e Ooops, this was not supposed to be commited
svn-id: r30087
2007-12-30 22:10:24 +00:00
Max Horn
2d61551e1c atrib -> attrib; added some FIXME comments
svn-id: r30086
2007-12-30 21:59:50 +00:00
Max Horn
3d46219592 Patch #1689516: BASS: Update the cursor when right-clicking in inventory
svn-id: r30085
2007-12-30 17:58:22 +00:00
Max Horn
b9a5e9ea0e Fix for bug #1635361: COMI: Music fade-out broken for compressed audio
svn-id: r30081
2007-12-30 16:32:30 +00:00
Paul Gilbert
2c5ae92b4c Added ability for both middle and right mouse buttons to abort a conversation when waiting for user to select a conversation option from a list of topics
svn-id: r30071
2007-12-29 10:38:30 +00:00
Paul Gilbert
99dfb8bcbc Added support for using scroll wheel for making selections in the Save/Restore dialog and action lists
svn-id: r30070
2007-12-29 09:51:25 +00:00
Paul Gilbert
59b5655266 Added access property for middle mouse button
svn-id: r30069
2007-12-29 09:50:20 +00:00
Paul Gilbert
a54f9c311a Fix to ensure any active conversation data or selected hotspot is cleared when restoring or restarting a game
svn-id: r30066
2007-12-29 04:25:26 +00:00
Paul Gilbert
52dc147f8c Added mouse scrolling support to action menus and the save/restore dialog
svn-id: r30065
2007-12-29 00:31:15 +00:00
Paul Gilbert
16b610068d Fix for correct dialog sequence when giving an object to an arbitrary NPC
svn-id: r30063
2007-12-28 22:56:22 +00:00
Travis Howell
a9813fbdfa Add another German version of Freddi Fish 2 (Windows).
svn-id: r30054
2007-12-28 12:07:10 +00:00
Paul Gilbert
4d7e49ddb8 Fix to prevent the F5 key allowing the game to be saved during player conversations or viewing a remote room
svn-id: r30048
2007-12-28 11:07:35 +00:00