Commit graph

225 commits

Author SHA1 Message Date
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
Max Horn
2aa8cc496d fix for bug #771734
svn-id: r9041
2003-07-15 18:18:29 +00:00
Max Horn
d0282843b5 Patch #771154 (ZAK: yet another doSentence fix); this should fix bug #752293
svn-id: r9030
2003-07-15 00:23:18 +00:00
Jochen Hoenicke
177d5d6b11 Compares in V2 are unsigned (at least in Zak).
This fixes a problem with the parachute scene in Zak.

svn-id: r9020
2003-07-14 19:57:44 +00:00
Max Horn
5031b62871 proper fix for V1/Zak (and maybe V1/MM, too?) ActorSet-Color
svn-id: r9018
2003-07-14 18:20:20 +00:00
Travis Howell
89cc9ede19 Ooops, was in reverse.
svn-id: r8998
2003-07-14 06:19:06 +00:00
Travis Howell
e6f3eb9aa5 A few color fixes for v1/v2
svn-id: r8997
2003-07-14 06:14:49 +00:00
James Brown
9b55abbf49 V1 Zak fixes and hacks. (Woo, it rhymes! :)
svn-id: r8996
2003-07-14 06:00:17 +00:00
Travis Howell
ffddfd76d9 Add correct palette for pc versions of v1 games
Add some correct colors for v1 games

svn-id: r8988
2003-07-13 15:13:43 +00:00
Max Horn
7189b0a11a fix for bug #770311 (at least for V2 games)
svn-id: r8959
2003-07-12 22:46:23 +00:00
Max Horn
adf9331624 properly show/hide verbs&inventory&sentence during cutscenes
svn-id: r8957
2003-07-12 22:33:03 +00:00
Max Horn
d35c57a53f fixes for cutscenes in V2 games
svn-id: r8956
2003-07-12 22:00:59 +00:00
James Brown
90bac4a5ce Fix compilation, V1 verb positions
svn-id: r8880
2003-07-09 14:57:15 +00:00
Max Horn
a609989008 fix o2_loadRoomWithEgo regression (this bug was uncovered by my previous adjustXYToBeInBox improvment)
svn-id: r8713
2003-07-02 14:21:13 +00:00
Max Horn
302f67e43f fix for bug #752865: MM: Man-Eating Plant is invisible
svn-id: r8708
2003-07-02 11:26:13 +00:00
James Brown
00d5c5af89 Add a few more actor debugger subcommands, and correct V2 coordinate translation for
o2_(get/set)ActorElevation

svn-id: r8683
2003-07-01 04:20:41 +00:00
Max Horn
5477d0831b turn error in o2_saveLoadGame into warning
svn-id: r8575
2003-06-21 01:44:47 +00:00
Max Horn
0bee591ae6 added spanish font & prepositions; removed some trailing spaces
svn-id: r8549
2003-06-19 10:29:38 +00:00
Max Horn
f4a31da513 runHook -> runInventoryScript, VAR_HOOK_SCRIPT -> VAR_INVENTORY_SCRIPT
svn-id: r8468
2003-06-14 12:23:30 +00:00
Paweł Kołodziejski
0c85e713ac init costumes for v1 games
svn-id: r8378
2003-06-07 04:24:57 +00:00
Max Horn
49b9a8fc9d follow our coding conventions
svn-id: r8377
2003-06-07 00:49:36 +00:00
Max Horn
86df3537b9 replaced GF_AFTER with _version
svn-id: r8372
2003-06-07 00:13:26 +00:00
Max Horn
62e3a110dd added a currently disabled hack that can be used to get costumes used in V1 games (currently crashes since we don't support that custome format yet)
svn-id: r8349
2003-06-06 11:59:29 +00:00
James Brown
c89b04488d Get rid of *64 targets, use 'maniac' and 'zak' autodetection for the AFTER_V1 flag instead.
svn-id: r8348
2003-06-06 10:47:12 +00:00
Travis Howell
bc9a04b0cf Add MANIAC64 to these two MANIAC checks
svn-id: r8291
2003-06-04 13:15:06 +00:00
Max Horn
4292d621af cleaned up the restart/pause/shutdown situation a bit; added comment that explains how restart might be implemented
svn-id: r8260
2003-06-02 02:25:24 +00:00
Max Horn
5202a59c63 some setObjectName changes. I'd really like to switch V2-V5 to use rtObjectName resources, too
svn-id: r8171
2003-05-31 12:17:58 +00:00
Max Horn
498a30f0b7 V2 verb highlighting (good one, erik :-)
svn-id: r8140
2003-05-30 14:06:28 +00:00
Max Horn
b8e943a67e cleanup
svn-id: r8056
2003-05-28 19:54:46 +00:00
Max Horn
8d4b2bbf73 fixed o2_waitForSentence
svn-id: r8047
2003-05-28 13:28:43 +00:00
Max Horn
29a25f66f2 italian V2 prepositions
svn-id: r8039
2003-05-27 23:28:41 +00:00
Max Horn
80eab4c3c4 hook language command switch to V2 font / prepositions
svn-id: r7970
2003-05-25 20:38:44 +00:00
Max Horn
30d9dde76c preparations for multi-language V2 supports
svn-id: r7966
2003-05-25 18:56:20 +00:00
Max Horn
9d95b025cd fixed roomOps:1 (thanks to Hoenicke)
svn-id: r7894
2003-05-24 17:18:23 +00:00
Jonathan Gray
9b0e0d14db we want a word not a byte for object numbers, bug pointed out by Hoenicke
svn-id: r7882
2003-05-24 10:39:13 +00:00
Max Horn
c333b6d6ec replaced many unsafe uses of derefActorSafe by derefActor; replaced derefActorSafe/assert pairs by derefActor (gives better error message); replaced various derefActorSafe/if(a!=0) pairs by derefActor (in cases where the deref should never fail, ever, except due to a bug in ScummVM)
svn-id: r7859
2003-05-23 13:24:41 +00:00
Max Horn
bdaefa6727 don't hardcode 9 but rather use the default actor talk color as given in the (v2) bootscript
svn-id: r7856
2003-05-23 12:07:36 +00:00
James Brown
73c6cf8bc9 Patch #742132: o2_setobjectname script overwrite fix
svn-id: r7854
2003-05-23 06:35:47 +00:00
Max Horn
ddd0b6aa69 fixed butterknife + cashcard
svn-id: r7843
2003-05-23 01:14:29 +00:00
Max Horn
9e58883009 added two more redrawV2Inventory invocations; removed calls to runHook (it does nothing in V2)
svn-id: r7842
2003-05-23 00:59:46 +00:00
Max Horn
edf5946c40 some well placed asserts (triggering any of those means with 99% a bug in some other place; so don't just remove the asserts if you trigger one of 'em!
svn-id: r7840
2003-05-23 00:22:41 +00:00
Max Horn
47246c35b3 this fixme doesn't seem to be needed anymore
svn-id: r7839
2003-05-23 00:04:17 +00:00