Commit Graph

3821 Commits

Author SHA1 Message Date
Max Horn
f1ee3c0163 let compiler optimize code better <g>
svn-id: r13458
2004-04-04 17:56:30 +00:00
Max Horn
55bbd875db Exit quietly if we just told the user we are going to exit; no need to call error() (which pops up the console etc.)
svn-id: r13456
2004-04-04 12:36:50 +00:00
Max Horn
e3e9ba99ee Fix for bug #885466 (FT: Text gets drawn under moving bits), by making AKOS codec 16 honor the charset mask
svn-id: r13455
2004-04-04 01:11:27 +00:00
Max Horn
a4e424a4fe got rid of _msgPtrToAdd; slightly improved error checking in addMessageToStack()
svn-id: r13454
2004-04-04 00:29:13 +00:00
Max Horn
a2413dad38 Fix for bugs #915586, #905856, part of bug #766749 (COMI: Bug with text being printed on the edge of the screen)
svn-id: r13452
2004-04-03 23:44:06 +00:00
Max Horn
3f2fc3e8be cleanup
svn-id: r13450
2004-04-03 22:52:36 +00:00
Max Horn
90dd9af577 fixed hypothetical off-by-one error when computing _draw_bottom (a semantical problem: _draw_bottom is supposed to be the bottom most pixel which is actually drawn; in the other case, it's top+height, i.e. one pixel *below* that last drawn pixel row. In addition, some cleanup
svn-id: r13449
2004-04-03 20:56:19 +00:00
Max Horn
6aa6b49ed5 cleanup StringTab stuff
svn-id: r13448
2004-04-03 19:41:31 +00:00
Max Horn
330cf43383 Fix for bug #896844 (DIG: Missing subtitle at the lab console)
svn-id: r13446
2004-04-03 13:16:02 +00:00
Max Horn
3ae3eccac8 cleanup
svn-id: r13444
2004-04-03 00:56:55 +00:00
Max Horn
a47793c8e0 oops
svn-id: r13443
2004-04-02 22:01:25 +00:00
Max Horn
4a41973804 Got rid of _transText
svn-id: r13442
2004-04-02 21:56:27 +00:00
Max Horn
15aa7c3343 cleanup
svn-id: r13441
2004-04-02 21:55:30 +00:00
Max Horn
67c6df86d4 Remove obsolete code fragment (a good sign for a refactoring is if it allows you to remove crufty hacks you didn't even think of :-)
svn-id: r13440
2004-04-02 21:51:56 +00:00
Max Horn
a16a86d90f simplify code by integrating a call to translateText() into addMessageToStack(); improved translateText() further
svn-id: r13438
2004-04-02 21:42:42 +00:00
Max Horn
d25da64937 Shouldn't be necessary to do a second translation run in this place (at least I couldn't find any place were it is)
svn-id: r13437
2004-04-02 20:35:04 +00:00
Max Horn
15922a5e61 Added support for %___ strings (used in localized version of The Dig)
svn-id: r13436
2004-04-02 20:31:39 +00:00
Max Horn
933aab3100 Use vsprintf instead of vsnprintf: more portable, less safe (but then again, vsnprinft isn't that safe either)
svn-id: r13434
2004-03-30 22:56:57 +00:00
Paweł Kołodziejski
70545f2c01 please fix
svn-id: r13433
2004-03-30 07:11:01 +00:00
Jonathan Gray
f12fbe1723 clean up FMUS handling, fix not being able to enable sound debug messages
svn-id: r13425
2004-03-29 11:02:45 +00:00
Travis Howell
ce7239115b Should have been disabled for Mac. indy3/loom.
Fixes distaff position

svn-id: r13423
2004-03-29 07:12:14 +00:00
Max Horn
f5f3ee903d Fix for bug #907174 (LOOM MAC: Crash after entering copy protection)
svn-id: r13420
2004-03-28 23:02:03 +00:00
Max Horn
0e36493349 Proper copy-protection bypass for Mac Loom (still crashes when entering the right code, though)
svn-id: r13419
2004-03-28 22:06:38 +00:00
Max Horn
39765b0d19 Remove explicit OSystem parameter from StackLock constructor; added OSystem::displayMessageOnOSD (not yet used; default implementation provided)
svn-id: r13413
2004-03-28 20:31:18 +00:00
Max Horn
14378cb56e Renamed more OSystem methods
svn-id: r13410
2004-03-28 16:30:50 +00:00
Torbjörn Andersson
0fb1d56589 Format string fix.
svn-id: r13408
2004-03-28 15:04:48 +00:00
Torbjörn Andersson
165e6c5eb5 Fixed format string to match the number of arguments.
svn-id: r13404
2004-03-28 14:48:05 +00:00
Max Horn
a06c097408 rename displayError() to displayMessage(); fix slightly incorrect usage of that method
svn-id: r13402
2004-03-28 13:28:44 +00:00
Max Horn
da400a38ed Small tweaks for MIPSPro compiler
svn-id: r13397
2004-03-28 13:02:28 +00:00
Max Horn
ce6e07db12 Fix bad array size (part of bug report #924685)
svn-id: r13394
2004-03-28 10:55:32 +00:00
Paweł Kołodziejski
fdd44a242d forgot them
svn-id: r13393
2004-03-27 20:55:26 +00:00
Paweł Kołodziejski
7041ba3568 implemented priorites for imuse sounds
svn-id: r13392
2004-03-27 20:26:25 +00:00
Paweł Kołodziejski
0974887290 cleanup, and fix bug in table
svn-id: r13389
2004-03-27 18:12:18 +00:00
Paweł Kołodziejski
f6d131f6c6 some changes to imuse digital
svn-id: r13387
2004-03-27 17:03:42 +00:00
Max Horn
2c327348a6 Added some new MD5s
svn-id: r13379
2004-03-25 11:22:02 +00:00
Paweł Kołodziejski
dbf56846c9 changed a little hook id code
svn-id: r13374
2004-03-23 22:51:44 +00:00
Paweł Kołodziejski
e2a5b67e42 fixed fade out delay
svn-id: r13373
2004-03-23 21:42:47 +00:00
Travis Howell
e1a1f291aa Move HE games together.
svn-id: r13370
2004-03-23 03:33:23 +00:00
Travis Howell
07770f58e9 Alter some HE games settings
svn-id: r13369
2004-03-23 01:59:02 +00:00
Max Horn
6a1532772a Revamped COMI/DIG speech decoding (this my cause regressions, watch out). Goal was to streamline code logic, and get rid of a FIXME
svn-id: r13347
2004-03-19 23:19:57 +00:00
Max Horn
c3c1dc176f addMessageToStack doesn't have to return anything anymore
svn-id: r13346
2004-03-19 19:40:34 +00:00
Max Horn
791696a9a3 turn down verbosity
svn-id: r13345
2004-03-19 17:58:47 +00:00
Max Horn
faa12496e4 Fix for bug #893254 (MI1VGA: Changes in object names are not saved); this may introduce regressions, please report them (overall, this is a neat patch, it removes so many ugly hacks :-)
svn-id: r13325
2004-03-17 01:50:15 +00:00
Max Horn
fd52b3a3c0 Patch #917503: Remove stray semicolons
svn-id: r13319
2004-03-16 23:51:41 +00:00
Travis Howell
d3826bfe79 Increase channel for Amiga V3 player.
svn-id: r13315
2004-03-16 07:02:21 +00:00
Max Horn
ff17962df5 cleanup
svn-id: r13312
2004-03-15 21:48:54 +00:00
Travis Howell
538e9a36ed Ooops
svn-id: r13303
2004-03-15 04:00:00 +00:00
Max Horn
af96fecb5d turn illegal SCUMM var access into an error
svn-id: r13302
2004-03-15 03:36:18 +00:00
Max Horn
e2617f90a1 disambiguate the two talkingActor() methods (one was a getter, one a setter -- reflect that in the name)
svn-id: r13301
2004-03-15 03:33:08 +00:00
Max Horn
ac11c62312 clearMsgQueue now just is a synonym for stopTalk -> remove it
svn-id: r13300
2004-03-15 03:24:29 +00:00
Max Horn
e1b25fb721 After the refactoring it's clearly that _messagePtr can be removed. Hooray, yet another obscure global 'parameter' gone :-)
svn-id: r13299
2004-03-15 03:22:36 +00:00
Max Horn
ba5aa37dcc refactor use of _messagePtr -> instead of using it as an implicit parameter for various methods, pass its value explicitly to those methods. Note: this *should* be just a code transformation, with no change to the program logic - unless I messed up once again <sigh>
svn-id: r13298
2004-03-15 03:09:48 +00:00
Max Horn
deb96003a2 Aaargh, didn't mean to commit this...
svn-id: r13296
2004-03-15 02:28:47 +00:00
Max Horn
782dabbcd3 ...and mor. Next big thing should be to document the overlay stuff, but that'll have to wait till after I slept :-)
svn-id: r13295
2004-03-15 02:21:04 +00:00
Paweł Kołodziejski
f2f6c75ba5 fix for voice bundle bug in german version comi
svn-id: r13260
2004-03-13 17:41:36 +00:00
James Brown
7000cb00e4 Forward-port maniac hack :)
svn-id: r13242
2004-03-13 12:55:40 +00:00
James Brown
6a155e028e Backport blee
svn-id: r13228
2004-03-11 04:13:22 +00:00
Max Horn
e448c1dfe4 renamed scumm/scummvm.cpp to scumm/scumm.cpp
svn-id: r13207
2004-03-07 03:34:09 +00:00
Jochen Hoenicke
e609820a5b Clear all channel variables in clear_channel
svn-id: r13203
2004-03-05 14:35:16 +00:00
Jochen Hoenicke
270c5cec52 Initialize _random_lsr to avoid valgrind warnings
svn-id: r13202
2004-03-05 14:34:39 +00:00
Torbjörn Andersson
bec9e69e42 We already know the Sam & Max screensavers trigger these assertions so
until someone figures out exactly what to do, let's do something less
drastic. Now if someone requests a pixel outside the known screen, assume
that pixel has colour 0.

svn-id: r13200
2004-03-05 11:08:29 +00:00
Eugene Sandulenko
00bf09fe07 Add maniac enchanced demo md5
svn-id: r13176
2004-03-04 05:02:47 +00:00
Eugene Sandulenko
b730376148 Add Russian Freddi HE md5's
svn-id: r13175
2004-03-04 04:46:04 +00:00
Travis Howell
fb1e289215 Add hack for demo script in maniac (Enchanced)
svn-id: r13174
2004-03-04 03:08:42 +00:00
Travis Howell
2f60f4485d Allow --demo-mode with maniac (Enchanced)
svn-id: r13173
2004-03-04 02:47:39 +00:00
Max Horn
ad820d7893 unsigned ints are always >= 0 (fix warnings)
svn-id: r13167
2004-03-03 10:56:46 +00:00
Travis Howell
306d16441e Add back HE sound differences for AKOS.
Remove old define
Avoid crash if using demo script in maniac (Enchanced)

svn-id: r13166
2004-03-03 08:17:21 +00:00
Travis Howell
5feaf410c8 That should have been maniac specific.
svn-id: r13163
2004-03-03 03:14:22 +00:00
Travis Howell
84cb720df5 Adjustments for Enchanced Maniac Mansion demo.
svn-id: r13161
2004-03-03 02:53:12 +00:00
Travis Howell
a79a0647d7 Adjustments for Enchanced Maniac Mansion demo.
svn-id: r13160
2004-03-03 02:42:51 +00:00
Paweł Kołodziejski
bb97464292 cleanup. soundlist originaly is shifted and started at 1 not as in scummvm at 0, match as rest of scummvm code : start at 0
svn-id: r13157
2004-03-02 21:55:14 +00:00
Paweł Kołodziejski
41e6bba009 synced local imuse. many bug fixes, and few new bugs :)
svn-id: r13153
2004-03-02 20:35:48 +00:00
Chris Apers
b088395e56 640x480 games not supported on PalmOS
svn-id: r13145
2004-03-02 13:09:35 +00:00
Travis Howell
65a50b800a Not 640 x 480 until HE7
svn-id: r13142
2004-03-02 10:37:51 +00:00
Travis Howell
7ad1d09f0a Not DOS specific anymore.
svn-id: r13141
2004-03-02 10:26:07 +00:00
Travis Howell
6d0e10433c Move to HE6
svn-id: r13140
2004-03-02 10:22:55 +00:00
Travis Howell
ca85e8d51d Ooops, just move everyting used by HE6 to HE6.
svn-id: r13137
2004-03-02 06:42:22 +00:00
Travis Howell
f80d6a7a26 Divide up some code for HE6 and HE7
svn-id: r13136
2004-03-02 06:19:26 +00:00
Travis Howell
5fbc3497c1 Avoid duplicate targets
svn-id: r13135
2004-03-02 06:04:38 +00:00
Eugene Sandulenko
2f65abff2f Implemented more HE opcode stringLen and added stub for opcode F4
svn-id: r13134
2004-03-02 04:11:57 +00:00
Travis Howell
0e3a8f3190 Update HE games list
Keep games divded by versions

svn-id: r13133
2004-03-02 04:05:40 +00:00
Travis Howell
0c4ddc32fc Exclude some var settings for HE7
svn-id: r13132
2004-03-02 02:12:30 +00:00
Travis Howell
b123197dc1 Remove fixme
svn-id: r13131
2004-03-02 01:28:32 +00:00
Travis Howell
5a3b17de54 Add better check for HE resource differences.
Move stringLen to HE7.

svn-id: r13130
2004-03-02 01:20:18 +00:00
Eugene Sandulenko
4accb5b006 Make use of GF_WINDOWS in HE games
svn-id: r13129
2004-03-02 01:01:36 +00:00
Eugene Sandulenko
3ca5007779 Introduced new platform GF_WINDOWS. Used for HE games. GF_PC is DOS
svn-id: r13128
2004-03-02 00:37:23 +00:00
Eugene Sandulenko
c84ad5e0d4 oops
svn-id: r13127
2004-03-02 00:23:25 +00:00
Eugene Sandulenko
dd3683f7e7 Implemented some HE specific opcodes
Added some HE GIDs

svn-id: r13126
2004-03-02 00:21:02 +00:00
Eugene Sandulenko
581e8f515a Update comment on runInventoryScript() argument in setOwnerOf().
svn-id: r13125
2004-03-01 21:36:15 +00:00
Torbjörn Andersson
e67aaba0c3 Got rid of the Sam & Max inventory hack. This fixes at least one aspect of
bug #907113. See also bug #493153 for the origins of the hack.

It would be very nice if we could get this fix into 0.6.0 as well, because
bug #907113 crashes ScummVM for reasons which escape me. But someone will
have to verify that the fix is correct first. Pretty please...?

svn-id: r13124
2004-03-01 16:07:16 +00:00
Jonathan Gray
fa625ce1be default to 1x for all of the active hev7 targets
svn-id: r13121
2004-03-01 08:08:42 +00:00
Travis Howell
d924893435 Enable some HE target to test with.
svn-id: r13116
2004-03-01 07:21:47 +00:00
Travis Howell
15c3202623 Add stub
svn-id: r13115
2004-03-01 07:06:36 +00:00
Travis Howell
db22318d61 Correct target
svn-id: r13114
2004-03-01 06:53:50 +00:00
Travis Howell
439b0b3859 Remove double check, all later games are 640 x 480.
svn-id: r13113
2004-03-01 06:45:24 +00:00
Eugene Sandulenko
a868e1d464 HE V7 games are 640x480. Now game forwards much further. Still no graphics, though.
svn-id: r13112
2004-03-01 06:38:26 +00:00
Travis Howell
f1c86bc86f HE7 resolution is 640 x 480.
svn-id: r13111
2004-03-01 06:31:06 +00:00
Travis Howell
6f214f3a9f Add HE7 vars
svn-id: r13110
2004-03-01 06:25:01 +00:00
Eugene Sandulenko
d7f9be12fe Move decodeParseString to script_v7he.cpp where it really belongs to.
svn-id: r13109
2004-03-01 06:23:25 +00:00
Eugene Sandulenko
9e894f6bf3 Started work on Freddi Fish. Since it is SPU version 7, added new class.
Implemented some SPUv7 specific opcodes

svn-id: r13108
2004-03-01 05:57:30 +00:00
Travis Howell
267a96ba4f HE games specific
svn-id: r13105
2004-03-01 02:55:08 +00:00
Travis Howell
807bc5e0fa Correct incorrect smush filename in Macintosh FT demo
svn-id: r13098
2004-02-29 13:43:08 +00:00
Travis Howell
5153499a0e Enable insane subtitles in Mac. version of FT demo
svn-id: r13094
2004-02-29 01:13:08 +00:00
Jonathan Gray
680160407b add support for the standalone maniac mansion demo
svn-id: r13090
2004-02-29 00:18:45 +00:00
Max Horn
c6752cccf5 renamed more OSystem methods to follow our naming scheme; renamed NewGuiColor to OverlayColor; fixed some calls to error() in the SDL backend
svn-id: r13087
2004-02-28 12:58:13 +00:00
Eugene Sandulenko
ec45e8dd81 Correct Mac fbear MD5
Remove slipped in spaces in some MD5's. Don't know either it prevented them
from being detected but anyway that's potential bug

svn-id: r13077
2004-02-28 00:22:14 +00:00
Eugene Sandulenko
c8811a3df6 Add reported MD5's
svn-id: r13072
2004-02-27 23:30:37 +00:00
Travis Howell
bfd65070c5 Don't reamp F1 in COMI demo
svn-id: r13067
2004-02-27 05:51:04 +00:00
Torbjörn Andersson
5c7c6ca2a3 Work around music glitch in Monkey Island 2:
In the scene where Largo is speaking to Mad Marty, the Woodtick music often
resumes way before Largo's theme has finished. With this workaround, it
waits until Largo's theme has definitely finished before starting the
Woodtick music again.

I wouldn't have done it this way if I hadn't been almost positive that it's
a script bug, rather than an iMUSE bug.

svn-id: r13061
2004-02-26 07:31:48 +00:00
Travis Howell
fbb6106514 Restrict hack
svn-id: r13059
2004-02-26 03:13:20 +00:00
Travis Howell
e495eea19f Disable var setting which could cause possible script issues.
Update comment

svn-id: r13053
2004-02-25 14:01:46 +00:00
Travis Howell
793bc427de Fix VAR_VOICE_MODE in COMI
svn-id: r13051
2004-02-25 10:48:35 +00:00
Max Horn
d158280425 the OSystem changes we discussed on the ML (note: renaming of the existing OSystem API is not yet finished); porters will have to fix their ports to get them to compile again
svn-id: r13036
2004-02-24 22:39:42 +00:00
Travis Howell
b52ef6463b COMI uses VAR_CHARINC in reverse, so adjust readvar.
svn-id: r13025
2004-02-24 14:29:56 +00:00
Travis Howell
43cab33e98 Remove warnings, they were dummy warnings in originals.
svn-id: r13024
2004-02-24 13:59:29 +00:00
Travis Howell
6bb7c78276 Reset more for a restart and avoid some code duplication.
svn-id: r13022
2004-02-24 10:52:40 +00:00
Travis Howell
b80a9a2a37 Add case for 3do version.
svn-id: r13020
2004-02-24 05:14:00 +00:00
Travis Howell
3586e77e1c Add case for 3do versions.
svn-id: r13018
2004-02-24 05:03:06 +00:00
Travis Howell
e68e003777 Minor correction
svn-id: r13015
2004-02-24 04:51:02 +00:00
Eugene Sandulenko
4117781522 Graphics decoders for 3DO HE titles. Preliminary implementation, don't
blame me :) After testing I'll convert it to C.

