Commit Graph

5556 Commits

Author SHA1 Message Date
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