libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-01 15:09:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,205 Commits 5 Branches 5 Tags 1.8 GiB
e00c16b4a9
Commit Graph

2880 Commits

Author SHA1 Message Date
Max Horn
94c4cf0e55 fix for bug #770042 (LOOM: Some bits of dialogue are repeated) 
svn-id: r10145
 2003-09-10 00:28:26 +00:00
Max Horn
deb4f6b786 cleanup; fix for bug #795942 (COMI: text display off screen) and #785760 (COMI: Lockup/crash on Skull Island) 
svn-id: r10144
 2003-09-09 20:54:19 +00:00
Max Horn
d875bb69fe fix for bug #782086 (COMI: a long walk) 
svn-id: r10143
 2003-09-09 19:30:25 +00:00
Max Horn
70df5b782c another fix for bug #802396 (LOOMCD: Sound often causes lock up) 
svn-id: r10142
 2003-09-09 17:50:20 +00:00
Max Horn
4b9e30171b fix for bug #749970 (FT: Animation glitch at the fuel tower) 
svn-id: r10141
 2003-09-09 17:33:29 +00:00
Max Horn
07e8084eee replaced all use of scale items with scale slots. This allowed me to get rid of two big FIXME's, and might fix other scaling bugs in FT/DIG 
svn-id: r10140
 2003-09-09 17:29:22 +00:00
Max Horn
163ecdc054 added convertScaleTableToScaleSlot method, preparing to replace scale items with scale slots 
svn-id: r10139
 2003-09-09 16:55:25 +00:00
Max Horn
ce60ec3145 added some comments to a FIXME 
svn-id: r10132
 2003-09-09 13:29:18 +00:00
Max Horn
6adb8560a8 some initial work on Mac0 support. Everybody feel free to pick up here and implement the rest <g> 
svn-id: r10119
 2003-09-09 01:21:42 +00:00
Max Horn
24560608ed cleanup 
svn-id: r10118
 2003-09-09 00:20:55 +00:00