svn-id: r13014
2004-02-24 04:45:50 +00:00
Travis Howell
e5392aa12c Removeout dated fixme (No reports of asserts in minefield)
svn-id: r13013
2004-02-24 01:50:13 +00:00
Travis Howell
10f95809ab Rename a few opcodes
svn-id: r13011
2004-02-24 00:43:01 +00:00
Travis Howell
b2f6ed6f23 Add back hack
svn-id: r13007
2004-02-23 11:15:03 +00:00
Max Horn
179ad3b845 the code was still wrong
svn-id: r13005
2004-02-23 09:21:22 +00:00
Eugene Sandulenko
1b82caa912 Add HE specific modifications to readArray and writeArray. That fixes
those crashes

svn-id: r13004
2004-02-23 05:38:20 +00:00
Eugene Sandulenko
a2ea28b56f Proper implementation of readFile, writeFile and redimArray.
HE specific fixes to defineArray.

Now many things started to work in HE games.

svn-id: r13003
2004-02-23 04:01:39 +00:00
Eugene Sandulenko
ab72dadbff Fix o6_readFile. Now it works
svn-id: r13002
2004-02-23 02:51:34 +00:00
Eugene Sandulenko
f878140895 o Add GID_FBEARPACK, previously for target fbpack GID_FBEAR was used, but there
were fbear-specific modifications which didn't apply to it. Hence another GID.
o seekFile and tellFile are enabled

