Commit Graph

1447 Commits

Author SHA1 Message Date
Max Horn
b22f6c31f6 cleanup
svn-id: r7159
2003-04-27 16:12:30 +00:00
Max Horn
efae54c720 this indy3 hack is needed for the ega version, too; restricted zeppelin hack to the room where it is needed (this might fix the levitating guard bug)
svn-id: r7158
2003-04-27 15:58:36 +00:00
Paweł Kołodziejski
d9c8751168 some fixes to v2 opcodes
svn-id: r7153
2003-04-27 11:38:38 +00:00
Jonathan Gray
07bd555101 this seems to be needed for indy3ega as well, note that the text is largely the wrong colour and you can't see the book or picture of the window in the diary still
svn-id: r7152
2003-04-27 11:01:42 +00:00
Paweł Kołodziejski
3d52e4510b more share code, and fixes
svn-id: r7151
2003-04-27 10:05:36 +00:00
Paweł Kołodziejski
33c600dde5 and more share code
svn-id: r7150
2003-04-27 09:39:52 +00:00
James Brown
a94afe4120 V2 syntax fix
svn-id: r7149
2003-04-27 09:03:26 +00:00
Paweł Kołodziejski
caf6d74095 put some v2 code into share code
svn-id: r7148
2003-04-27 07:52:26 +00:00
Paweł Kołodziejski
5a687ff50f small fix for v2 opcodes
svn-id: r7147
2003-04-27 07:13:03 +00:00
Paweł Kołodziejski
e2f8a6c74c added more v2 opcodes
svn-id: r7145
2003-04-26 20:03:38 +00:00
Max Horn
351ed4077f fixed verb objects for GF_OLD_BUNDLE games
svn-id: r7143
2003-04-26 17:16:53 +00:00
Paweł Kołodziejski
64e5240efd fixed offsets for object names for scumm v2
svn-id: r7142
2003-04-26 16:56:59 +00:00
Max Horn
7a5438a592 also fix o5_setObjectName for Indy/Loom
svn-id: r7141
2003-04-26 16:52:11 +00:00
Max Horn
35955dd35a Erik's fix for text output in Loom (and Indy3?)
svn-id: r7140
2003-04-26 16:51:03 +00:00
Max Horn
adbd60cc7b fixed object names in Indy3EGA and Loom
svn-id: r7139
2003-04-26 16:45:23 +00:00
Max Horn
4ac863efdb fix warning
svn-id: r7138
2003-04-26 16:43:18 +00:00
Paweł Kołodziejski
6bd3454ae5 update for scumm v2
svn-id: r7137
2003-04-26 16:37:35 +00:00
Max Horn
1b5cac75f5 temporary work around for 16 color games
svn-id: r7136
2003-04-26 16:25:14 +00:00
Max Horn
afaac51b65 fixed issue in Loom (and other OLD_BUNDLE games?) in decodeParseString
svn-id: r7135
2003-04-26 16:17:51 +00:00
Max Horn
2d8fa42f44 renamed setCursorHotspot2 to setCursorHotspot; fixed (with a hack) cursor in Loom
svn-id: r7132
2003-04-26 13:28:34 +00:00
Max Horn
b617227723 fixed endian regression (introduced by the alignment changes)
svn-id: r7127
2003-04-26 11:02:49 +00:00
Max Horn
2363704bd7 proper fix for COMI regression
svn-id: r7125
2003-04-26 10:43:59 +00:00
Jonathan Gray
2d1e313018 stop assertion from triggering to make ft finishable again
svn-id: r7123
2003-04-26 05:29:25 +00:00
Jonathan Gray
b542136929 make comi work again, can we branch for 0.4.0 already so all the testing actually means something?
svn-id: r7122
2003-04-26 01:38:38 +00:00
Jonathan Gray
8137b70bdf close console after we run a script
svn-id: r7104
2003-04-25 13:13:16 +00:00
Max Horn
913f9d2eb1 fixed stupid mistake (yeah yeah, being able to read old code, and use your brain properly, helps :-)
svn-id: r7103
2003-04-25 10:57:12 +00:00
Travis Howell
3ecd142d6c Add patch #727309 - EGA LOOM: Bypassing the copy protection
svn-id: r7102
2003-04-25 09:16:33 +00:00
Paweł Kołodziejski
a1c43eae08 fixed warning under VC6
svn-id: r7101
2003-04-25 04:30:49 +00:00
Jonathan Gray
3da2a09443 add importres and script starting functionality to the debugger
svn-id: r7100
2003-04-25 02:53:35 +00:00
Max Horn
33045523ae fix a regression my recent change introduce in GF_OLD256 games <sigh>
svn-id: r7099
2003-04-25 00:03:06 +00:00
Jonathan Gray
5707a4e4bc better safe then sorry...
svn-id: r7098
2003-04-24 23:56:47 +00:00
Max Horn
a90dcc8b71 simplified / unified code; fixed various masking bugs
svn-id: r7096
2003-04-24 18:53:21 +00:00
Jonathan Gray
2ba6881a10 correction
svn-id: r7095
2003-04-24 15:59:41 +00:00
Jonathan Gray
0e4c195b7c disable masks in OLD_BUNDLE games for now
svn-id: r7094
2003-04-24 14:33:31 +00:00
Jonathan Gray
d092f1c82a VAR_KEYPRESS is 118 in v7 this makes Shift-W in ft work
svn-id: r7093
2003-04-24 11:35:46 +00:00
Jonathan Gray
db8cb043f5 disable ingame save/load screen for OLD_BUNDLE games
svn-id: r7091
2003-04-24 01:15:14 +00:00
Jonathan Gray
8e06d3a23a bypass copy prot for indy3ega
svn-id: r7090
2003-04-24 00:44:34 +00:00
Max Horn
80c73e2cc9 fixed verb scripts for old bundle games
svn-id: r7089
2003-04-23 23:46:03 +00:00
Jonathan Gray
f7c4ef0c67 fix loading GF_OLD_BUNDLE games
svn-id: r7088
2003-04-23 09:20:22 +00:00
Jonathan Gray
e3da420f36 update costume hack for indy3ega
svn-id: r7087
2003-04-23 08:43:35 +00:00
Max Horn
676dba826d fixed actor positions in Indy3EGA
svn-id: r7086
2003-04-23 08:26:54 +00:00
Max Horn
37ff9ae0e4 renamed unk19 to startScaleIndexX
svn-id: r7085
2003-04-23 08:26:28 +00:00
James Brown
f996cd5987 Some more V2 fixes for Zak
svn-id: r7084
2003-04-23 05:13:26 +00:00
Jonathan Gray
8fdcf48fc5 hmm
svn-id: r7083
2003-04-23 05:10:17 +00:00
Jonathan Gray
8d39d6ddb1 add script command to debugger and convert old printscripts function to new debugger
svn-id: r7082
2003-04-23 05:05:20 +00:00
Jonathan Gray
91fcad01e5 revert back a line to fix a nasty regression
svn-id: r7081
2003-04-23 01:33:49 +00:00
Max Horn
a5cfbd87c0 huh? anyway, now it works much better already in indy3ega
svn-id: r7080
2003-04-22 20:54:12 +00:00
Max Horn
cf730045d9 added FIXME comment (aquadran, comments?)
svn-id: r7079
2003-04-22 20:50:55 +00:00
Max Horn
cdd97dd5db some fixes for the indy3ega (and other OLD_BUNDLE?) costumes; still don't display right, but base offsets are correct now: costume data is valid and identical in indy3ega and indy3 (256); and you actually see Indy running over the train in the intro (but, uhm... buggy :-)
svn-id: r7078
2003-04-22 20:48:53 +00:00
Paweł Kołodziejski
80951af4f2 corrections for setting actor palette
svn-id: r7076
2003-04-22 19:59:30 +00:00
Max Horn
0b7c86ff13 cleanup; small fix for GF_OLD256 games; also the head hack for indy3 is not needed anymore
svn-id: r7075
2003-04-22 18:57:10 +00:00
Jonathan Gray
da5467d4cf script debug messages not just for comi
svn-id: r7074
2003-04-22 16:46:33 +00:00
Jonathan Gray
90610fef1a opcode E0 DE is sound volume change
svn-id: r7073
2003-04-22 14:49:29 +00:00
Jonathan Gray
d60bc44587 add preliminary bits for making xmi music in humongous games work, just need someone to do something with the pointer now :)
svn-id: r7072
2003-04-22 11:34:46 +00:00
James Brown
a8dfcb4eda Add somewhat hacky 'restart' command to debugger. Still needs work :)
svn-id: r7071
2003-04-22 04:40:30 +00:00
Jonathan Gray
b3ac1bf20e fix setState for humongous games
svn-id: r7070
2003-04-22 00:09:07 +00:00
Paweł Kołodziejski
93e28c81ff added two next v2 opcodes
svn-id: r7068
2003-04-21 15:42:55 +00:00
Paweł Kołodziejski
1a6d58f2fc ops
svn-id: r7067
2003-04-21 15:28:18 +00:00
Paweł Kołodziejski
d836216a71 added o2_ifClassOfIs opcode
svn-id: r7065
2003-04-21 15:25:29 +00:00
Paweł Kołodziejski
be607289bb added partialy o2_doSentence opcode
svn-id: r7064
2003-04-21 14:59:19 +00:00
James Brown
3fe8f939c6 Another half-assed stub, this time for o2_printEgo
svn-id: r7063
2003-04-21 14:50:48 +00:00
Paweł Kołodziejski
a6bd927456 added o2_resourceRoutines opcode
svn-id: r7062
2003-04-21 14:20:18 +00:00
Paweł Kołodziejski
835982c60f More V2 opcode work
svn-id: r7060
2003-04-21 14:09:16 +00:00
Paweł Kołodziejski
4a831b1206 arrgh (revert)
svn-id: r7058
2003-04-21 13:19:19 +00:00
Paweł Kołodziejski
48ad5199ff fixes for v3 broken by v2
svn-id: r7057
2003-04-21 13:10:58 +00:00
Paweł Kołodziejski
d7c0a9b68a some next changes
svn-id: r7056
2003-04-21 12:59:57 +00:00
Paweł Kołodziejski
cd723f9af5 added o2_drawObject opcode
svn-id: r7055
2003-04-21 12:31:08 +00:00
Paweł Kołodziejski
65b7241330 added some v2 vars
svn-id: r7054
2003-04-21 11:54:27 +00:00
Paweł Kołodziejski
d9adc5d71a changes for v2 resources
svn-id: r7053
2003-04-21 11:19:56 +00:00
Paweł Kołodziejski
d7deee507a some changes in v2 variables
svn-id: r7052
2003-04-21 10:20:12 +00:00
Nicolas Bacca
39aa43dc83 Fix option dialogs for WinCE
svn-id: r7051
2003-04-21 10:09:41 +00:00
Paweł Kołodziejski
256d4c0e3a added opcode for setting actor color palette in o2_actorSet()
svn-id: r7050
2003-04-21 09:03:17 +00:00
Paweł Kołodziejski
a80927891c fixed object flags, it's right shifted half byte
svn-id: r7049
2003-04-21 08:50:16 +00:00
Jonathan Gray
5cc5af052f add readFile stub
svn-id: r7048
2003-04-21 00:44:46 +00:00
Jonathan Gray
7037ed3102 opcode bd is stopObjectCode in the humongous games
svn-id: r7047
2003-04-21 00:22:52 +00:00
Paweł Kołodziejski
7dd0bda6ea fixed building object tables (now I understand)
svn-id: r7042
2003-04-20 21:09:43 +00:00
Paweł Kołodziejski
91a2595341 added loading global objects states for v2
svn-id: r7041
2003-04-20 20:58:00 +00:00
James Brown
6e3bafd6ce Oops, missed a variable read in o2_actorSet
svn-id: r7040
2003-04-20 17:18:31 +00:00
James Brown
fe0fc72e57 Pedantic stats-boosting typo fix :)
svn-id: r7039
2003-04-20 17:11:13 +00:00
James Brown
b5b625272b Better o2_actorSet stuff
svn-id: r7038
2003-04-20 17:07:25 +00:00
James Brown
4182b359f9 o2_actorSet stubs
svn-id: r7037
2003-04-20 16:59:52 +00:00
James Brown
47114e1da2 V2 only reads one byte for variable number
svn-id: r7036
2003-04-20 16:46:55 +00:00
James Brown
5f1e964b65 V1/V2 charsets are internal, so we have no load function (yet)
svn-id: r7035
2003-04-20 16:37:43 +00:00
Paweł Kołodziejski
7acad3a0a0 next two missed opcodes, ah :)
svn-id: r7034
2003-04-20 16:32:44 +00:00
James Brown
79189f2e12 Dump Scumm error() to debugger
svn-id: r7033
2003-04-20 16:25:48 +00:00
Paweł Kołodziejski
3b32494755 forgot it
svn-id: r7031
2003-04-20 16:17:41 +00:00
Paweł Kołodziejski
4d545953c8 added initial v2 opcode table
svn-id: r7030
2003-04-20 16:04:50 +00:00
Jonathan Gray
4c6676d390 add opcode e4 stub that I meant to add some time ago
svn-id: r7028
2003-04-20 15:02:58 +00:00
Jonathan Gray
90dd401eab work around strange problem that breaks fbpack when _showStack is a bool...
svn-id: r7027
2003-04-20 14:28:25 +00:00
Jonathan Gray
303a48dbbc case 131 of verbOps pops in the humongous games
svn-id: r7026
2003-04-20 11:17:22 +00:00
Jonathan Gray
f1353701f8 add stack tracing option to debugger
svn-id: r7025
2003-04-20 08:04:27 +00:00
Jonathan Gray
c597d0d4d6 add script hex dumping option to debugger
svn-id: r7024
2003-04-20 06:55:09 +00:00
Jonathan Gray
1d01a68cac close bundle files when changing discs in comi
svn-id: r7023
2003-04-20 00:56:23 +00:00
Paweł Kołodziejski
d805b0bb8c fix for pass (revert changes)
svn-id: r7022
2003-04-19 14:43:55 +00:00
Jamieson Christian
2a1e87fa7c Revised fix to bug [666187] DOTT: Coffee music never stops
svn-id: r7021
2003-04-19 14:23:40 +00:00
Paweł Kołodziejski
4ca9454f86 ignorePakCols, should be used for ega games, why not for amiga? i don't see difference
svn-id: r7020
2003-04-19 06:37:42 +00:00
Paweł Kołodziejski
d0e9fef9a2 some changes for indy ega
svn-id: r7019
2003-04-18 21:10:32 +00:00
Paweł Kołodziejski
ad7bc9b22f fixed stupid bug
svn-id: r7018
2003-04-18 20:47:19 +00:00
Paweł Kołodziejski
3efe16ffce loom ega: build custom cursor, op_wait() has more then one subopcodes(revert changes), disabled adlib_default
svn-id: r7017
2003-04-18 20:16:32 +00:00
Jamieson Christian
20e22e6f29 Fix for bug [666187] DOTT: Coffee music never stops
svn-id: r7016
2003-04-18 14:38:31 +00:00
Paweł Kołodziejski
dc64134a74 fixed actor palette for nonblocked games
svn-id: r7014
2003-04-16 07:11:04 +00:00
Paweł Kołodziejski
9b739fcf0d a little fix for costumes, still wrong
svn-id: r7013
2003-04-16 06:42:26 +00:00
Paweł Kołodziejski
942bcef563 changes in costumes offsets, still wrong
svn-id: r7010
2003-04-14 07:02:07 +00:00
Paweł Kołodziejski
a114ddbbf7 shouldn't be increased to next search object ?
svn-id: r7009
2003-04-13 21:47:48 +00:00
Max Horn
1623dee298 this seems to be needed for loomdemo (and loom?), too
svn-id: r7008
2003-04-13 21:29:44 +00:00
Paweł Kołodziejski
9290218e4f img and imgh should be readed from offset +2, but i'm not sure about imptr (it should skip only length)
svn-id: r7007
2003-04-13 21:21:56 +00:00
Paweł Kołodziejski
158a3a5080 added specific opcodes for indy ega same as at indy 256, and dummy opcode for loom ega
svn-id: r7006
2003-04-13 20:15:44 +00:00
Paweł Kołodziejski
207f164cc6 fix stupid bug
svn-id: r7005
2003-04-13 19:56:52 +00:00
Paweł Kołodziejski
c71c8f4473 handle old_bundle offsets for costume code, still wrong
svn-id: r7004
2003-04-13 19:53:39 +00:00
Paweł Kołodziejski
e0d170faca handle old_bundle offsets getVerbEntrypoint(), o5_setObjectName(), getObjOrActorName() funcs
svn-id: r7003
2003-04-13 16:42:33 +00:00
Paweł Kołodziejski
aff192d554 handle old_bundle size at addObjectToInventory() func
svn-id: r7002
2003-04-13 16:21:41 +00:00
Paweł Kołodziejski
134d358261 draw_object instead pickup_object for all v3 scumm games
svn-id: r7001
2003-04-13 16:03:48 +00:00
Max Horn
c7f298702a fixed my box size hack
svn-id: r6999
2003-04-13 01:51:24 +00:00
Max Horn
06810ea184 oops, copy&paste, I should avoid 'em or check better :-(
svn-id: r6998
2003-04-12 20:19:29 +00:00
Max Horn
3ffafcfdf3 just in case...
svn-id: r6997
2003-04-12 20:12:52 +00:00
Max Horn
46a6fc69c0 loadCharset(0) for GF_OLD_BUNDLE - 'fixes' indydemo to an extent
svn-id: r6996
2003-04-12 20:07:08 +00:00
Max Horn
bfb5b19758 oops
svn-id: r6995
2003-04-12 19:51:43 +00:00
Max Horn
951e5cfe98 fixed costume code for OLD_BUNDLE (but boy, this is hackish... we rather should shift all the other costume datas by 2 or 4 bytes)
svn-id: r6994
2003-04-12 19:51:14 +00:00
Max Horn
bd2011467b hacked in some verb object support for OLD_BUNDLE (drawVerbBitmap part not yet tested; but the setVerbObject is needed now already)
svn-id: r6993
2003-04-12 19:44:06 +00:00
Max Horn
a33e4dddac ignore sound resource in OLD_BUNDLE games for now
svn-id: r6992
2003-04-12 19:42:12 +00:00
Max Horn
fc08a317b0 fixed OLD_BUNDLE object image offset
svn-id: r6991
2003-04-12 18:43:23 +00:00
Max Horn
32c7c4eb6b fixed (?) local script offests for OLD_BUNDLE games
svn-id: r6990
2003-04-12 17:59:24 +00:00
Max Horn
fb1409937e center close button
svn-id: r6989
2003-04-12 17:22:20 +00:00
Jonathan Gray
1f48f9cc5f hack around wrong costume in indy3 until a proper solution is found
svn-id: r6987
2003-04-12 13:13:01 +00:00
Max Horn
3fcac728a8 added GF_OLD_BUNDLE to findObjectInRoom
svn-id: r6986
2003-04-12 12:58:20 +00:00
Max Horn
95f6141c71 fixed OLD_BUNDLE entry script (d'oh!) and dump entry/exit script for OLD_BUNDLE games, too
svn-id: r6985
2003-04-12 12:03:55 +00:00
Max Horn
a236803241 cleanup
svn-id: r6984
2003-04-12 11:44:15 +00:00
Paweł Kołodziejski
bab3f0d9f9 added adlib default for loom and enabled zak
svn-id: r6983
2003-04-12 09:46:48 +00:00
Paweł Kołodziejski
9079a51cf2 fixed stupid bug
svn-id: r6982
2003-04-12 09:36:10 +00:00
Paweł Kołodziejski
6d4b748199 fixes zplanes for nonblocked games
svn-id: r6981
2003-04-12 09:31:00 +00:00
Paweł Kołodziejski
6c2dd8b4d2 fixed setting local scripts for unblocked games
svn-id: r6980
2003-04-12 07:06:19 +00:00
Max Horn
b015b07d22 oops, forgot debug output
svn-id: r6979
2003-04-12 02:39:16 +00:00
Max Horn
b89a2ca142 doh... best way to check for 16 color games is to check for 16 color games, isn't it? :-)
svn-id: r6978
2003-04-12 02:38:40 +00:00
Max Horn
9750a2407c lots of unblocked aka GF_OLD_BUNDLE support code (still no load, but gets further :-)
svn-id: r6977
2003-04-12 02:09:00 +00:00
Max Horn
dbff83a88b fixed resource loading in GF_OLD_BUNDLE games (res header = 2 bytes length, plus 2 unknown bytes)
svn-id: r6976
2003-04-11 22:15:59 +00:00
Paweł Kołodziejski
6fef5f77ad fix for cursor image in the loom ega
svn-id: r6975
2003-04-11 20:21:32 +00:00
Max Horn
51b430b088 factored out some common code
svn-id: r6974
2003-04-11 20:05:37 +00:00
Paweł Kołodziejski
fd28237eb8 added loading object flags for loom ega
svn-id: r6973
2003-04-11 16:25:09 +00:00
Jonathan Gray
91c6f38ed4 stop loom pass demo from erroring out
svn-id: r6972
2003-04-11 12:57:41 +00:00
Max Horn
9b6cb4ba1e fixes V3/OLD_BUNDLE res reading
svn-id: r6971
2003-04-11 11:51:41 +00:00
Max Horn
929a2fe927 cleanup
svn-id: r6968
2003-04-11 11:40:56 +00:00
Max Horn
8c78049154 made unblocked games get a little farther before crashing
svn-id: r6967
2003-04-11 11:40:35 +00:00
Jonathan Gray
16713d1176 make monkeyega intro work :)
svn-id: r6966
2003-04-11 05:31:45 +00:00
Paweł Kołodziejski
c4a51041d4 fix for ega palette, more
svn-id: r6965
2003-04-11 05:31:18 +00:00
Paweł Kołodziejski
f1aa6daf00 fix for ega palette
svn-id: r6964
2003-04-11 05:22:28 +00:00
Jonathan Gray
8febecac27 spelling
svn-id: r6963
2003-04-11 03:57:09 +00:00
Travis Howell
61d103220c Auto detect monkeyega and pass
Use adlib by default in monkeyega and pass

svn-id: r6962
2003-04-11 02:43:12 +00:00
Paweł Kołodziejski
c275874f8c fixed o5_actorSet (scale only one param), and added handle for actor sound
svn-id: r6961
2003-04-10 20:42:50 +00:00
Paweł Kołodziejski
90d22c8d6a turn on scaled actors in ega blocked games
svn-id: r6960
2003-04-10 19:58:26 +00:00
Paweł Kołodziejski
5418f6d6bd fixed zplanes and a little palette changes for ega blocked games
svn-id: r6959
2003-04-10 19:30:01 +00:00