Commit Graph

45 Commits

Author SHA1 Message Date
James Brown
4e07c1bb91 Patch 668634: Actor iteration fix
svn-id: r6484
2003-01-16 17:37:34 +00:00
Max Horn
d5a266f2ca reversed Dig workarounds - better to find the real cause of the regression, says Endy
svn-id: r6483
2003-01-16 14:42:20 +00:00
Max Horn
b9811d9594 another change for Dig - still crashes a lot with my save games, though :-/
svn-id: r6475
2003-01-16 01:49:33 +00:00
Max Horn
bf6e37cba8 two changes to accomodate Dig - don't like this :-/
svn-id: r6474
2003-01-16 01:46:59 +00:00
Max Horn
8ad002b3a3 first blastText version. this is work in progress (note that e.g. text is not clipped, and the extra information is not removed)
svn-id: r6472
2003-01-16 00:40:19 +00:00
James Brown
8fa5402562 ComI timing hack... very odd.
svn-id: r6454
2003-01-14 10:33:18 +00:00
Max Horn
ca88dff5e7 work around a script bug in COMI; cleanup; re-enabled array assert
svn-id: r6437
2003-01-12 21:13:22 +00:00
James Brown
458ecbffcf Remove assert. It's assertion makes me fearful of it's dominance. Oh, and it prevents the Lights scene in ComI working.
svn-id: r6433
2003-01-12 18:55:41 +00:00
Max Horn
37a64f5d12 cleanup; added a hack to avoid crash in the canon scene (at least it works this way for me)
svn-id: r6347
2003-01-06 13:41:29 +00:00
Max Horn
82edaeaaf1 unified function names (compared to V8); added some FIXME comments
svn-id: r6344
2003-01-06 01:53:38 +00:00
Max Horn
a6d89ad7fd fix for the cannon scene
svn-id: r6339
2003-01-05 22:16:09 +00:00
Max Horn
535ad0a4cf moved Scumm::faceActorToObj to Actor::faceToObject; moved various functions in script.cpp (grouping cutscene/override related stuff)
svn-id: r6317
2003-01-01 18:22:41 +00:00
Max Horn
53a8fc24fe fixed cutscene override in V8; cleanup
svn-id: r6316
2003-01-01 17:57:14 +00:00
Max Horn
d87b7fb471 cleanup
svn-id: r6270
2002-12-30 02:06:18 +00:00
Max Horn
2c6464c07a cleanup
svn-id: r6264
2002-12-30 00:40:25 +00:00
Max Horn
ae5b30df3d get rid of getStringLen and use the more powerful resStrLen instead; moved resStrLen from common/ to scumm/, where it belongs; enhanced resStrLen to suport V8; fixed translateText to support embeded vars (in strings I mean) - it may still not be fully correct but at least is better now; rewrote o6_arrayOps to parallel the V8 version - needs testing
svn-id: r6215
2002-12-28 01:57:19 +00:00
Max Horn
21226d1fb0 verb ids can be > 255 in V8; more V8 verbop corrections
svn-id: r6204
2002-12-27 16:49:08 +00:00
James Brown
1dab4170a9 Patch 650135 (method 3): FOA parrot hang
svn-id: r6185
2002-12-27 00:23:45 +00:00
Max Horn
8f0af0d2f8 group startScript/Object codes (no code change)
svn-id: r6180
2002-12-26 23:24:57 +00:00
Max Horn
c05a308fad doSentence only takes three params in V8
svn-id: r6179
2002-12-26 23:05:19 +00:00
Max Horn
ad7fefd34e map V8 talk opcodes to the right V6 opcodes; however, talking still locks up after the first sentence is uttered (looking into that now); various cleanup; added a guess at VAR_EGO (based on what cmidec says is the 'default_actor')
svn-id: r6176
2002-12-26 21:50:13 +00:00
Max Horn
48c66ba210 fixed save/load; more restructuring of the charset rendering code
svn-id: r6154
2002-12-26 00:21:19 +00:00
Max Horn
fca9ec09e7 moved CharsetRendere into its own header/source file; changed Scumm::_charset into a pointer, to make it possible to use different implementations of it
svn-id: r6147
2002-12-25 21:04:47 +00:00
Paweł Kołodziejski
b64c9ebc2b changed name from _insaneFlag to _smushFrameRate
svn-id: r6136
2002-12-25 16:55:43 +00:00
Max Horn
33cddb4c1c use translateText for V8 print opcodes
svn-id: r6134
2002-12-25 15:04:04 +00:00
Max Horn
004ea9f8eb converted heaps of int16 to int for V8 compatibility; fixed defineArray for V8; added some work in o8_kludge2
svn-id: r6132
2002-12-25 14:46:39 +00:00
Max Horn
fef84f3737 renamed Scumm::charset -> Scumm::_charset
svn-id: r6119
2002-12-25 12:01:04 +00:00
Jonathan Gray
95c8028652 yes they really are the same, one opcode just has a jmp to the other
svn-id: r6092
2002-12-24 02:38:41 +00:00
Max Horn
2da14e0fa1 more V8 opcodes (mostly rerouting to V6 ones)
svn-id: r6088
2002-12-24 00:41:59 +00:00
Max Horn
897fc9a91b and more V8. Now we again hit the charset limit, but this time caused by the script itself :-)
svn-id: r6077
2002-12-23 18:56:43 +00:00
Max Horn
f86eaeaff9 more V8 mods; cleanup
svn-id: r6070
2002-12-23 15:46:53 +00:00
Max Horn
cc5872924e renamed new_1, new_2, new_3 in class Actor
svn-id: r6069
2002-12-23 14:16:43 +00:00
Max Horn
e192142dac resolved some arguments with aquadran about how to go on about this :-). Renamed three v6 opcodes
svn-id: r6068
2002-12-23 12:50:38 +00:00
Max Horn
58f2ee45cd word size for V8 games is 4 bytes, as opposed to 2 bytes in V6/V7 games. Hence we adjust fetchScriptWord - this way we can reuse all sorts of code (and no, this is not really a hack - word size by tradition is something which varies depending on the architecture, so it is even consistent)
svn-id: r6064
2002-12-23 00:23:36 +00:00
Max Horn
1804f44af1 some more V8 opcode flesh
svn-id: r6061
2002-12-22 23:26:10 +00:00
Max Horn
df3c41fa24 added some preliminary V8 work. Nope, it is not useful at all, and it doesn't mean we will have CMI support in this millenium, so don't hold your breath
svn-id: r6060
2002-12-22 21:58:16 +00:00
Max Horn
3ce3a5be5b minor cleanup
svn-id: r6059
2002-12-22 19:14:53 +00:00
Jonathan Gray
352748878a allow subtitles in smush animations to be disabled
svn-id: r6055
2002-12-22 04:07:41 +00:00
Paweł Kołodziejski
7bc67c1a02 increased a little speed of dig demo smush
svn-id: r6047
2002-12-21 20:19:46 +00:00
Paweł Kołodziejski
0182836591 fix smush for compatible with dig demo
svn-id: r6043
2002-12-21 20:05:40 +00:00
Max Horn
c4b6fa7f70 refactoring: use inheritance to mode the relations between the various engine versions. E.g. the V6 opcodes are now in Scumm_v6, the V5 opcodes in Scumm_v5 (from which we now derive v2-v4. which is a bit odd - maybe we should move the v5 opcodes to Scumm_v3 ?)
svn-id: r5994
2002-12-16 12:12:31 +00:00
Max Horn
51b00f4bfc added comparision methods for ScummPoint
svn-id: r5981
2002-12-15 20:53:11 +00:00
Max Horn
e015345870 oops
svn-id: r5979
2002-12-15 17:34:38 +00:00
Max Horn
f4dfa923f7 cleanup - we now know that the frame field in Actor is needed, we just have to figure out how to set it correctly
svn-id: r5978
2002-12-15 17:28:46 +00:00
James Brown
ce4690c7c6 Tidy one or two things up for future V1/V2/V8 SCUMM support.
svn-id: r5915
2002-12-12 16:29:21 +00:00