Commit graph

2906 commits

Author SHA1 Message Date
Max Horn
80fde14548 indention
svn-id: r6369
2003-01-09 14:50:35 +00:00
James Brown
8a4a521aae All source and no headers make blah a blah blah blah.
svn-id: r6368
2003-01-09 13:52:59 +00:00
Paweł Kołodziejski
030c305943 disabled ifs
svn-id: r6367
2003-01-09 09:05:05 +00:00
James Brown
2cefb8a4a8 Disable smush again, and apply patch 664890 ('Silencing the music')
svn-id: r6366
2003-01-09 08:23:44 +00:00
James Brown
819a96d05b Patch 664895: Cannon fixes. Porters, this requires a new OSystem interface function
svn-id: r6365
2003-01-09 08:07:13 +00:00
James Brown
b946f08105 Patch 664895: Cannon fixes. Yippie. Anyone here familiar enough with SDL to comment on the fullscreen hack?
svn-id: r6364
2003-01-09 08:06:35 +00:00
Max Horn
531e73418f our File class already makes sure we find stuff in the resource subdirectory. Plus, it handles different cases right. So now COMI works from CD on Mac OS X, too
svn-id: r6363
2003-01-08 23:41:27 +00:00
James Brown
ecb9c2dd74 HACK alert: Don't crash due to this silly verbage bug
svn-id: r6362
2003-01-08 22:47:44 +00:00
James Brown
ca5b32132b enable smush. things arn't exactly working properly yet, and there are some bad memory accesses going on... but it's progress :)
svn-id: r6361
2003-01-08 22:43:03 +00:00
James Brown
f8ef5ee55f subcode lvl3:0xFD fix. this sub writes into oob+1 memory :/
svn-id: r6360
2003-01-08 22:31:35 +00:00
Paweł Kołodziejski
26076d9301 added buffer hack
svn-id: r6359
2003-01-08 21:39:21 +00:00
Max Horn
5ec6e87a68 fix warnings
svn-id: r6358
2003-01-08 21:29:37 +00:00
James Brown
ad3d662680 fix compile
svn-id: r6357
2003-01-08 21:05:56 +00:00
Paweł Kołodziejski
cd20655700 codec47: fixes in opcode FD
svn-id: r6356
2003-01-08 20:46:25 +00:00
Paweł Kołodziejski
28433a8888 added missing: d_src++
svn-id: r6355
2003-01-08 20:22:01 +00:00
Paweł Kołodziejski
1b32dad123 implementation of codec47 in Smush CMI.
it's NOT WORKING yet, and also is needed cleanup code after finishing them

svn-id: r6354
2003-01-08 16:41:23 +00:00
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