Max Horn
0954fc1dac
cleanup
...
svn-id: r10620
2003-10-05 17:32:38 +00:00
Max Horn
d7660a2662
introduced namespace Scumm; made #include statements use scumm/ prefix explicitly
...
svn-id: r10571
2003-10-03 18:33:57 +00:00
Max Horn
3f55f2669d
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace)
...
svn-id: r10549
2003-10-02 22:42:03 +00:00
Max Horn
0e645f88ae
renamed namespace ScummVM to Common
...
svn-id: r10544
2003-10-02 17:43:02 +00:00
Torbjörn Andersson
570e60a487
Whitespace changes
...
svn-id: r10390
2003-09-24 06:33:59 +00:00
Max Horn
abdc8f1247
cleanup
...
svn-id: r10311
2003-09-19 14:13:24 +00:00
Max Horn
6512592d0f
moved Actor x/y to _pos.x/_pos.y -> this makes it much easier to grep for access of the actor position
...
svn-id: r10253
2003-09-14 18:16:45 +00:00
Max Horn
dff4f8f445
my TODO was correct ;-) fixes regression in Zak
...
svn-id: r10188
2003-09-12 00:07:42 +00:00
Max Horn
6c4d6889f5
hum, why was this not commited by CVS?
...
svn-id: r10175
2003-09-11 14:11:31 +00:00
Travis Howell
a323d65cc3
Should redraw in both cases.
...
svn-id: r10170
2003-09-11 12:48:02 +00:00
Max Horn
81f10baa68
cleanup
...
svn-id: r10169
2003-09-11 10:32:15 +00:00
Max Horn
87dd04e038
fix for bug #776807 (MM: Jail Door Closes). Our doSentence implementation should now be pretty close to what the original does. But regressions are possible...
...
svn-id: r10161
2003-09-10 17:15:44 +00:00
Max Horn
1080dac5ac
instead of abusing the 'recursive' attribute to flag V2 background scripts, use the freezeResistant attribute. This is a bit more consistent. Also, verb 254 should stop *any* sentence script, not just background ones; some cleanup
...
svn-id: r10159
2003-09-10 15:02:58 +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
Max Horn
f8f678d98d
updated commented out to work again
...
svn-id: r10014
2003-09-05 20:18:28 +00:00
Jonathan Gray
b5ece53748
cleanup and make script_v2 use o5_saveLoadGame
...
svn-id: r9941
2003-08-31 15:39:27 +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
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
63e89e5882
Fix room colors in v1 zak
...
svn-id: r9869
2003-08-26 15:56:37 +00:00
Travis Howell
285570f0d3
This fix should be v2 only
...
Update comment
svn-id: r9858
2003-08-25 14:17:34 +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
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
c284e1b507
This is only require for v1 maniac
...
svn-id: r9781
2003-08-19 11:11:11 +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
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
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
d91320f7ce
Remove debug
...
svn-id: r9760
2003-08-18 11:09:11 +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
4c6bd7167d
Fix v1 zak costume colors
...
svn-id: r9748
2003-08-18 02:16:48 +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
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
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
Travis Howell
5a963767bf
Fix subtitles colors in V1 maniac
...
svn-id: r9713
2003-08-16 05:45:19 +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
Jonathan Gray
101821015c
remove debug printf
...
svn-id: r9598
2003-08-08 09:26:09 +00:00
Max Horn
995ec987d0
fix warning, cleanup code
...
svn-id: r9511
2003-08-05 17:58:38 +00:00
James Brown
386b8216df
Make prepositions work
...
svn-id: r9505
2003-08-05 16:57:47 +00:00
Max Horn
10508d4d2b
fix warning / whitespace
...
svn-id: r9504
2003-08-05 16:51:40 +00:00
James Brown
7cbb06c4a6
Forgot some V1 prep code
...
svn-id: r9503
2003-08-05 16:48:56 +00:00
James Brown
173e3c5db3
V1 preposition support, but broken.
...
svn-id: r9502
2003-08-05 16:43:33 +00:00
Max Horn
c3c39a33c3
cleanup for some comments & indention
...
svn-id: r9341
2003-07-31 18:46:31 +00:00
Max Horn
becd70d243
cleanup: encapsulate some more members of class Actor, and rename newDirection -> targetFacing (since it corresponds to the future value of 'facing'; the distinction between 'facing' and 'direction' is extremly fuzzy)
...
svn-id: r9175
2003-07-24 17:44:00 +00:00
Torbjörn Andersson
9db2d93614
Slight cleanup of previous commit.
...
svn-id: r9147
2003-07-23 14:36:18 +00:00
Torbjörn Andersson
e66bdf91b9
Allow the sentence line to be 40 printable characters long. The verb part
...
is padded with '@', which should not be counted.
svn-id: r9146
2003-07-23 14:33:57 +00:00
Max Horn
2cee32864a
fix spanish prepositions, see bug #772277 . And BTW, does anybody know when and where the 'on/mit/sur/su/en' preposition is actually used?
...
svn-id: r9116
2003-07-22 01:14:09 +00:00
Paweł Kołodziejski
d516f3467c
updated opcode "Actor Set Color" in o2_ActorSet func, it's based on dissassembly, why it was "i = 3" ?
...
svn-id: r9082
2003-07-19 16:10:15 +00:00
Jochen Hoenicke
077b643ea0
Fix recursive calls of object scripts. In V2 for each object two script
...
can be active at the same time: One 253 script and one normal script.
We misuse the recursive flag to mark 253 scripts. When starting a 253
script we stop a script that has recursive flag set and when starting
a normal script we stop the script that doesn't.
svn-id: r9068
2003-07-18 18:55:04 +00:00