Commit graph

133 commits

Author SHA1 Message Date
Max Horn
9f272a2acf fixed o2_getActorX / o2_getActorY (thanks MadMoose)
svn-id: r7564
2003-05-16 02:33:08 +00:00
Max Horn
7d08aea4cc SentenceTab unk4/unk3 are the sentence objects (think of: 'Use objectA with objectB' or 'Give objectA to objectB' etc.); added a little more V2 sentence hackery; added a FIXME regarding some strange sentence code (accessing objectB before it is set) in script.cpp
svn-id: r7562
2003-05-16 02:16:59 +00:00
Max Horn
e1652fedea hackish partial doSentence support
svn-id: r7560
2003-05-16 01:56:06 +00:00
Max Horn
f495c14d84 opcodes are just one byte
svn-id: r7513
2003-05-14 20:37:53 +00:00
Max Horn
d7352e8e19 fixed V2 decodeParseString
svn-id: r7508
2003-05-14 14:22:15 +00:00
Max Horn
a4915a3304 default text color light blue instead of pink
svn-id: r7506
2003-05-14 14:00:29 +00:00
Max Horn
45b2698b24 cleanup
svn-id: r7503
2003-05-14 13:32:43 +00:00
Max Horn
bc99915aa5 V2 text drawing
svn-id: r7502
2003-05-14 13:30:52 +00:00
Jonathan Gray
50a857a406 make gcc with extra extra warnings happy
svn-id: r7501
2003-05-14 12:32:40 +00:00
Max Horn
d8048837f3 fixed v2 verb handling
svn-id: r7500
2003-05-14 12:26:23 +00:00
Max Horn
08f7ec192e NUM_ACTORS -> _numActors (for consistency)
svn-id: r7489
2003-05-13 23:42:41 +00:00
Max Horn
e5f8056d88 cleanup / tweaks (V2 masking, at least in Zakdemo, seems not to work properly, though)
svn-id: r7429
2003-05-11 11:13:24 +00:00
Max Horn
79d3863db4 more V2 'char coord' fixes
svn-id: r7427
2003-05-11 00:03:03 +00:00
Max Horn
bf270d9243 walkbox & putActor coords in V2 are in 'character coordinates' - x has to multiplied by 8 and y by 2
svn-id: r7426
2003-05-10 23:47:39 +00:00
Max Horn
acb35fc915 renamed _scrWidth/_scrHeight -> _roomWidht/_roomHeight, and _realWidth/_realHeight -> _screenWidth/_screenHeight (inspired by MadMoose, but I'll take the blame - still this seems much more logical & intuitive)
svn-id: r7423
2003-05-10 21:49:59 +00:00
Max Horn
e5fe73726a cleaned up / fixed some V2 state stuff
svn-id: r7422
2003-05-10 21:35:06 +00:00
James Brown
c126cf2df8 Fix intro room transition. Seems correct, so the fixme is really just explanitory.
svn-id: r7403
2003-05-09 05:55:11 +00:00
Max Horn
88c1f3ac18 fixed V2 drawObject
svn-id: r7400
2003-05-09 01:01:53 +00:00
Max Horn
bb4f806954 cleanup
svn-id: r7399
2003-05-09 00:57:10 +00:00
Max Horn
c63ec9d008 added a v2 charset rendered (with a hardcoded font take from german zak); enabled verbs in zak (well, they are drawn at least :-)
svn-id: r7398
2003-05-08 22:44:46 +00:00
Max Horn
98881c3a6a init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning
svn-id: r7393
2003-05-08 15:48:50 +00:00
Max Horn
07bbeb31e9 fixed o2_resourceRoutines
svn-id: r7391
2003-05-08 14:14:37 +00:00
James Brown
68f821c67d Hack: Turn on ignore walkboxes in V2 to stop intro freezing. Remove when we have V2 walkbox support (ugh...)
svn-id: r7388
2003-05-08 06:17:30 +00:00
Jonathan Gray
5a735f825d can get up to zak sleeping bit now...
svn-id: r7363
2003-05-06 01:20:09 +00:00
Max Horn
ac0897515d unified o?_isEqual, too (but not as nice due to hack)
svn-id: r7340
2003-05-05 09:25:07 +00:00
Max Horn
fa0df19a1d cleanup / reduced code duplication
svn-id: r7339
2003-05-05 09:19:15 +00:00
Jonathan Gray
6d19dcdc82 fix bug pointed out by segra
svn-id: r7330
2003-05-05 05:20:45 +00:00
Max Horn
9659a4b4ed V2 verbop fix (read verb name from script)
svn-id: r7327
2003-05-04 20:07:32 +00:00
Max Horn
5b08534324 cleanup / fixes
svn-id: r7323
2003-05-04 17:39:25 +00:00
James Brown
775cfc4b4f ... right revision this time...
svn-id: r7310
2003-05-04 04:34:48 +00:00
James Brown
e829d618c8 Some V2 stuff
svn-id: r7309
2003-05-04 04:30:49 +00:00
Max Horn
2397d2599e make readVar debug output slightly more useful
svn-id: r7304
2003-05-04 02:39:59 +00:00
Max Horn
aa74ea1d5c yet more v2 fixes & cleanup
svn-id: r7302
2003-05-04 02:27:22 +00:00
Max Horn
488d5fe351 more v2 fixes; cleanup
svn-id: r7301
2003-05-04 02:10:49 +00:00
Max Horn
3b77249ab0 cleanup; got rid of o2_printEgo
svn-id: r7300
2003-05-04 01:10:45 +00:00
Max Horn
7a2de47ce3 fixed o2_delay
svn-id: r7298
2003-05-04 00:41:52 +00:00
Max Horn
0ce5658d66 o5_dummy -> o2_dummy (it's not used by the V5 code at all...)
svn-id: r7297
2003-05-04 00:29:52 +00:00
Max Horn
4065f23844 decode string properly in o2_printEgo
svn-id: r7296
2003-05-04 00:26:39 +00:00
James Brown
f51b4387d1 hack around v2 o2_delay problem
svn-id: r7284
2003-05-03 15:08:10 +00:00
James Brown
e3ca8320c1 .. er, let's try that again
svn-id: r7276
2003-05-03 06:49:49 +00:00
James Brown
362a5580d6 o2_actorSet fix from forum
svn-id: r7275
2003-05-03 06:48:26 +00:00
Max Horn
4ce574f579 cleanup
svn-id: r7215
2003-04-30 11:15:11 +00:00
Jonathan Gray
7529493778 get rid of one of the obscure variable names
svn-id: r7171
2003-04-28 03:13:49 +00:00
Paweł Kołodziejski
d9c8751168 some fixes to v2 opcodes
svn-id: r7153
2003-04-27 11:38:38 +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