281 Commits

Author SHA1 Message Date
Max Horn
f1fc68773d made stuff in class Sound protected where possible; moved readCreativeVocFile to imuse_digi.cpp and turned it into a static function; put the DigitalTrackInfo stuff into sound.cpp (keeping it private); removed #includes from sound.h (this cuts down interdependencies a little)
svn-id: r8493
2003-06-15 00:54:14 +00:00
Max Horn
c04f39304b don't incorrectly treat SO_PRINT_WRAP like SO_PRINT_MUMBLE; rather just ignore it
svn-id: r8406
2003-06-09 00:46:32 +00:00
Max Horn
49b9a8fc9d follow our coding conventions
svn-id: r8377
2003-06-07 00:49:36 +00:00
Max Horn
3baff34226 use enqueueText for FT, too
svn-id: r8284
2003-06-02 23:54:52 +00:00
Max Horn
35f29951eb moved blast text code to string.cpp
svn-id: r8282
2003-06-02 23:18:52 +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
ac02e3d0d0 cleanup
svn-id: r8194
2003-05-31 21:42:33 +00:00
Max Horn
7ffb40e61b cleanup
svn-id: r8193
2003-05-31 21:25:14 +00:00
Max Horn
1c0da0a89c apply V6 elevation change to V8, too
svn-id: r8186
2003-05-31 17:18:41 +00:00
Max Horn
f8e64d7134 renamed walk_script/talk_script -> walkScript/talkScript
svn-id: r8178
2003-05-31 14:27:47 +00:00
Max Horn
691e1f390a rewrote Actor::needBgReset related code (this could cause regressions...)
svn-id: r8126
2003-05-30 00:55:21 +00:00
Max Horn
03609cc465 cleanup; added hackish fix for bug #744441
svn-id: r8048
2003-05-28 14:01:54 +00:00
Max Horn
af2574c02d fixed o8_getStringWidth (should fix bug #741625)
svn-id: r8035
2003-05-27 15:33:38 +00:00
Max Horn
18eca52743 added FIXME comment
svn-id: r8026
2003-05-26 22:37:18 +00:00
Torbjörn Andersson
8feba0dfaf cleanup
svn-id: r7866
2003-05-23 15:48:07 +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
c78664cbc9 renamed talkFrame1/talkFrame2 to talkStartFrame/talkStopFrame
svn-id: r7819
2003-05-22 09:58:33 +00:00
Max Horn
86d57f3c7a many pedantic warning fixes (and some actual potential buglets fixed, too)
svn-id: r7795
2003-05-21 18:09:49 +00:00
Jonathan Gray
280e8a0741 make fingolfin happy :)
svn-id: r7777
2003-05-21 10:38:45 +00:00
Jonathan Gray
b6dcd5cfae don't error out here to prevent a crash, is the check in softUserputon actually valid here?
svn-id: r7771
2003-05-21 07:13:52 +00:00
Max Horn
1a394aa3c7 added enum's for the known actor/object claasses; extended putClass/getClass to translate the X/Y flip classes; made code use the new enum's; some other cleanup
svn-id: r7753
2003-05-20 20:42:28 +00:00
Max Horn
5ac005860c warning() automatically outputs a newline after the warning message; adding a newline into the format string adds another newline (which contains the single char '!')
svn-id: r7647
2003-05-18 21:14:50 +00:00
Max Horn
7171c5bcd4 cleanup
svn-id: r7646
2003-05-18 21:03:57 +00:00
Max Horn
4b82ea54cb output a warning if ignoreTurns is set (so that we can find out where it is used)
svn-id: r7551
2003-05-15 22:57:53 +00:00
Max Horn
f4c7f37743 Make use of ScummVM::Rect
svn-id: r7546
2003-05-15 22:30:32 +00:00
Max Horn
f495c14d84 opcodes are just one byte
svn-id: r7513
2003-05-14 20:37:53 +00:00
Max Horn
feee742268 added opcode 0xf7 (getActorZPlane)
svn-id: r7497
2003-05-14 10:16:57 +00:00
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