Commit Graph

2890 Commits

Author SHA1 Message Date
Max Horn
2d97c1f40c fixed regression caused by changes to akos code
svn-id: r6353
2003-01-07 20:21:39 +00:00
Max Horn
eaf2e1a313 more akos/costume merging
svn-id: r6352
2003-01-07 17:35:20 +00:00
James Brown
08d34d17c0 Skeleton for actor debugger commands - current command is useful for states where actors in CMI get stuck with "I can't reach it"
type stuff. :)

svn-id: r6351
2003-01-07 09:46:51 +00:00
James Brown
6426833420 CMI cannon hack
svn-id: r6350
2003-01-07 08:16:55 +00:00
Max Horn
02ff516590 scaling bug fix
svn-id: r6349
2003-01-06 18:46:07 +00:00
Max Horn
9270a0558b some chore/limb related code
svn-id: r6348
2003-01-06 16:04:01 +00:00
Max Horn
37a64f5d12 cleanup; added a hack to avoid crash in the canon scene (at least it works this way for me)
svn-id: r6347
2003-01-06 13:41:29 +00:00
Max Horn
f1d1076fd7 oops
svn-id: r6346
2003-01-06 02:18:27 +00:00
Max Horn
c80f082490 fix talking in The Dig
svn-id: r6345
2003-01-06 02:10:45 +00:00
Max Horn
82edaeaaf1 unified function names (compared to V8); added some FIXME comments
svn-id: r6344
2003-01-06 01:53:38 +00:00
Max Horn
d9515432e4 started unifying code in akos.cpp and costume.cpp
svn-id: r6343
2003-01-05 23:53:16 +00:00
Max Horn
a0d4234e89 fix redraw bug in the Dig (when Cmdr Low stands in front of the sparks in the nexus); changed startAnimActor slightly (not fully sure if this is now right or if the previous code was right <sigh>
svn-id: r6342
2003-01-05 22:38:44 +00:00
Max Horn
ca8ddd6c6e changed 'default case' warning output to hex (as we use that for the case labels)
svn-id: r6341
2003-01-05 22:17:26 +00:00
Max Horn
8d8580545b added TODO
svn-id: r6340
2003-01-05 22:16:19 +00:00
Max Horn
a6d89ad7fd fix for the cannon scene
svn-id: r6339
2003-01-05 22:16:09 +00:00
Max Horn
65fdb8fbf0 cleaned up & documented the transitionEffect() code a bit
svn-id: r6338
2003-01-05 21:18:53 +00:00
Travis Howell
e8b784e18a This isn't a fixme
svn-id: r6337
2003-01-05 12:38:04 +00:00
Travis Howell
3224d39f65 Alter fix me comment
svn-id: r6336
2003-01-05 12:20:31 +00:00
Travis Howell
6414e9a255 Remove fixme
svn-id: r6335
2003-01-05 10:40:44 +00:00
Travis Howell
c502a72f6e Fix error in my last commit
svn-id: r6334
2003-01-05 00:58:30 +00:00
Travis Howell
98578cbfff Small cleanup
svn-id: r6333
2003-01-05 00:47:49 +00:00
Max Horn
c2f816b246 use proper C++ now so that it compiles again on GCC 3
svn-id: r6332
2003-01-04 19:11:45 +00:00
James Brown
fb02e1f227 Small junk
svn-id: r6331
2003-01-04 15:08:30 +00:00
Travis Howell
338569587b Simon update
svn-id: r6330
2003-01-04 13:39:28 +00:00
Travis Howell
0704d6657e Add extra target for simon2demo
svn-id: r6329
2003-01-04 09:02:47 +00:00
Travis Howell
b989a3a934 Fix crashes in simon2dos/talkie caused by my music changes awhile back.
svn-id: r6328
2003-01-04 08:46:10 +00:00
Travis Howell
5111eede5e Don't crash if sound effect file doesn't exist
svn-id: r6327
2003-01-03 12:33:53 +00:00
Travis Howell
3a4782f166 Add olki's patch for sound effects in simon1dos
Plus hack to allow choice between midi music and sound effects via 's' key

svn-id: r6326
2003-01-03 12:06:30 +00:00
Travis Howell
f1365f4f2b Don't show scumm version number when starting Simon games
svn-id: r6325
2003-01-03 11:14:21 +00:00
Travis Howell
758dca49c9 Improve error message when data files are missing
svn-id: r6324
2003-01-03 10:36:13 +00:00
Travis Howell
303acc02bb Remove sion 1 music warning
Change warning about missing vga file to error

svn-id: r6323
2003-01-03 04:24:16 +00:00
James Brown
9df455ce38 Plop in some better disk switching code for CMI - I have no idea how well this will work transitioning from a disk1 room to a disk2
room in-game, but it works for bootparams and saved games..

svn-id: r6322
2003-01-02 10:36:17 +00:00
James Brown
3c3c5bb574 implement temporary state saving for CMI
svn-id: r6321
2003-01-02 08:39:33 +00:00
Max Horn
50b3e798b6 oops... wrong fix in the wrong spot
svn-id: r6320
2003-01-01 21:51:12 +00:00
Max Horn
7fa5fe38a7 fixed VAR_TALKSTOP_KEY
svn-id: r6319
2003-01-01 21:37:27 +00:00
Max Horn
d59dc6cf17 endian fix
svn-id: r6318
2003-01-01 20:59:59 +00:00
Max Horn
535ad0a4cf moved Scumm::faceActorToObj to Actor::faceToObject; moved various functions in script.cpp (grouping cutscene/override related stuff)
svn-id: r6317
2003-01-01 18:22:41 +00:00
Max Horn
53a8fc24fe fixed cutscene override in V8; cleanup
svn-id: r6316
2003-01-01 17:57:14 +00:00
Max Horn
0ab1edf809 added an assert against the z plane count; resolved an ambigious statement (the order in which the post-increment operator is executed is not specified in the C(++) standard); indentation cleanup
svn-id: r6315
2003-01-01 17:04:13 +00:00
Max Horn
d88bd87153 3 * 320 = 960, not 800
svn-id: r6314
2003-01-01 16:51:13 +00:00
Jonathan Gray
53ba3e7cee change detected game to trying to start game as this message is displayed even when there aren't any resource files in the specified directory
svn-id: r6313
2003-01-01 16:07:08 +00:00
James Brown
b5d0e48695 implement roomops case (CMI crypt)
svn-id: r6312
2003-01-01 11:38:59 +00:00
James Brown
158951dbd9 Clean up the code a little.
For some reason blast objects 188/189 are misbehaving, specifically you get a crash when talking to the voodoo lady. hit escape using
this save: http://www.enderboi.com/misc/comi.s04 - I can't work out how the heck an association is created to begin with..

svn-id: r6311
2003-01-01 11:25:04 +00:00
James Brown
be8810eaa9 Fix CMI room segfaults (too few zbuffers defined)
svn-id: r6310
2003-01-01 09:02:36 +00:00
Paweł Kołodziejski
b429b0c0bd changed to binary
svn-id: r6309
2003-01-01 08:08:46 +00:00
Paweł Kołodziejski
6c9be14999 changed into binary
svn-id: r6308
2003-01-01 08:04:57 +00:00
Jonathan Gray
48c7919ee9 change the zero key to mean slot 10 instead of 0 (autosave) when using save/load hotkeys. feature request #660500
svn-id: r6307
2003-01-01 07:12:57 +00:00
Travis Howell
df1577d842 Microsoft VC++ dsp and sw files should be commited in binary mode!
svn-id: r6306
2003-01-01 06:41:17 +00:00
Travis Howell
b0334747f3 *** empty log message ***
svn-id: r6305
2003-01-01 06:40:38 +00:00
Max Horn
805c460543 added yet another variable (for mouse-button-hold flags). Now the 'verb widget' shows up, though it is not erased properly
svn-id: r6304
2003-01-01 02:56:22 +00:00