svn-id: r13001
2004-02-23 02:07:56 +00:00
Travis Howell
02eab2641d Ooops, missed a call.
svn-id: r13000
2004-02-23 01:10:05 +00:00
Eugene Sandulenko
6588b17469 Added missing HE opcode (0xEB tellFile)
svn-id: r12999
2004-02-23 00:59:34 +00:00
Max Horn
9d5dace366 whitespaces
svn-id: r12998
2004-02-22 21:02:06 +00:00
Travis Howell
3fb6d8e63d Is used in maniac and zak.
svn-id: r12992
2004-02-22 16:31:12 +00:00
Travis Howell
244d19523f Correct extra slow subtitles in zak/maniac with old saves.
svn-id: r12991
2004-02-22 16:15:49 +00:00
Travis Howell
371cfa810f This should fix zak lotto bug correctly.
svn-id: r12989
2004-02-22 16:08:13 +00:00
Travis Howell
16b7122008 Code is required, according to disasm.
svn-id: r12987
2004-02-22 15:00:49 +00:00
Travis Howell
c689416ecc Only comi is different
svn-id: r12986
2004-02-22 14:48:13 +00:00
Travis Howell
aa8cfba102 Original comi doesn't check value at all
svn-id: r12985
2004-02-22 14:42:06 +00:00
Max Horn
aa6ec62e9d Patch #885904 (Flac Support) with some tweaks by me
svn-id: r12984
2004-02-22 14:11:16 +00:00
Travis Howell
6db3a8819e VAR confirmed awhile ago.
svn-id: r12983
2004-02-22 08:18:28 +00:00
Travis Howell
36e9979303 Restrict hack to COMI
svn-id: r12981
2004-02-22 08:02:56 +00:00
Travis Howell
8a8bbbf80f Missed one spot.
svn-id: r12980
2004-02-22 07:14:48 +00:00
Travis Howell
42028e984f Enable and use VAR_VOICE_MODE
svn-id: r12979
2004-02-22 03:08:18 +00:00
Eugene Sandulenko
ff93447108 Remove duplicated indy3 MD5's. If fr and es version do have different
MD5, it's better to add them later.

svn-id: r12978
2004-02-22 00:49:38 +00:00
Travis Howell
1831d71ed3 Ooops, didn't meant to revert
svn-id: r12968
2004-02-21 15:12:46 +00:00
Travis Howell
099bd2cb47 This is normal for earlier games
svn-id: r12967
2004-02-21 15:08:36 +00:00
Travis Howell
d669bb7028 Add comment
svn-id: r12966
2004-02-21 13:17:35 +00:00
Travis Howell
30fd4d66ac Add var
svn-id: r12965
2004-02-21 13:10:44 +00:00
Travis Howell
745b219596 Add vars
svn-id: r12964
2004-02-21 12:53:59 +00:00
Travis Howell
42a94ca017 Ooops
svn-id: r12963
2004-02-21 11:41:46 +00:00
Travis Howell
580a2ffcfe Add a few more actor inits. for later games.
svn-id: r12962
2004-02-21 11:37:52 +00:00