201 Commits

Author SHA1 Message Date
Travis Howell
be7a28f65e Avoid all scumm var conflicts in C64 maniac
svn-id: r21277
2006-03-14 12:06:37 +00:00
Travis Howell
806ee522d1 Move unused scumm vars in C64 maniac to safe position, to prevent conflicts for now
svn-id: r21276
2006-03-14 10:35:01 +00:00
Travis Howell
f6d69c6d45 Camera scrolling only effects subtitles in SCUMM4-6 games. Fixes bug #1329482.
svn-id: r21274
2006-03-14 09:33:37 +00:00
Travis Howell
c196543572 Fix regression in C64 zak, script 5 was not been run when room changed
svn-id: r21273
2006-03-14 07:45:46 +00:00
Eugene Sandulenko
a483083f35 Tweaked a little scumm main dialog and scumm save/load dialog. Still plenty
to do.

svn-id: r21271
2006-03-14 03:52:29 +00:00
Travis Howell
c6082389a2 Confirmed it is safe to remove workaround for Macintosh HE99 version of water.
svn-id: r21253
2006-03-13 10:00:10 +00:00
Travis Howell
8f8d7b6e07 Add opcode difference in setObjectName opcode for C64 maniac
svn-id: r21251
2006-03-13 07:46:54 +00:00
Travis Howell
06dddefe90 Add masking support for C64 maniac, not perfect
svn-id: r21250
2006-03-13 06:06:51 +00:00
Travis Howell
833e343059 Fix object glitches in C64 maniac
svn-id: r21249
2006-03-13 03:52:26 +00:00
Travis Howell
d0f834ee40 Update and restore old debug code for masking
svn-id: r21248
2006-03-13 02:22:22 +00:00
Torbjörn Andersson
165265166b Updated for Jamieson630's latest iMUSE changes.
svn-id: r21242
2006-03-12 18:46:33 +00:00
Jamieson Christian
4d5a3e4c45 IMuse SysEx processing now handled by client-specified callbacks. This removes all game-specific references from the Player class. Bloodshed Dev-C++ project file updated.
svn-id: r21241
2006-03-12 18:06:22 +00:00
Travis Howell
230a68755e Unfortunately the workaround for Macintosh version of water is still required.
svn-id: r21231
2006-03-12 10:56:14 +00:00
Travis Howell
fd389260f8 Adjust basename array setting in HE99+ games, for filename substitution
svn-id: r21229
2006-03-12 10:44:42 +00:00
Travis Howell
e94aa88ece Adjust version setting for Macintosh versions of HE80+ games, which is checked by water
svn-id: r21228
2006-03-12 09:51:24 +00:00
Travis Howell
66730f3b6b Use script support for Macintosh versions of HE80+ games
svn-id: r21227
2006-03-12 09:27:56 +00:00
Travis Howell
8602fe7432 Revert mistaken commit of local debug code
svn-id: r21222
2006-03-12 04:19:03 +00:00
Travis Howell
3e72b26adc Revert mistaken commit of local debug code
svn-id: r21220
2006-03-12 01:06:23 +00:00
Travis Howell
f9797f3ac3 Correct mistake in md5 tables for Simon the Sorcerer 2 (DOS Floppy)
svn-id: r21219
2006-03-12 00:53:30 +00:00
Travis Howell
beb0c9e297 Fix endian issue in getArrayDim()
svn-id: r21216
2006-03-11 09:43:00 +00:00
Torbjörn Andersson
985ab14c79 Removed inclusion of non-existing imuse_sysex.h to make ScummVM compile again.
svn-id: r21214
2006-03-11 07:37:09 +00:00
Jamieson Christian
2708fe34f3 Another ScummEngine reference in IMuse bites the dust.
svn-id: r21213
2006-03-11 01:06:30 +00:00
Travis Howell
d5066f3741 Remove unused case in o5_actorOps, which is never triggered by any game scripts
svn-id: r21212
2006-03-10 23:15:05 +00:00
Travis Howell
f52e1709bf o6_setObjectName is never used by HE72+ games
svn-id: r21211
2006-03-10 23:09:27 +00:00
Eugene Sandulenko
3521d35085 Add Russian puttrace and pajama3
svn-id: r21209
2006-03-10 19:35:35 +00:00
Travis Howell
259e3cf301 Adjust talk sound check in CHARSET_1(), since processSfxQueues() doesn't exist in HE games. Fixes glitch when time machine is used in putttime.
svn-id: r21195
2006-03-10 06:05:49 +00:00
Travis Howell
de1cd95927 Revert that mistaken change to English verb table for C64 maniac
svn-id: r21191
2006-03-10 00:53:09 +00:00
Travis Howell
e0a4add194 Update German verbs for C64 maniac, to match original
svn-id: r21190
2006-03-10 00:39:37 +00:00
Max Horn
46ee5c8f26 Added new method DetectedGame::updateDesc, to ease generation of uniform description strings
svn-id: r21166
2006-03-09 12:52:10 +00:00
Eugene Sandulenko
8a5f44d797 Converted last dialogs to new scheme. Now it seems to be everything. Please,
test throghoutly.

