Commit Graph

5544 Commits

Author SHA1 Message Date
Max Horn
9e2e00881f Renamed getActiveChannelSoundID to getSoundID and fixed its semantics to avoid race conditions
svn-id: r17377
2005-04-04 17:43:00 +00:00
Travis Howell
e46a677c0e Nevermind, only o_getObjectImageX/Y needed adjustment.
svn-id: r17376
2005-04-04 14:57:28 +00:00
Travis Howell
f077f357d0 Object width/height should be divded by 8 too.
svn-id: r17375
2005-04-04 14:51:42 +00:00
Travis Howell
172e558050 Missed a function.
svn-id: r17374
2005-04-04 11:58:42 +00:00
Travis Howell
74c124628a Muddled ifs
svn-id: r17373
2005-04-04 11:47:38 +00:00
Travis Howell
f230fe65e8 Add 8 sound channel support for HE games
-Allows sound looping to work

Added support for WAVE format musuc used in later HE100 games.

svn-id: r17372
2005-04-04 11:43:25 +00:00
Torbjörn Andersson
d08068dff1 Fixed warnings on little-endian systems.
svn-id: r17371
2005-04-04 07:25:21 +00:00
Paweł Kołodziejski
c7ddbf7cad fixed compilation
svn-id: r17370
2005-04-04 06:09:04 +00:00
Travis Howell
cab1ac3016 Add extra charset code used in lost/smaller.
svn-id: r17369
2005-04-04 03:29:58 +00:00
Max Horn
0c1f2aa161 Removed GF_SMALL_NAMES
svn-id: r17368
2005-04-04 00:16:58 +00:00
Max Horn
5b53b4a463 Cleaning up the charset loading code some more
svn-id: r17367
2005-04-04 00:12:41 +00:00
Max Horn
789cad236c Splitting more methods into multiple overloaded versions
svn-id: r17366
2005-04-03 23:53:34 +00:00
Max Horn
398aa1a8b1 loadCharset gets overloaded for small header games, so no need to check for those in here
svn-id: r17365
2005-04-03 23:10:17 +00:00
Max Horn
5f880737c5 Use proper constant rtCharset instead of hardcoding '6'
svn-id: r17364
2005-04-03 23:00:15 +00:00
Max Horn
3feadcac28 Turned readRoomsOffsets into a virtual method
svn-id: r17363
2005-04-03 22:56:02 +00:00
Max Horn
1419f0d5ef Split readResTypeList into a normal and a GF_OLD_BUNDLE version; added comments to many of the GF_ feature flags; removed GF_DRAWOBJ_OTHER_ORDER (it was only use by Sam&Max, I switched that to a direct check for Sam&Max)
svn-id: r17362
2005-04-03 22:10:10 +00:00
Jerome Fisher
eda317924e Committed patch #1168149 (Shared GM/MT-32 mapping) by eriktorbjorn as-is. This does the following:
- Replaces multiple identical MT-32-to-General MIDI mapping tables with a common one in MidiDriver.
- Changes Sky's GmChannel class to allow NULL instrument and velocity mapping tables, giving a 1-to-1 mapping without creating a dummy table.

svn-id: r17361
2005-04-03 22:01:38 +00:00
Paweł Kołodziejski
aa50d6d7b0 revert last change, it's too much experimental
svn-id: r17349
2005-04-03 17:11:06 +00:00
Max Horn
b507231f71 ScummEngine_v4 used to be a subclass of ScummEngine_v3, now it is the other way around; added a new class ScummEngine_v3old, for GF_OLD_BUNDLE games; took advantage of the new inheritance structure and turned various methods into virtual methods which then are overriden in subclasses
svn-id: r17346
2005-04-03 15:06:08 +00:00
Travis Howell
f63b35381b Enable copyArray in HE100 too.
svn-id: r17345
2005-04-03 13:50:12 +00:00
Travis Howell
994769ec16 Still needed, mixed up block types.
svn-id: r17344
2005-04-03 06:40:44 +00:00
Travis Howell
d7b6860730 Removed reinit() and replaced with offsets of zero. We only need to skip type/size.
Removed AnimHeader check in parseNextFrame() and _skipPalette, since AnimHeader is correctly skipped when required now.