Max Horn
821faf9e03 added convertMac0Resource (which doesn't do anything yet, but is the place we can add Mac0 support in later); factored out some common code in convertADResource; fixed memory leak when convertADResource was called; misc cleanup 
svn-id: r10117
 2003-09-09 00:13:19 +00:00
Max Horn
697ac22c32 mention some GM instrument numbers 
svn-id: r10116
 2003-09-08 23:35:36 +00:00
Max Horn
b8d72d8854 added comment describing Mac0 format 
svn-id: r10115
 2003-09-08 23:18:11 +00:00
Max Horn
31db86cdb1 fixed yet another bug in redraw logic (which was hidden so far and revealed by my previous fix) 
svn-id: r10112
 2003-09-08 21:04:17 +00:00
Max Horn
738470b02e moving stuff around 
svn-id: r10111
 2003-09-08 21:03:31 +00:00
Max Horn
72b24e8b47 actually USAGE_BIT_RESTORED must be cleared, too 
svn-id: r10110
 2003-09-08 20:50:35 +00:00
Max Horn
26a1040886 turns out that in the GFX usage bit conversion process, we accidentally left out this code. This should fix bug #744794 and potentially others 
svn-id: r10109
 2003-09-08 20:46:25 +00:00
Max Horn
90ec1dc34e make even more use of Scumm::_musicEngine; added MusicEngine::setMasterVolume 
svn-id: r10097
 2003-09-08 17:06:44 +00:00
Max Horn
07cfd2d0ee overlooked one 'new Player_V2' 
svn-id: r10096
 2003-09-08 16:50:54 +00:00
Max Horn
5ecee0f046 fix an overflow 
svn-id: r10095
 2003-09-08 16:48:34 +00:00
Max Horn
302974b003 set _musicEngine for V1/V2 games, too 
svn-id: r10094
 2003-09-08 16:47:21 +00:00
Max Horn
f23a34c9e5 renamed VersionSettings -> TargetSettings and also renamed some of its members; added GameDetector::findTarget; made launcher use that new method; some initial preparations for Plugin code 
svn-id: r10092
 2003-09-08 15:38:34 +00:00
Max Horn
63cd3051f3 WORKAROUND bug #770065: Sync issue in lens conversation (this is actually a script bug) 
svn-id: r10088
 2003-09-08 13:28:56 +00:00
Max Horn
84a87ec24c fix for bug #802396 (LOOMCD: Sound often causes lock up) 
svn-id: r10085
 2003-09-08 11:41:28 +00:00
Max Horn
c5a3c1235c some cleanup 
svn-id: r10084
 2003-09-08 11:29:57 +00:00
Chris Apers
3156f0dd2f Reduce PalmOS data segement 
svn-id: r10083
 2003-09-08 08:54:37 +00:00
Paweł Kołodziejski
a3aef4e0d6 fix warning 
svn-id: r10081
 2003-09-08 07:07:30 +00:00
Travis Howell
9e1d85ce48 Correct verb position in mac version of indy3ega 
svn-id: r10077
 2003-09-08 03:06:37 +00:00
Travis Howell
6444ebf5dc Amiga V3 music updates from unused. 
svn-id: r10076
 2003-09-08 01:42:24 +00:00
Max Horn
a9591325ae properly decode SBL resources by scanning the VOC header in them; added a guess at how SEGA SBLs work (untested, might be completely wrong) 
svn-id: r10074
 2003-09-07 20:53:05 +00:00
Max Horn
7342163c7e make use of voc.h; some cleanup 
svn-id: r10073
 2003-09-07 20:30:02 +00:00
Max Horn
a7676e07c3 removed the seperate 'MP3' CD methods in class Sound (besides being misnamed, merging them into their parent functions actually seems clearer to me, reading wise) 
svn-id: r10071
 2003-09-07 19:47:58 +00:00
Max Horn
1dbab0237f cleanup/refactoring 
svn-id: r10070
 2003-09-07 19:28:45 +00:00
Max Horn
361c3b95d5 some cleanup; clarified isSoundInUse semantics and the difference between IMuse::get_sound_active and IMuse::getSoundStatus; added lots of const qualifiers to IMuse; rewrote IMuseInternal::getSoundStatus (hopefully not breaking it); added MusicEngine::getSoundStatus 
svn-id: r10069
 2003-09-07 17:14:56 +00:00
Max Horn
38402315d5 make some first use of Scumm::_musicEngine; cleanup; also some changes which *might* cause some breakage, but if they don't, we can build on them to simplify Sound::playSound a little (mainly by removing lots of 'return' statements) 
svn-id: r10068
 2003-09-07 16:32:23 +00:00
Max Horn
17b4ce1c59 small tweak (hm, is IMuse::get_sound_active really still needed? or rather, does IMuse::getSoundStatus really have to return an int or can we cast it to boolean safely?) 
svn-id: r10067
 2003-09-07 16:28:41 +00:00
Max Horn
0012f7fa96 added common base class MusicEngine for iMuse/iMuseDigital/Player_V123 (initial stab, more work to follow) 
svn-id: r10066
 2003-09-07 16:16:19 +00:00
Travis Howell
6a438b86a9 Fix warning 
svn-id: r10065
 2003-09-07 09:39:16 +00:00
Travis Howell
ad162a11b0 Add news files 
svn-id: r10063
 2003-09-07 09:33:00 +00:00
Travis Howell
9de8a0cfa9 Add music player for Amiga versions of indy3ega/loom from unused. 
Revert last change to common.rules for now, it broke compile.

svn-id: r10061
 2003-09-07 07:23:20 +00:00
Max Horn
b380affbd5 cleanup 
svn-id: r10055
 2003-09-07 00:03:55 +00:00
Max Horn
76961a90c0 added an assert 
svn-id: r10054
 2003-09-07 00:00:35 +00:00
Max Horn
4e07649c97 small tweak requested by unused on IRC 
svn-id: r10053
 2003-09-06 23:35:42 +00:00
Max Horn
1f59b15f91 implemented FOA keyboard fighting 
svn-id: r10052
 2003-09-06 23:29:35 +00:00
Max Horn
d520f2f44c Patch #790433: Fix potential buffer overflow 
svn-id: r10049
 2003-09-06 20:36:29 +00:00
Paweł Kołodziejski
bbd23e60ce added support for codec1 in nut renderer 
svn-id: r10046
 2003-09-06 16:42:28 +00:00
Travis Howell
f633ac2368 Remove color table for C64 maniac/zak since it isn't needed. 
svn-id: r10045
 2003-09-06 15:15:29 +00:00
Max Horn
0be0196013 removed pauseMixer method from mixer, and renamed stop to stopChannel 
svn-id: r10042
 2003-09-06 10:47:30 +00:00
Travis Howell
c951e5f842 OOps 
svn-id: r10041
 2003-09-06 08:57:19 +00:00
Travis Howell
52a59049c7 Other v1/v2 resources are invalid, checked again v1 maniac and v1/v2 zak. 
svn-id: r10040
 2003-09-06 08:46:36 +00:00
Travis Howell
ffe7cd3feb Actually make these game version message shown by default, so users can better report bugs. 
svn-id: r10037
 2003-09-06 03:48:08 +00:00
Travis Howell
6419a5dd56 Remove outdated comment 
svn-id: r10035
 2003-09-06 03:36:54 +00:00
Travis Howell
0780f7e519 Change version message to debug, to match other games. 
svn-id: r10034
 2003-09-06 03:34:19 +00:00
Travis Howell
40a5138c57 Update comment 
svn-id: r10033
 2003-09-06 03:12:04 +00:00
Travis Howell
ff05aeeb9e zak256 partial sfx loops are working fine. 
svn-id: r10032
 2003-09-06 03:05:01 +00:00
Travis Howell
8b4668740e Search header of Amiga V2 games for rate and volume. 
svn-id: r10031
 2003-09-06 02:27:03 +00:00
Travis Howell
8147719ff2 Remove sound looping hack for v2 amiga games. 
svn-id: r10030
 2003-09-06 01:44:29 +00:00
Travis Howell
af78f4dfae Don't let Amiga and Platform options cancel each other out for Amiga support. 
svn-id: r10029
 2003-09-06 01:20:15 +00:00
Max Horn
457f2fc211 rearranged GameFeatures constants a bit 
svn-id: r10027
 2003-09-05 22:53:46 +00:00
Max Horn
318daabdc7 added whitespace, added FIXME comment 
svn-id: r10026
 2003-09-05 22:53:36 +00:00
Max Horn
0cff89b779 some paranoid cleanup 
svn-id: r10025
 2003-09-05 22:53:25 +00:00
Max Horn
3aa8454efa moved the sound ID param in playRaw before volume/pan 
svn-id: r10023
 2003-09-05 22:09:56 +00:00
Max Horn
d6e4788457 any reasons for playing bundle sounds at 50% volume? 
svn-id: r10020
 2003-09-05 21:12:33 +00:00
Max Horn
06b6ff9a44 added default volume/pan values 
svn-id: r10019
 2003-09-05 21:06:32 +00:00
Max Horn
11193b0746 cleaned up sound/mixer.h a bit; renamed some mixer methods for consistency 
svn-id: r10018
 2003-09-05 20:48:32 +00:00
Max Horn
5f2b0b6977 made default case outputs a bit more consistent 
svn-id: r10017
 2003-09-05 20:47:23 +00:00
Max Horn
4941df93f9 removed duplicate check 
svn-id: r10016
 2003-09-05 20:35:00 +00:00
Max Horn
f8f678d98d updated commented out to work again 
svn-id: r10014
 2003-09-05 20:18:28 +00:00
Max Horn
a60526baba fixed a warning from the IBM C++ compiler 
svn-id: r10013
 2003-09-05 20:18:20 +00:00
Travis Howell
47215f39dd Add to config as int for now. 
svn-id: r10012
 2003-09-05 16:30:05 +00:00
Travis Howell
93d262a01f Oops 
svn-id: r10008
 2003-09-05 15:53:20 +00:00
Travis Howell
0c4d151381 *** empty log message *** 
svn-id: r10006
 2003-09-05 15:28:22 +00:00
Travis Howell
8da8c27776 Add mac check. 
svn-id: r10005
 2003-09-05 15:25:31 +00:00
Travis Howell
d100361876 Use --platform option, instead of system specific options. 
Needs config support added.

svn-id: r10002
 2003-09-05 10:53:57 +00:00
Travis Howell
c3d61acd5c Remove warning 
svn-id: r10000
 2003-09-05 07:38:36 +00:00
Travis Howell
3187b565dd Add atarist and macintosh options, since there seem to be no way to detect version been used. 
svn-id: r9999
 2003-09-05 07:36:05 +00:00
Paweł Kołodziejski
7bc63a0ce3 fixes for uninitialized pan and volume 
svn-id: r9998
 2003-09-05 06:22:10 +00:00
Travis Howell
fccc9a2abb Changeing warning to debug, since we know functions purpuse and it seems to be confusing people. 
svn-id: r9997
 2003-09-05 03:55:48 +00:00
Travis Howell
5f1c67424d Correction from Hibernatus, is used in fm towns games too. 
svn-id: r9996
 2003-09-05 03:51:56 +00:00
Travis Howell
df963e48bd Corrections for Amiga V2/V3 games from unused. 
svn-id: r9994
 2003-09-05 03:29:29 +00:00
Travis Howell
16f0cce0bb Leave SPK resources in monkey1 disabled too. 
svn-id: r9993
 2003-09-04 15:24:58 +00:00
Travis Howell
2f800e4b32 monkey has no native midi resources and SPK isn't support yet. 
svn-id: r9992
 2003-09-04 11:40:12 +00:00
Torbjörn Andersson
aa3687c527 Gave the "monkey" target the same sound flags as the "monkey1" target. At 
least I think they refer to the same game, just with differently named data
files. This should fix bug #800378 ("MI1: no adlib with monkey target
(regression)").

Should the same change be made to the "game" (Monkey Island 1, SegaCD
version) target, or is that one too different?

svn-id: r9991
 2003-09-04 11:33:46 +00:00
Torbjörn Andersson
94df02c799 Implement the ACTOR_PAN opcode. The only place I know of where it's used is 
between between ship-to-ship combats, so I didn't bother yet to store it in
savegames.

svn-id: r9988
 2003-09-03 17:00:33 +00:00
Jonathan Gray
a0f6948150 add a bunch of known targets for some of the newer humongous games, maybe we should move the target list out into another file? there are a few more to add after they are known as well... 
svn-id: r9987
 2003-09-03 10:34:04 +00:00
Jonathan Gray
018d2ee6b1 add some stub cases for later humongous games, queue loading and a decodeParseString case 
svn-id: r9985
 2003-09-03 08:55:24 +00:00
Jonathan Gray
fee1cc04ea remove unused variable 
svn-id: r9978
 2003-09-02 22:35:36 +00:00
Paweł Kołodziejski
534fc0f7a2 imuse digi use mixer volume and pan control now 
svn-id: r9977
 2003-09-02 21:00:08 +00:00
Travis Howell
60dd216672 Add missing verbOps cse for loomcd, needs work. 
svn-id: r9970
 2003-09-02 14:50:58 +00:00
Travis Howell
f90b5f06a5 This changes applies to both version 3 and 4, according to disasm. 
svn-id: r9966
 2003-09-02 11:24:05 +00:00
Paweł Kołodziejski
5a6bce590b changed sounds volume to original volume level, and fixed sounds in bass intro 
svn-id: r9963
 2003-09-02 07:49:40 +00:00
Paweł Kołodziejski
f59a0633d6 fixed if check 
svn-id: r9962
 2003-09-02 07:18:24 +00:00
Travis Howell
3f2ca2b36a Fix from Hibernatus, correct start position for sfx in Amiga maniac/zak. 
svn-id: r9960
 2003-09-02 03:21:14 +00:00
Travis Howell
7b26efda21 Add sound looping for Amiga zak/maniac 
svn-id: r9959
 2003-09-01 17:11:09 +00:00
Travis Howell
a2b1e9081c Fix from Hibernatus, indy3 has black shadows 
svn-id: r9958
 2003-09-01 15:40:16 +00:00
Paweł Kołodziejski
743a3fbdaf added sound handle stuff to mixer streams 
svn-id: r9956
 2003-09-01 13:43:22 +00:00
Travis Howell
ebf9114f68 Add v1 maniac load/save screen support 
Detect save files

svn-id: r9954
 2003-09-01 09:08:48 +00:00
Travis Howell
97545e41fb Add missing break 
Skip auto save slot.

svn-id: r9953
 2003-09-01 07:50:47 +00:00
Travis Howell
e9727c157e Minor cleanup of color cycle resource loading 
svn-id: r9949
 2003-09-01 06:11:41 +00:00
Travis Howell
db6cd68196 Add work around for color cycling been used in monkeyvga when it shouldn't. 
svn-id: r9948
 2003-09-01 05:07:43 +00:00
Travis Howell
c5141005e0 Add CD audio check for loomcd 
Revert last change, since it wipped out intro. text.

svn-id: r9947
 2003-09-01 03:08:32 +00:00
Travis Howell
b43a6f6496 Override default initial setting of subtitles enabled in loomcd 
svn-id: r9946
 2003-09-01 01:50:07 +00:00
Paweł Kołodziejski
2533b23a60 added mixer features: volume and pan control per channel 
svn-id: r9944
 2003-08-31 20:26:21 +00:00
Jonathan Gray
b5ece53748 cleanup and make script_v2 use o5_saveLoadGame 
svn-id: r9941
 2003-08-31 15:39:27 +00:00
Jonathan Gray
f77faa2313 some things needed for supporting original save/load screens in v3 games, doesn't fully work but doesn't break anything either 
svn-id: r9940
 2003-08-31 14:58:56 +00:00
Travis Howell
890c5cde04 Very basic sfx support for Amiga version of maniac/zak 
svn-id: r9922
 2003-08-30 15:32:57 +00:00
Travis Howell
144b9ed71c Alter last commit, since looping would never be stopped on Mac version. 
svn-id: r9919
 2003-08-30 09:42:29 +00:00
Travis Howell
5fe5bd2e0d *** empty log message *** 
svn-id: r9918
 2003-08-30 09:15:10 +00:00
Travis Howell
21814137c2 indy3ega [mac] use same sound effects format as indy3ega [amiga] 
svn-id: r9917
 2003-08-30 09:12:45 +00:00
Travis Howell
f76725b38f Update comment 
svn-id: r9916
 2003-08-30 08:03:01 +00:00
Jamieson Christian
cf3de3784b Fixed bad AND operator. May invalidate savegames from the last 24 hours 
svn-id: r9914
 2003-08-30 02:38:39 +00:00
Travis Howell
f2e8033edc Adjust music timer for game with no music support. 
svn-id: r9913
 2003-08-30 01:32:32 +00:00
Travis Howell
ae183c8c8c Opcode change to load/save screen in original loom 
svn-id: r9912
 2003-08-29 15:06:00 +00:00
Travis Howell
a917313307 Adjust music timer 
svn-id: r9911
 2003-08-29 09:01:19 +00:00
Jonathan Gray
ea1cd18354 fix dottdemo by checking that room exists before trying to set a custom cursor from it, fixes bug #796971 
svn-id: r9909
 2003-08-29 07:57:20 +00:00
Travis Howell
ef4fdd03f0 My last commit was wrong, this is correct solution. 
svn-id: r9908
 2003-08-29 07:07:55 +00:00
Travis Howell
bed0061362 Fix verbs been shown in cutscenes in v1-v2 games if loading/saving during cutscene. 
svn-id: r9907
 2003-08-29 06:53:00 +00:00
Travis Howell
33f9cb35a3 Change zak room color remapping, so it work correctly after load/save in room with remapped colors. 
svn-id: r9905
 2003-08-29 06:46:12 +00:00
Travis Howell
f1d9afc56a Only needed for versions 1 - 4 
svn-id: r9902
 2003-08-29 04:08:48 +00:00
Jamieson Christian
5507d75228 Replaced VER_V* notation for savegames with 
a simple number. So that it's still obvious
that the number refers to version, a VER()
macro does nothing to the number but makes
it obvious what the number is for. This
has the exact same effect as the enum that
was going to get more and more lengthy
as the savegame version evolved.

svn-id: r9901
 2003-08-29 04:05:23 +00:00
Jamieson Christian
20aaf3c365 Added _roomPalette to savegame. 
Savegame version now at 21.

svn-id: r9900
 2003-08-29 03:54:47 +00:00
Jamieson Christian
cec02390ed Fix for bug [770687] MI1: palette effect missing 
Added support for CC resources in small-header
games. Right now this is enabled for monkeyvga
only. loomcd has CC resources but they don't
make any sense, and the game doesn't use palette
effects anyway.

svn-id: r9899
 2003-08-29 03:35:15 +00:00
Jonathan Gray
e32f17d803 don't try to read objectRoomTable for HEv7 games right now 
svn-id: r9898
 2003-08-29 02:45:38 +00:00
Jonathan Gray
176803cb90 make the 2nd gen windows based humongous games that have things like a different layout in the MAXS block at least start the bootscript, added pjs-demo target to test with 
svn-id: r9897
 2003-08-29 02:39:05 +00:00
Max Horn
898bbc85d0 double cursor animation speed (see bug #757191) 
svn-id: r9895
 2003-08-28 19:20:30 +00:00
Jonathan Gray
876fe0ac8a add readINI stub (a HEv7 op) 
svn-id: r9894
 2003-08-28 15:23:23 +00:00
Jonathan Gray
62f94f15be clean up humongous v7 index file block handling 
svn-id: r9893
 2003-08-28 14:25:29 +00:00
Travis Howell
b8d5342f34 Remove junk 
svn-id: r9891
 2003-08-28 12:23:35 +00:00
Travis Howell
cf4ae4097f Update warnings in mingw makefile. 
Add hack to allow nosubtitles in loomcd (Only once game has started)
Revert _roomPalette changes for 256 colors games, caused problems in loomcd, I'm not sure the older 256 color needs these changes.

svn-id: r9890
 2003-08-28 12:21:35 +00:00
Jonathan Gray
0a7dd227b8 revert previous broken commit which didn't logically make sense as it was checking for negative on an unsigned number, and would have broken several things if it compiled 
svn-id: r9889
 2003-08-28 10:10:32 +00:00
Travis Howell
906c7818ec Fix regression that caused subtitles to always be shown in loomcd 
svn-id: r9888
 2003-08-28 10:00:49 +00:00
Travis Howell
6071e79dce Leave small_header color cycle resource disabled for now, since it needs additioal support. 
svn-id: r9887
 2003-08-28 06:38:03 +00:00
Travis Howell
cde3b3dc6d Load older Color Cycling resource. 
Still need to work out resource differences

svn-id: r9883
 2003-08-28 01:10:36 +00:00
Travis Howell
221253b998 Force redraw so copy protection screen in monkeyega/vga is shown correctly. 
svn-id: r9881
 2003-08-27 15:13:04 +00:00
Travis Howell
5f5b9c1e0c Ooops 
svn-id: r9877
 2003-08-27 06:56:54 +00:00
Travis Howell
e37c930533 Add change ot fix pallete issue in 256 color small_header games 
svn-id: r9874
 2003-08-27 03:54:50 +00:00
Travis Howell
06d07054c3 Fix room palette issues in small_header games. 
Fix is only for EGA games so far.

svn-id: r9873
 2003-08-27 01:12:18 +00:00
Travis Howell
b91c182571 Revert v1 zak face costume color nack to 8, since palette is fixed. 
svn-id: r9870
 2003-08-26 16:09:09 +00:00
Travis Howell
63e89e5882 Fix room colors in v1 zak 
svn-id: r9869
 2003-08-26 15:56:37 +00:00
Torbjörn Andersson
f3675261a9 Actually, we used to draw blast text after blast objects. I changed the 
order to fix the Full Throttle end credits. I guess I should have added a
comment about that. :-)

svn-id: r9866
 2003-08-26 06:35:38 +00:00
Max Horn
6d4475cf04 cleanup 
svn-id: r9865
 2003-08-25 21:00:12 +00:00
Max Horn
52534e2cc3 fix actor position in V1 games (by eyeballing the original in dosbox); still seems to be off 1 pixel vertically (?), and actors still leave dirt 
svn-id: r9864
 2003-08-25 20:57:36 +00:00
Max Horn
8977d6ce07 v1 masking fixes 
svn-id: r9863
 2003-08-25 20:18:44 +00:00
Max Horn
f91c575338 fixing off-by-one buglet (harmless in 99% of cases since the 'invalid' _imgBufOffs entries always contain the value of the last valid one) 
svn-id: r9862
 2003-08-25 20:05:02 +00:00
Max Horn
95b8558191 check for costume format, not engine version 
svn-id: r9860
 2003-08-25 14:54:32 +00:00
Max Horn
953e4216b8 implemented V1/C64 object masking, and simplified drawStripC64Mask a bit 
svn-id: r9859
 2003-08-25 14:27:29 +00:00
Travis Howell
285570f0d3 This fix should be v2 only 
Update comment

svn-id: r9858
 2003-08-25 14:17:34 +00:00
Max Horn
2257f8c0cd enable V1/C64 masking 
svn-id: r9857
 2003-08-25 13:15:59 +00:00
Max Horn
e40e6bb207 fixed and cleaned up V1 actor masking 
svn-id: r9856
 2003-08-25 13:13:43 +00:00
Max Horn
10d4af4eae fix for bug #782727 (COMI: no sentence line while inventory is shown) by drawing blast text after blast objects 
svn-id: r9853
 2003-08-24 21:58:16 +00:00
Max Horn
fcf04ecbfd commented my hack 
svn-id: r9851
 2003-08-24 17:38:20 +00:00
Max Horn
09368e09f2 fix for bug #786994 (DOTT: no custom cursor) 
svn-id: r9850
 2003-08-24 17:37:28 +00:00
Travis Howell
14e3dd96e0 Ooops, inventory still needs to be clear when moving through inventory. 
svn-id: r9840
 2003-08-24 02:27:52 +00:00
Travis Howell
4b6800fcf9 Minor cleanup 
svn-id: r9839
 2003-08-24 02:15:12 +00:00
Travis Howell
72bfe15f50 Update comment 
svn-id: r9838
 2003-08-24 02:11:14 +00:00
Travis Howell
79036c5a1d Handle hiding of verbs/inventory in v1-v2 games correctly. 
According to diasm. the verbs areas is only enabled and shown when (_userState & 128) is true and verbs/inventory area is cleared/redrawn on each state change.

svn-id: r9837
 2003-08-24 01:47:45 +00:00
Jamieson Christian
6768da3e76 Added comment keyword, per Fingolfin 
svn-id: r9831
 2003-08-23 16:30:32 +00:00
Travis Howell
6cc598250d Add comment 
svn-id: r9830
 2003-08-23 15:16:07 +00:00
Travis Howell
5e0f61a8b2 Typo 
svn-id: r9827
 2003-08-23 13:51:37 +00:00
Jamieson Christian
c6b5749f03 Added explicit 'ASFX' awareness for clarity 
svn-id: r9826
 2003-08-23 13:31:59 +00:00
Travis Howell
b113720a6d Work around for sound resource in ST versions. 
svn-id: r9824
 2003-08-23 07:27:59 +00:00
Jamieson Christian
535b95fffc Fixed tempo value for Indy3 AD resources. Despite 
the comment in the source, the disasm value DOES
sound closer to the original than the alternative
value that came from who-knows-where. The value
being used rendered too slow a tempo.

svn-id: r9823
 2003-08-22 20:24:06 +00:00
Jonathan Gray
abf7f33dc4 loom towns needs this as well you can now learn f 
svn-id: r9814
 2003-08-22 03:14:29 +00:00
Jamieson Christian
bcd1f49125 More tweaks to the PPQN and tempo of AD resources. 
Loom, Indy3 and monkeyvga are now all running
at the right tempo and returning appropriate
quarter note counts for the script timers.
Fixes a sync regression with the Indy3 opening
sequence under -eadlib.

Ask me if I care that these numbers may not
precisely match the disasm.

svn-id: r9813
 2003-08-22 02:24:55 +00:00
Jonathan Gray
485852ba6c change sound queue overflow error to warning as error was supposed to be temporarily apparently... 
svn-id: r9812
 2003-08-22 01:47:15 +00:00
Jamieson Christian
47c33674ec Fix for Bug [792178] MI1: Intro asynchronity regression 
Reverted Hoenicke's change. Why was this change made anyway?
Do not reinstate the "tempo tweak" before talking to me
about why it was needed.

svn-id: r9810
 2003-08-21 15:51:28 +00:00
Jonathan Gray
446ca58580 crude fix for bug #786995 stop arrow keys being sent to scripts as they are currently stolen by the keyboard cursor control stuff. I will soon either gut the keyboard cursor stuff or make it non default as it breaks several things 
svn-id: r9809
 2003-08-21 15:33:25 +00:00
Jonathan Gray
ce42f4d3dd patch #791738 g++ 3.4 compile fix, from Falk Hueffner and a few minor local bits in my tree 
svn-id: r9807
 2003-08-21 13:39:21 +00:00
Travis Howell
f16aec61f0 Fix speedy music regression in monkeyega/vga/pass. 
Add unique tag to sfx when converting AD resources, to solve sfx cutting off music issue in monkeyega/vga.

svn-id: r9801
 2003-08-20 15:19:23 +00:00
Travis Howell
be0d723e7f Change Amiga palette option to Amiga version 
svn-id: r9800
 2003-08-20 14:01:39 +00:00
Travis Howell
fc005be4d9 Remove my junk 
svn-id: r9797
 2003-08-20 12:08:44 +00:00
Travis Howell
327d37ae78 v1 zak costume colors should be perfect now 
svn-id: r9796
 2003-08-20 12:04:25 +00:00
Travis Howell
cc781cb9b1 Ooops that would have broken v2 
svn-id: r9795
 2003-08-20 11:49:22 +00:00
Travis Howell
1757d5a448 v1 zak costume color almost all right. 
svn-id: r9794
 2003-08-20 11:45:40 +00:00
Travis Howell
e135f8a9b9 Leave masking disable for now, until it works well. 
svn-id: r9789
 2003-08-20 08:52:36 +00:00
Travis Howell
c284e1b507 This is only require for v1 maniac 
svn-id: r9781
 2003-08-19 11:11:11 +00:00
Paweł Kołodziejski
61c320d587 small changes to v1 mask 
svn-id: r9779
 2003-08-19 07:29:15 +00:00
Travis Howell
a34f8895cb Revert color change for v1 maniac, which actually used in pool room. 
svn-id: r9778
 2003-08-19 04:47:38 +00:00
Travis Howell
f25b54159c Remove fixme 
svn-id: r9777
 2003-08-19 04:36:46 +00:00
Travis Howell
7771433b20 Fix for v1 maniac demo mode not setting text color before displaying text 
svn-id: r9776
 2003-08-19 04:34:41 +00:00
Travis Howell
2dd4c40868 Fix cursor cycle color for v1 games 
svn-id: r9775
 2003-08-19 04:28:52 +00:00
Travis Howell
d6105a3064 Cleanup v1/v2 color settings for sentance/inventory/verb area. 
Add highlight color for v1 maniac

svn-id: r9774
 2003-08-19 04:15:14 +00:00
Travis Howell
161ef54777 Correction for v1 zak faces 
svn-id: r9773
 2003-08-19 03:20:09 +00:00
Paweł Kołodziejski
91ab462ce5 ops 
svn-id: r9769
 2003-08-18 20:32:51 +00:00
Paweł Kołodziejski
fe94648dd6 fixed debug mode for mask maps 
svn-id: r9768
 2003-08-18 20:28:57 +00:00
Paweł Kołodziejski
8141126e6e fixed y position of mask in v1 costume rendering 
svn-id: r9767
 2003-08-18 17:59:06 +00:00
Paweł Kołodziejski
c9b0544625 some changes for smush codec 1 and 3, handled by bomp decompression 
svn-id: r9766
 2003-08-18 15:13:15 +00:00
Paweł Kołodziejski
487084e5ad fixed mask conversion for v1 games, still need properly handled 
svn-id: r9765
 2003-08-18 15:10:22 +00:00
Jamieson Christian
4748b92b33 Commented MI1 Demo fix. 
svn-id: r9764
 2003-08-18 13:55:12 +00:00
Chris Apers
d76b92d2b7 Make smush player works under PalmOS 
svn-id: r9763
 2003-08-18 12:53:26 +00:00
Travis Howell
d91320f7ce Remove debug 
svn-id: r9760
 2003-08-18 11:09:11 +00:00
Chris Apers
a47e80cb55 Updated globals access for PalmOS 
svn-id: r9759
 2003-08-18 10:59:21 +00:00
Travis Howell
9b5eb1137f Add support for flashlight in v1 maniac by converting older values. 
Prevent warning about dummy function (Which has no purpose) in zak

svn-id: r9756
 2003-08-18 10:46:42 +00:00
Travis Howell
311eb2678f Use correct costume color for darkness in v1 zak 
svn-id: r9752
 2003-08-18 06:59:18 +00:00
Paweł Kołodziejski
4bad55da8c fixed white spaces 
svn-id: r9751
 2003-08-18 06:29:39 +00:00
Paweł Kołodziejski
f29fbda7ac added dumping png frames from smush animation 
svn-id: r9750
 2003-08-18 06:11:37 +00:00
Jonathan Gray
c21fd14df8 change loomtowns target a tad 
svn-id: r9749
 2003-08-18 04:53:54 +00:00
Travis Howell
4c6bd7167d Fix v1 zak costume colors 
svn-id: r9748
 2003-08-18 02:16:48 +00:00
Jonathan Gray
99c677f2a3 add loom towns target 
svn-id: r9747
 2003-08-18 02:02:43 +00:00
Torbjörn Andersson
1bb575da9d Enabled the v1 costume palette tables Kirben and Hoenicke added earlier. 
svn-id: r9745
 2003-08-17 16:53:00 +00:00
Paweł Kołodziejski
711c2b76ce . 
svn-id: r9744
 2003-08-17 16:40:36 +00:00
Paweł Kołodziejski
bcb78c6ea0 some memory optimization 
svn-id: r9743
 2003-08-17 16:36:24 +00:00
Jochen Hoenicke
eb5f05fab3 More adlib tempo tweaks 
svn-id: r9742
 2003-08-17 16:32:36 +00:00
Paweł Kołodziejski
2269031b1f cleanup again 
svn-id: r9741
 2003-08-17 16:24:00 +00:00
Travis Howell
9b7773f4a2 Don't attempt sound in maniacnes 
svn-id: r9740
 2003-08-17 16:23:44 +00:00
Paweł Kołodziejski
41ca88939c forgot this 
svn-id: r9739
 2003-08-17 16:17:13 +00:00
Paweł Kołodziejski
970bdea9ac some cleanup in codec47 
svn-id: r9738
 2003-08-17 16:10:58 +00:00
Travis Howell
d343ef10b3 Remove c64_ignorePakCols calls for v1 games, since they cause crashes and don't seem to be required. 
Makes v1 maniac completable, maybe v1 zak too.

svn-id: r9736
 2003-08-17 12:13:17 +00:00
Travis Howell
be2e796247 OOps 
svn-id: r9735
 2003-08-17 08:00:26 +00:00
Travis Howell
bbbca4f8fe Fix text display in verb/inventory area in demo mode of V1 maniac mansion 
svn-id: r9734
 2003-08-17 07:02:33 +00:00
Travis Howell
811f29fe79 Add palette tables for v1 costumes, thanks to Hoenicke 
Code isn't enabled yet though.

svn-id: r9733
 2003-08-17 05:46:48 +00:00
Travis Howell
53d1db8cae Fix regressions in MI1 Amiga 
Revert last change to MI1 demo fix and make it monkeyega target only.

svn-id: r9732
 2003-08-17 02:34:34 +00:00
Jamieson Christian
0914e57d21 Changed fix for hanging MI1 EGA Demo after 
finding GFX regressions in Indy3. New fix
runs exit script immediately when nuking
the resource for the current room, and
resets the current room to 0 (nothing).

Again, a warning is output in case other
cases of nuking the current room are found
and have undesirable behavior as a result
of this change.

svn-id: r9731
 2003-08-16 21:45:00 +00:00
Jamieson Christian
d7fae3d1cb More corrections to the VAR_MUSIC_TIMER 
computations, mostly to produce the
exptected output with AD resources.

svn-id: r9730
 2003-08-16 17:08:22 +00:00
Jamieson Christian
61162bf359 Semantics correction 
svn-id: r9729
 2003-08-16 17:05:04 +00:00
Jamieson Christian
c67485254a Fixed hang in MI1 EGA Demo. Hang was the result 
of a conflict between two scripts trying to
putActorInRoom() on the same actor. One script
was trying to reset an actor which had already
been appropriated and set up by another script.

A warning is displayed when putActorInRoom()
is ignored, just in case this crops up in other
games and causes undesirable behavior. (I
tested with MI2 up until Woodtick, and didn't
encounter any places where the opcode had to
be ignored.)

svn-id: r9727
 2003-08-16 15:13:15 +00:00
Jochen Hoenicke
6db31f464f Some Tempo changes for adlib sounds 
svn-id: r9725
 2003-08-16 14:30:23 +00:00
Travis Howell
293ba87bbf Allow right mouse click to skip cutscene (Instead of both) in old games, since originals were this way. 
svn-id: r9724
 2003-08-16 14:24:17 +00:00
Travis Howell
8cd96c7926 color table for actor subtitles in v1 maniac isn't static after all, fixes color issue in demo mode. 
svn-id: r9722
 2003-08-16 10:37:26 +00:00
Jamieson Christian
121b00a6f7 Corrected timing mechanism for RO music streams. 
RO streams have built-in timer markers (the
unknown 0xA0 mentioned in FR [742249]) that
override automated methods of updating
VAR_MUSIC_TIMER. Since these timer markers
do not seem to be present in AD resources, the
old mechanism is used if MD_ADLIB is the current
MidiDriver.

svn-id: r9720
 2003-08-16 09:34:19 +00:00
Chris Apers
8281c2eecc Revert to old value 
svn-id: r9719
 2003-08-16 09:20:24 +00:00
Chris Apers
18bd921440 Fixed 
svn-id: r9718
 2003-08-16 09:12:26 +00:00
James Brown
5ad330e145 Patch from roarin_elk to fix crash in German V2 Zak (talking to Skolarian on Mars crashes) 
svn-id: r9717
 2003-08-16 08:55:29 +00:00
Jamieson Christian
78fba0a853 Changed VAR_SOUNDCARD to 0 for MD_NULL MidiDriver, 
and 1 for PC speaker and PCjr. This fixes a hang
in LoomCD if the default MidiDriver happens to be
a native driver. (For some reason the CD version
still has script variations based on whether a
Roland soundcard was selected. WTH?) LoomCD now
always reverts to MD_NULL, so VAR_SOUNDCARD will
always be set appropriately.

svn-id: r9716
 2003-08-16 07:19:28 +00:00
Jamieson Christian
4da3bf3a61 Fixed transpose/detune computations 
svn-id: r9715
 2003-08-16 06:17:27 +00:00
Travis Howell
2750eabcd5 Add a comment 
svn-id: r9714
 2003-08-16 06:01:10 +00:00
Travis Howell
5a963767bf Fix subtitles colors in V1 maniac 
svn-id: r9713
 2003-08-16 05:45:19 +00:00
Jochen Hoenicke
3b75fa8d3c Changed on_timer frequency in adlib so V3 SFX are correctly timed. 
Changed V3 conversion code to adapt to the new (correct) speed.

svn-id: r9712
 2003-08-15 16:40:17 +00:00
Travis Howell
a892474a4f Fix my fix 
svn-id: r9711
 2003-08-15 15:17:25 +00:00
Travis Howell
b82c80a085 Typo 
svn-id: r9709
 2003-08-15 15:10:19 +00:00
Travis Howell
7d11516c9b Fix monkey2 missing sfx regression 
svn-id: r9708
 2003-08-15 14:41:28 +00:00
Travis Howell
7e611160a9 *** empty log message *** 
svn-id: r9707
 2003-08-15 14:18:09 +00:00
Jochen Hoenicke
f86a8cd38b implement the PCjr chunk 1 sounds. 
svn-id: r9706
 2003-08-15 13:58:54 +00:00
Jochen Hoenicke
185d563690 A different fix for Bugs item #788531. 
Allocate a 4th channel and map all accesses to out of bounds
channels to this channel.

svn-id: r9705
 2003-08-15 12:48:47 +00:00
Jochen Hoenicke
9c378d2f22 The imuse debugger commands now work with playerV2 too. 
svn-id: r9704
 2003-08-15 11:18:21 +00:00
Jamieson Christian
e1bc6493d8 Replaced ADLIB_ALWAYS and ADLIB_PREFERRED with a more flexible 
list of music types supported. This was done because now
PC speaker support must be treated separately, along with
Adlib and native (GM/MT32) support.

This fixes a problem with games that don't support PC speaker
(including V5 games that don't parse SPK resources yet)
being run with -epcspk or -epcjr. Those games now properly
switch to -enull so that music resources still get parsed
and music/script synchronization mechanisms don't break.

svn-id: r9703
 2003-08-15 10:19:24 +00:00
Travis Howell
f9aea7673f Correct comment 
svn-id: r9702
 2003-08-15 10:07:31 +00:00
Jamieson Christian
6f50c85220 Fixed problem with Adlib sounds being generated 
when using -epcspk or -epcjr with V6 games that
don't have PC speaker resources.

svn-id: r9701
 2003-08-15 07:45:21 +00:00
Jamieson Christian
c0730f6cb9 Fix for Bug [788531] Indy3VGA - Access violation with PC Speaker "travel" music 
Checked for OOB channel clear command. The "travel" music
in question seems to try to clear channel 4 when there are
only channels 0-3. Now we check and bail if OOB.

Perhaps this isn't quite the correct thing to do. Would
channel 4 be significant, as in perhaps "clear ALL channels"?
Hoenicke should answer this one.

svn-id: r9700
 2003-08-15 07:10:30 +00:00
Travis Howell
3ddb50711e Set v1 actor color to static for now, so actors can at least be seen easier. 
Change default colors so at least Dave's color look right.

svn-id: r9699
 2003-08-15 05:55:33 +00:00
Jonathan Gray
6b405587f2 add hack for string resource idx numbers greater than max for humongous games 
svn-id: r9698
 2003-08-15 05:35:12 +00:00
Travis Howell
f76980af39 Restrict monkeyega/vga music stop hack to ADL and RO sound resources 
svn-id: r9697
 2003-08-15 04:16:51 +00:00
Jonathan Gray
9d450bc9ce assert that string variable actually exists before we start doing comparisons against the string 
svn-id: r9696
 2003-08-15 03:15:41 +00:00
Jonathan Gray
78b6cb41a9 patch #788078 Improved Amiga V3 SFX support by Quietust 
svn-id: r9695
 2003-08-15 01:21:59 +00:00
Travis Howell
c258337b27 No need for those brackets 
svn-id: r9694
 2003-08-15 01:18:19 +00:00
Travis Howell
876383a9c9 Don't confuse RO and ROL sound resources 
svn-id: r9693
 2003-08-15 01:16:19 +00:00
Jochen Hoenicke
fa457b95c1 Don't create imuse for v1 and v2 games (otherwise getSoundStatus doesn't work). 
PCjr support for V1 games, bug fix in speaker support.
set_pcjr is now called by Player_V2 constructor according to midi driver.
Renaming of member variables to begin with an underscore.

svn-id: r9692
 2003-08-14 19:41:40 +00:00
Paweł Kołodziejski
5922f4c3d4 changed warning into debug in o8_startVideo func 
svn-id: r9691
 2003-08-14 17:17:11 +00:00
Jonathan Gray
413f09eff5 add maniacnes target, rather prelimary so people would be well advised not to add to compatibility at this point 
svn-id: r9690
 2003-08-14 11:40:50 +00:00
Travis Howell
50482ded7b Fix bad check 
svn-id: r9689
 2003-08-14 10:46:46 +00:00