svn-id: r21157
2006-03-09 05:18:00 +00:00
Jamieson Christian
effed85448 Implemented SysEx command 1 for non-S&M SCUMM games, per the latest comment on Bug 1088045.
svn-id: r21156
2006-03-09 03:29:12 +00:00
Max Horn
ea26ccea4a Add the known 'extra' info to the description string; and removed the old hack which added this information during launch (which really was a bad hack)
svn-id: r21155
2006-03-09 03:21:23 +00:00
Max Horn
e53e0e5885 - Removed the code from the launcher that adds language/platform to the
game descriptions. Doing this now is the responsibility of the engines.
- Adapted the SCUMM engine to add lang/platform to the desc string if 
  necessary. Other engines still have to be adapted (but many do not seem to
  need this at all, since they either are lang/platform agnostic, or already
  include this information in their MD5 tables).

svn-id: r21154
2006-03-09 03:09:21 +00:00
Eugene Sandulenko
51495fb199 Moved keys mapping dialog to new scheme. Made it generic. Fixed several
compilation errors associated with it.

svn-id: r21151
2006-03-09 02:54:02 +00:00
Max Horn
86565fcca5 - Renamed GameSettings to PlainGameDescriptor
- Added new GameDescriptor struct (similar to PlainGameDescriptor but with
  Common::String members instead of const char * ones)
- Changed DetectedGame to subclass GameDescriptor
- Removed toGameSettings() in favor of new (template) constructors in
  DetectedGame and GameDescriptor
- Fixed a bug in the obsolete gameid handling in the SCUMM & SIMON engines

svn-id: r21150
2006-03-09 02:52:51 +00:00
Max Horn
d2f78184af - added new toDetectedGame() template function (analog to toGameSettings)
- made use of the new DetectedGame constructor from my last commit
- some related cleanup

svn-id: r21149
2006-03-09 01:42:56 +00:00
Eugene Sandulenko
c3f91ca288 Converted all scumm dialogs to new scheme
svn-id: r21147
2006-03-09 01:08:25 +00:00
Max Horn
d9a9fac937 Fixed tons of format string warnings for debug/error calls (including several errors where the format string didn't match the number of arguments to the call)
svn-id: r21141
2006-03-08 11:37:25 +00:00
Max Horn
14f1337c60 Use %p to print pointers portably (even on 64bit systems). Note: this will add a 0x prefix automatically
svn-id: r21140
2006-03-08 10:07:02 +00:00
Eugene Sandulenko
a8a8624511 o Converted most (all?) widgets to new scheme.
o Converted global options dialog to new scheme.

svn-id: r21137
2006-03-08 01:42:02 +00:00
Travis Howell
431c820e4f Correct order of cases in o72_redimArray()
svn-id: r21135
2006-03-07 22:27:14 +00:00
Jamieson Christian
06398d1a84 Removed tag2str usage, which eliminates scumm/util.h dependency.
svn-id: r21107
2006-03-05 22:35:26 +00:00
Torbjörn Andersson
ac33309a4d I guess this is really a WORKAROUND, rather than a HACK. Updated comment.
svn-id: r21106
2006-03-05 22:31:49 +00:00
Jamieson Christian
5e25b3b679 Restructured IMuse and IMuseInternal.
* IMuse is no longer a concurrency front-end.
* IMuseInternal now derives from IMuse.
* Common::StackLock used to protect thread-sensitive interface methods (same as IMuseDigital).
* clear_queue() included in stopAllSounds() so it can be removed from the public interface.
* Game ID now specified at init using property().
* Timer callbacks receive a struct containing IMuseInternal and MidiDriver refs, instead of just the latter.
* OSystem pointer from init is now cached and used instead of global.

All references to the g_system and g_scumm globals are now gone. BOOYAH!

Tested with MI2, DOTT and S&M, under Windows, in Native MIDI, Adlib, and Mixed modes. No regressions or concurrency issues observed. Manifestations of the latter are the biggest concern at this point.

svn-id: r21104
2006-03-05 21:30:44 +00:00
Torbjörn Andersson
0651236066 Make sure there actually is a SMUSH mixer before stopping and deleting it.
svn-id: r21099
2006-03-05 13:57:05 +00:00
Paweł Kołodziejski
7a6ff46b38 that was not what I want. it should stop audio only for immediately stop.
svn-id: r21095
2006-03-05 12:29:13 +00:00
Paweł Kołodziejski
38b82fb585 that should help for bug #1352486, smush sound tracks are not stopped immediately, but outside smush when sound data are depleted in sound mixer buffer.
svn-id: r21094
2006-03-05 12:15:39 +00:00
Travis Howell
3fbf207ee5 Update box flags for C64 maniac
svn-id: r21093
2006-03-05 10:54:41 +00:00
Travis Howell
24493b3f45 Add back exclusion lost in last commit, exclude some verbs from verbs error script
svn-id: r21091
2006-03-05 10:02:43 +00:00
Travis Howell
279ad67506 Correct case of verb names in C64 Maniac
svn-id: r21090
2006-03-05 09:05:44 +00:00