svn-id: r17343
2005-04-03 06:27:44 +00:00
Travis Howell
27cba7619e More sprite renames
svn-id: r17342
2005-04-03 02:24:28 +00:00
Travis Howell
2e1ce57b5f Add additional case.
svn-id: r17341
2005-04-03 01:42:06 +00:00
Gregory Montoir
c5a4854945 forgot casts
svn-id: r17339
2005-04-02 17:29:53 +00:00
Torbjörn Andersson
1d87cdb497 _data is a ScummFile, not a chunk, so it should use SEEK_SET, not
seek_start. And since SEEK_SET is the default seek mode, it doesn't make
any difference anyway.

svn-id: r17338
2005-04-02 17:26:18 +00:00
Gregory Montoir
7b88503437 initial implementation of o72_arrayOps_127 and o90_sortArray
svn-id: r17337
2005-04-02 17:19:44 +00:00
Travis Howell
1f719929e9 Fix sprite redraws
svn-id: r17336
2005-04-02 15:59:02 +00:00
Travis Howell
b5f281e9d8 Cleanup
svn-id: r17333
2005-04-02 14:24:43 +00:00
Torbjörn Andersson
eb4dce05ee Extremely minor consistency change.
svn-id: r17332
2005-04-02 13:58:00 +00:00
Travis Howell
5d042783a6 Add extra case for 3DO fbear.
svn-id: r17331
2005-04-01 23:42:16 +00:00
Travis Howell
4c50afea57 Seek from start pos, not cur pos.
svn-id: r17330
2005-04-01 22:36:45 +00:00
Eugene Sandulenko
58731633a5 MM NES costumes fix for MM NES. Talking animation appears now, though
there are still some glitches with sliding actors which require different
handling of actors talking.

svn-id: r17329
2005-04-01 21:35:44 +00:00
Travis Howell
ae30e1b9db Checked code against disasm., an offset of 8 is correct when rewinding san via INSANE.
svn-id: r17328
2005-04-01 15:33:18 +00:00
Travis Howell
c832b858b7 Actor order needs to be checked too (For HE games)
svn-id: r17327
2005-04-01 14:46:58 +00:00
Max Horn
9f01b54bcf Turned setupRoomObject into a virtual method
svn-id: r17326
2005-04-01 13:05:40 +00:00
Travis Howell
2eab3e51eb Add bits and pieces
More renames

svn-id: r17325
2005-04-01 12:43:13 +00:00
Travis Howell
879de392d1 A random object state is possible in scumm7 too.
svn-id: r17324
2005-04-01 09:55:17 +00:00
Travis Howell
d80f9ccd40 Add support for clipping of wizImages.
Add support for altering wizImages.
Various renames.

svn-id: r17322
2005-04-01 08:51:13 +00:00
Travis Howell
cdd21c361b Remove resource type argument in wizImage functions, it is always rtImage.
Rename sprite flags/functions
Remove unused sprite flags
Switch sprite flags back to hex. for easier comparison

svn-id: r17319
2005-04-01 06:30:46 +00:00
Eugene Sandulenko
ebe4c1b6b6 Fix regression in MM NES costumes.
Cleanup

svn-id: r17317
2005-04-01 02:14:00 +00:00
Eugene Sandulenko
9c68b29a05 Normalize verb/invenotry areas in MM NES. Patch from Quietust
svn-id: r17316
2005-04-01 01:41:20 +00:00
Max Horn
3ea3c42242 Extended comment on _CLUT_offs a bit
svn-id: r17315
2005-03-31 23:14:09 +00:00
Max Horn
bed1629642 Made findResourceSmall local to resource.cpp; simplified _EPAL_offs (since we don't use it nor save it at this time, this is harmless); added a comment about _CLUT_offs ugliness
svn-id: r17314
2005-03-31 23:11:39 +00:00
Max Horn
807b573ab2 Fix GF_OLD256 palette size (no idea if that has an effect anywhere)
svn-id: r17313
2005-03-31 23:04:46 +00:00
Travis Howell
204809625f Rename paletteNum field for sprite in wizImages.
svn-id: r17312
2005-03-31 22:51:54 +00:00
Max Horn
ac247c9b94 Started to move some resource related code into a new class ResourceManager (hypothetic goal for the future: use ResourceManager in ScummEx)
svn-id: r17311
2005-03-31 21:39:31 +00:00
Travis Howell
fc59dcae3e Return correct object x/y position
svn-id: r17308
2005-03-31 12:58:11 +00:00
Travis Howell
a78e0d0b82 Add some missing code.
svn-id: r17307
2005-03-31 09:56:14 +00:00
Travis Howell
5a890eedd3 Add code for more o90_getPolygonOverlap() cases.
svn-id: r17304
2005-03-31 02:28:14 +00:00