Commit Graph

154 Commits

Author SHA1 Message Date
Max Horn
08f7ec192e NUM_ACTORS -> _numActors (for consistency)
svn-id: r7489
2003-05-13 23:42:41 +00:00
Max Horn
81bfe8cd51 swapped talkPosX and talkPosY (they were misnamed); factored out some duplicate code in string.cpp; VC warning fix in smush_player.cpp
svn-id: r7481
2003-05-12 22:08: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
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
30ac620bd3 drop shadow cleanup
svn-id: r7163
2003-04-27 18:49:27 +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
ca7c8081a1 Patch #712493: CMI: Object line
svn-id: r6930
2003-04-07 16:04:30 +00:00
Max Horn
ee7ca9e891 obsolete TODOs
svn-id: r6887
2003-03-30 12:52:22 +00:00
Max Horn
0e0fb2e0c3 some comments on actorHit
svn-id: r6878
2003-03-28 23:53:07 +00:00
Max Horn
d89b2be0fc Patch #708384: Off-by-one bug which causes inventory problems in COMI
svn-id: r6852
2003-03-23 19:28:12 +00:00
Paweł Kołodziejski
d434b86ddb split waitForTimer func, update for smush,
btw, switching scalers while playing smush movies doesn't work or at least SDL backend,
it hang on SDL_SetVideo func

svn-id: r6818
2003-03-17 12:32:46 +00:00
Jonathan Gray
9424b0f20e patch #704237 SO_ROOM_NEW_PALETTE implementation which fixes at least the banjo and crypt scenes
svn-id: r6814
2003-03-15 21:28:22 +00:00
Max Horn
8fcdb62f74 Patch #686427: SO_ROOM_SATURATION implementation
svn-id: r6810
2003-03-13 02:23:55 +00:00
Max Horn
6316f83c93 new constant MF_FROZEN; fixed actor unfreeze code
svn-id: r6764
2003-03-08 02:06:56 +00:00
Paweł Kołodziejski
aa3766018f updated copyrights headers
svn-id: r6726
2003-03-06 21:46:56 +00:00
Paweł Kołodziejski
093428ae9a and more cleanup
svn-id: r6718
2003-03-06 17:58:13 +00:00
Jonathan Gray
4c7aaba732 fix typo
svn-id: r6627
2003-02-20 02:10:39 +00:00
Jonathan Gray
d5e8f369a2 change getDateTime to be a v6 opcode, and hopefully not break anything
svn-id: r6619
2003-02-18 00:13:24 +00:00
Max Horn
24cba45574 more access cleanup; also reorderd some method/function declarations in class Scumm
svn-id: r6593
2003-02-08 01:27:21 +00:00
James Brown
f9a4b231da fix drawObject
svn-id: r6561
2003-01-27 07:07:55 +00:00
James Brown
7a4f4636ee Theoretically implement O_DRAW_OBJECT - although it doesn't seem to work
svn-id: r6560
2003-01-27 06:51:26 +00:00
Paweł Kołodziejski
dc7a876136 added "implementation" of imGetMusicPosition
svn-id: r6550
2003-01-26 14:26:03 +00:00
James Brown
00f7e562fd Remove a experimental hack that went in by accident
svn-id: r6549
2003-01-26 11:13:46 +00:00
James Brown
8d9b84b98e Patch 671701: SO_TALK_FREQUENCY
svn-id: r6547
2003-01-26 10:54:34 +00:00
James Brown
3dc0535a6b remove debug copy
svn-id: r6546
2003-01-26 06:23:12 +00:00
James Brown
a0b77e7389 LCA03 sync: Modified version of the untrap patch, debugger
savegame/loadgame changes, attempts at making the ComI save/load screen
(F1) work. The savegame part of the screen does not work due to a crash,
the load part SHOULD... but something resets the saveload flags before
they are processed (help! :)

svn-id: r6545
2003-01-26 06:17:25 +00:00
Paweł Kołodziejski
d942441f7f applied patch #674141: CMI: Smush sync tuning
svn-id: r6537
2003-01-25 12:13:41 +00:00
Jonathan Gray
5c128f1c89 I'm pretty sure 0x98 should be O_DRAW_OBJECT in comi but changing it to o6_isSoundRunning lets you pass that point in the game for now
svn-id: r6523
2003-01-20 06:35:34 +00:00
Jonathan Gray
3e50c97ca6 update assertion to be in line with increased blastTextQueue size
svn-id: r6509
2003-01-19 03:35:17 +00:00
Jonathan Gray
e2ebe7ba63 make v8 smush playing honour _noSubtitles
svn-id: r6507
2003-01-19 01:03:29 +00:00
Paweł Kołodziejski
92a53a5bdf tuned a little comi smush
svn-id: r6498
2003-01-18 15:26:37 +00:00
James Brown
d589ecb14b Small change to make actor talk anims look better
svn-id: r6486
2003-01-16 19:23:55 +00:00
James Brown
b1f1a9e4e9 Some notes regarding actorHit
svn-id: r6482
2003-01-16 13:55:57 +00:00
James Brown
c24c1270f6 Some cleanup, implementation of setKeyScript (F1 now attempts to start the save/load menu, albiet fails due to a crash in BlastText)
svn-id: r6480
2003-01-16 12:47:34 +00:00
James Brown
f4dc8c5b1b Play sfx when used by mumble, et-al. (Eg, Wallys sobbing)
svn-id: r6479
2003-01-16 11:40:47 +00:00
Max Horn
d4122d625f added center mode for blastText (and boy, our charset code is *messy* <sigh>)
svn-id: r6473
2003-01-16 00:47:08 +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
ec006a4357 localvar fix take 2. Note that ship-to-ship combat is still impossible (cannons dont work), but at least it doesnt crash now - you
can use the cheat (shift-v i think)

svn-id: r6471
2003-01-15 16:23:04 +00:00
James Brown
4fde613432 Hack to make Part III start
svn-id: r6467
2003-01-15 13:29:00 +00:00
James Brown
e0d2d9f7a0 Fix inventory in vscroll'ing rooms
svn-id: r6455
2003-01-14 11:59:39 +00:00
James Brown
82347203a7 Stub out a few room subops
svn-id: r6444
2003-01-13 14:22:53 +00:00
Max Horn
020a1c3e2d fixed COMI actor scaling, again
svn-id: r6443
2003-01-13 14:04:41 +00:00
Max Horn
eb9726c497 added V8 scaling code
svn-id: r6440
2003-01-13 01:29:45 +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
2054937003 Implement ComI roomOp
svn-id: r6431
2003-01-12 17:51:12 +00:00
James Brown
f8dce1dc1f Fix ComI inventory crash, properly.
svn-id: r6430
2003-01-12 16:34:05 +00:00
Max Horn
4c7fdebaf2 we don't need the opcode table here anymore
svn-id: r6425
2003-01-12 13:07:40 +00:00
Paweł Kołodziejski
65b161b98c changed to 12 fps for comi smush
svn-id: r6420
2003-01-12 09:49:11 +00:00
Max Horn
47fe35819a don't leak memory each time a smush movie is played in V8 (this also fixes skipping cutscenes)
svn-id: r6410
2003-01-12 01:15:37 +00:00
James Brown
a579558cdb Fix lock/unlock object
svn-id: r6402
2003-01-11 19:21:38 +00:00