Commit Graph

300 Commits

Author SHA1 Message Date
Max Horn
aa2a85de99 fixed bomp cursor in CMI partially - still seeing flickering/tearing/artifacts, though
svn-id: r6124
2002-12-25 12:41:41 +00:00
Max Horn
fef84f3737 renamed Scumm::charset -> Scumm::_charset
svn-id: r6119
2002-12-25 12:01:04 +00:00
James Brown
e1a416c031 Skeleton for hacky font support using Smush's FontRenderer. Doesn't work (uncomment the loadFont line in script_v8 to test).
Aquadran, where are you? :)

svn-id: r6114
2002-12-25 04:30:24 +00:00
Max Horn
1b0963dd76 added (broken) cursor support for V8; enabled bomp drawing
svn-id: r6113
2002-12-25 03:48:27 +00:00
Max Horn
190685dc69 added a map from object names to object ids
svn-id: r6104
2002-12-24 16:10:31 +00:00
Max Horn
6585425c89 set NUM_ACTORS to 80 for COMI; get rid of MAX_ACTORS (use NUM_ACTORS instead); some updates
svn-id: r6086
2002-12-23 23:30:14 +00:00
Paweł Kołodziejski
44bfa413f9 changed numString to numArray
svn-id: r6078
2002-12-23 19:03:08 +00:00
Paweł Kołodziejski
6f5a18228d changed read order of CMI variables (MAXS)
svn-id: r6076
2002-12-23 18:53:04 +00:00
Max Horn
654ed3ff6c more V8 work
svn-id: r6074
2002-12-23 18:30:12 +00:00
Max Horn
58f2ee45cd word size for V8 games is 4 bytes, as opposed to 2 bytes in V6/V7 games. Hence we adjust fetchScriptWord - this way we can reuse all sorts of code (and no, this is not really a hack - word size by tradition is something which varies depending on the architecture, so it is even consistent)
svn-id: r6064
2002-12-23 00:23:36 +00:00
Max Horn
df3c41fa24 added some preliminary V8 work. Nope, it is not useful at all, and it doesn't mean we will have CMI support in this millenium, so don't hold your breath
svn-id: r6060
2002-12-22 21:58:16 +00:00
Max Horn
3ce3a5be5b minor cleanup
svn-id: r6059
2002-12-22 19:14:53 +00:00
Max Horn
060562c277 partial checkin of patch #655594 (handling Y/N questions); cleanup
svn-id: r6042
2002-12-21 12:34:17 +00:00
Max Horn
50f7ffbeb6 got rid of _curVirtScreen and VirtScreen::unk1; added some comments to gfx.cpp; added a hack to enable smooth scrolling in V7 games (note: when I say hack, I mean it, it is buggy as hell and not enabled by default, use at your own risk and don't report problems with it, it's disabled by default)
svn-id: r6037
2002-12-21 01:11:42 +00:00
Marcus Comstedt
83da387eef New savefile backend system (bye bye NONSTANDARD_SAVE...)
svn-id: r6007
2002-12-17 01:15:13 +00:00
Max Horn
99a8e39316 Endy, when I am gonna meet you, I'll have to kick, punch and bite you a bit for using the same name for two entierly different classes, then adding new files (and at the same time not removing obsolete files), and finally using the WRONG BLOODY HEADER. I spent an hour to track this one down
svn-id: r6004
2002-12-16 22:43:37 +00:00
Max Horn
c4b6fa7f70 refactoring: use inheritance to mode the relations between the various engine versions. E.g. the V6 opcodes are now in Scumm_v6, the V5 opcodes in Scumm_v5 (from which we now derive v2-v4. which is a bit odd - maybe we should move the v5 opcodes to Scumm_v3 ?)
svn-id: r5994
2002-12-16 12:12:31 +00:00
Max Horn
20c501ea58 cleanup; reordering stuff in gfx.cpp, trying to group code into logical groups (cursor, bomp, camera, palette, fades)
svn-id: r5985
2002-12-15 23:40:37 +00:00
Max Horn
51b00f4bfc added comparision methods for ScummPoint
svn-id: r5981
2002-12-15 20:53:11 +00:00
Max Horn
df06e3f6fa debugger can now use the console (experimental, and thus disabled by default)
svn-id: r5974
2002-12-15 00:39:33 +00:00
James Brown
7a0a05a49a Commit some junk in-case I don't get time to finish this tonight and Fingolfin starts working on it :)
svn-id: r5949
2002-12-14 10:46:00 +00:00
Max Horn
ddca690c28 cleaned up autosave code
svn-id: r5926
2002-12-13 03:23:17 +00:00
Max Horn
4ca8f4cc48 cleanup
svn-id: r5921
2002-12-13 00:52:14 +00:00
James Brown
ce4690c7c6 Tidy one or two things up for future V1/V2/V8 SCUMM support.
svn-id: r5915
2002-12-12 16:29:21 +00:00
Jamieson Christian
14834cf645 Fixed myriad VC++ compile/link problems.
PLEASE DON'T MAKE CHANGES TO THE ACTUAL PROJECT FILES
UNLESS YOU MAKE THEM FOR *ALL* PRIMARY PORTS!

svn-id: r5900
2002-12-11 01:25:15 +00:00
Max Horn
c168f62bbd cleanup; only now do I see how similiar setupShadowPalette, the new setupShadowPalette and createSpecialPalette are. Throw in remapPaletteColor and darkenPalette and maybe we should restructure the code to have less duplication?
svn-id: r5894
2002-12-09 02:14:17 +00:00
Max Horn
0720fa80c8 cleanup
svn-id: r5893
2002-12-09 01:27:40 +00:00
Max Horn
4ddecdad58 Patch #650085: Make saveload system extensible
svn-id: r5885
2002-12-08 16:14:29 +00:00
Max Horn
95c1f3de15 removed obsolete getDefaultGUIColor and some FIXMEs
svn-id: r5840
2002-12-04 22:34:43 +00:00
Max Horn
df594d41ff even more cleanup
svn-id: r5839
2002-12-04 22:31:36 +00:00
Max Horn
8dd3d2ec29 more cleanup
svn-id: r5837
2002-12-04 21:46:05 +00:00
Max Horn
77a64e0217 more cleanup; fixes out of bound access to _charsetData (but I am not sure if that will be visible anywhere
svn-id: r5833
2002-12-04 15:00:35 +00:00
Max Horn
89335008e9 lots of cleanup to the graphics code; removed various global states (makes it easier to understand the code)
svn-id: r5831
2002-12-04 13:36:27 +00:00
Oliver Kiehl
133f624cc5 moved RNG to common/util.cpp
svn-id: r5778
2002-12-01 14:57:50 +00:00
Max Horn
a730f7f6df more cleanup
svn-id: r5752
2002-11-29 18:27:35 +00:00
Max Horn
72c672e14c cleanup
svn-id: r5747
2002-11-29 15:13:49 +00:00
Max Horn
2edbe505cb cleanup
svn-id: r5718
2002-11-26 12:42:40 +00:00
Max Horn
da5a347d3e completly decoupled engine.h/.cpp from simon.h and scumm.h; removed some static variables from drawFlashlight() and made them members of class Scumm instead
svn-id: r5506
2002-11-10 17:19:43 +00:00
Max Horn
93d5d667d0 added Scumm::displayError() method; make use of that to display errors if save/load failed; changed runDialog() to return the result of Dialog::runModal(); changed the order in which autosave is performed a little bit
svn-id: r5493
2002-11-10 14:59:15 +00:00
James Brown
6e4bc05791 Masking patch
svn-id: r5468
2002-11-08 18:40:12 +00:00
Paweł Kołodziejski
85c7c9ffe6 applied patch: #634326, and changed strip ranges for after and before scumm v7,
added comments to saveload

svn-id: r5448
2002-11-06 17:55:44 +00:00
Max Horn
18153f22c9 why keep a seperate opcode entry & opcode description table if we can have it both in one (note that the descriptions were in fact outdated in some cases! also note, this is really just a refactoring, no functionality is changed except that opcode descriptions are now in sync with the opcode procs, that's why I am commiting this at all)
svn-id: r5445
2002-11-06 16:44:57 +00:00
Max Horn
004afead33 moved some constants from scumm.h to gameDetector.h; this way, we don't have to include scumm.h in gameDetector.cpp (good, as it seperates scumm/ from common/ even more)
svn-id: r5444
2002-11-06 16:01:36 +00:00
Max Horn
63e1069ec1 removed more unused variables; cleaned up some spaces
svn-id: r5442
2002-11-06 15:29:49 +00:00
Max Horn
1974075bb3 removed unused parameters from drawBomp
svn-id: r5440
2002-11-06 14:54:21 +00:00
Max Horn
39b60537c8 removed more typecasts
svn-id: r5438
2002-11-06 14:19:50 +00:00
Paweł Kołodziejski
5d873255ea rewrote akos5 and bomp, corrected pitch in akos16, increased range of gfxbits
svn-id: r5433
2002-11-06 07:28:39 +00:00
Travis Howell
2f270bfd58 Add simon1talkie and simon2talkie targets
svn-id: r5413
2002-11-05 10:36:31 +00:00
James Brown
1c975ba92e Correct that FT opcode - it's bitwise or, not logical
svn-id: r5373
2002-11-02 08:18:21 +00:00
James Brown
959a9acf14 Add support for aliased scummvm config entries.
Eg:
 [germandott]
 path=/games/german/dott
 gameid=tentacle
 description=the german version of DOTT

I havn't finished the Launcher changes to show aliased entries yet, as I need to parse the whole domainmap to do so.

svn-id: r5341
2002-10-28 09:03:02 +00:00
Paweł Kołodziejski
bf3505da5c don't put samples into stream SoundMixer if sound card is disabled
svn-id: r5338
2002-10-27 19:32:36 +00:00
Travis Howell
68fada397e Add simon1demo
svn-id: r5300
2002-10-24 09:40:20 +00:00
Paweł Kołodziejski
a125d1cc1a changed number strips to dynamic and increased arrays tdirty and bdirty to 80
svn-id: r5296
2002-10-24 06:28:54 +00:00
Max Horn
5c54e3533b removed obsolete stuff
svn-id: r5284
2002-10-23 12:03:58 +00:00
James Brown
500be1e535 Make some BOMP'ed Dig events a little more happy
svn-id: r5272
2002-10-23 03:28:06 +00:00
Max Horn
4129aaf3cd removed old GUI code
svn-id: r5271
2002-10-23 00:24:54 +00:00
Max Horn
22f1d049fb get rid of obsolete variable
svn-id: r5245
2002-10-22 13:04:39 +00:00
Max Horn
8af300fec3 The terms Word and DWord are somewhat Windows centric; in fact there are systems on which word is 32bit, as opposed to our 16 bits. Hence, use the uin16/uint32 naming scheme, which is not ambigious
svn-id: r5216
2002-10-21 13:23:25 +00:00
Max Horn
b5f0fa4c8b cleanup; fix for room 88 in The Dig (Ender, I was right, only the place was another :-)
svn-id: r5191
2002-10-20 01:02:52 +00:00
Jonathan Gray
dd7cfdb0de patch #625603 film noir mode bugfix
svn-id: r5190
2002-10-19 22:35:22 +00:00
James Brown
c1652de909 Full Throttle: Add stub for opcode CD (something to do with drawing blast objects)
svn-id: r5163
2002-10-16 10:59:29 +00:00
Paweł Kołodziejski
9a8b23030a fix nexus scrolling in the dig, but partialy, there is also memory coruption with this
svn-id: r5142
2002-10-13 18:14:48 +00:00
Paweł Kołodziejski
4cf42ae9a8 added FT imuse music
svn-id: r5127
2002-10-11 08:35:12 +00:00
Max Horn
b409ef6608 allow user to load savegames while Smush movies are playing; cleanup
svn-id: r5106
2002-10-08 00:29:32 +00:00
James Brown
d19260af2c Fix drawDescString - still needs centering corrections
svn-id: r5094
2002-10-06 07:23:08 +00:00
James Brown
9612002d78 Full Throttle / The Dig fixes.
drawDescString (for Full Throttle object names, in the 'ring of fire') is
still somewhat broken. Feel free to fix ;)

svn-id: r5090
2002-10-06 06:09:32 +00:00
James Brown
4d24a0bfbe Patch #616092: Full Throttle dialog fix
svn-id: r5058
2002-10-01 09:27:09 +00:00
Max Horn
d921d06d39 played a bit with the launcher - it now is already somewhat usable <g>
svn-id: r5047
2002-09-30 00:55:47 +00:00
Paweł Kołodziejski
037b08130e framework of Imuse sound for The Dig
svn-id: r5031
2002-09-29 07:08:31 +00:00
Max Horn
a8d77fabee patch #615842
svn-id: r5027
2002-09-28 15:19:21 +00:00
James Brown
e9c1d9d802 Patch 613933: Return code for validateresource.
svn-id: r5017
2002-09-25 03:04:28 +00:00
Max Horn
1bfaa3c02f removed even the last traces of Scumm dependencies from NewGUI. Yes, you heard right NewGUI is now 100% Scumm free and we can go for the launcher/message dialogs!
svn-id: r5016
2002-09-24 23:45:25 +00:00
James Brown
e946431af3 Patch 609334: PalManip save/load/init fixes.
Save/Load lines are commented out until the new save/load system is in place.

svn-id: r5014
2002-09-24 15:46:09 +00:00
James Brown
412075437b Patch #612847: Sam and Max painting subgame fix
svn-id: r5008
2002-09-23 15:43:29 +00:00
Max Horn
a681eb029e renamec string -> _string and sentence -> _sentence in class Scumm (I originally reworked StringTab, but then noticed the save game format depends on it <sigh>)
svn-id: r4995
2002-09-22 01:17:53 +00:00
Travis Howell
f1a273e092 Add the following patches:
[ 609649 ] Sound patch for GF_OLD256 games
[ 611997 ] RFC: Timer-based CD audio sync

svn-id: r4986
2002-09-21 13:48:03 +00:00
Max Horn
b91da0e29f Patch #612277: text rendering crash + spacing issue
svn-id: r4983
2002-09-20 23:40:55 +00:00
Max Horn
fcfc72296c based on my findings for guifont, I changed string.cpp to read the char width table for OLD256 games! yippi! some more code cleanup, and marked two struct values as 'to be removed when savegame format changes'
svn-id: r4978
2002-09-19 23:49:38 +00:00
Max Horn
9939746022 removed even more scumm dependencies from NewGUI; fixed some redraw issues (this might help the inventory-display issue in The Dig, and definitly fixes the 'vanishing volcanoe' in the FOA extro)
svn-id: r4974
2002-09-19 21:45:56 +00:00
Paweł Kołodziejski
c61b824942 added support for nonenglish the dig(dialogs, descriptions, warnings), not gui yet
svn-id: r4959
2002-09-17 15:33:31 +00:00
James Brown
978e879009 Fix newgui crash, and commit patch 600645: Loom flashlight fix
svn-id: r4958
2002-09-17 12:52:53 +00:00
Paweł Kołodziejski
ab2eb4d928 added framework for non-english version of the dig, not yet completed
svn-id: r4957
2002-09-17 09:18:47 +00:00
Max Horn
733825fd94 patch #609859: Some general patches for string.cpp
svn-id: r4954
2002-09-16 23:48:42 +00:00
Max Horn
a6c5762817 added some comments, cleanup
svn-id: r4950
2002-09-16 10:42:12 +00:00
James Brown
02f9056b4a 609791: Sam and Max 'phantom sound' (precaching) hack.
svn-id: r4947
2002-09-16 08:22:05 +00:00
Max Horn
040b6c656a reducing some header dependencies
svn-id: r4928
2002-09-13 12:20:55 +00:00
Max Horn
364806e4e4 patch #608138 (palManipulateInit code)
svn-id: r4925
2002-09-13 11:54:59 +00:00
Paweł Kołodziejski
dcf05149fe changed scumm file io to class File
svn-id: r4920
2002-09-10 07:34:27 +00:00
Max Horn
523d8e64c0 rewrote config class; cleanup; code restructuring
svn-id: r4903
2002-09-08 01:08:12 +00:00
Paweł Kołodziejski
93b630dcfe commited patch: #601899
svn-id: r4890
2002-08-31 21:23:28 +00:00
Paweł Kołodziejski
0559f7a6aa and more fixes
svn-id: r4889
2002-08-31 19:26:04 +00:00
Max Horn
a39711e256 fixed compilation on Mac OS X; some cleanup; moved header file scumm/smusH/rect.h to common/rect.h
svn-id: r4877
2002-08-31 13:29:10 +00:00
Max Horn
41c2d6fba3 sound system cleanup
svn-id: r4867
2002-08-29 23:45:15 +00:00
Max Horn
4b83c17b31 some cleanup/refactoring
svn-id: r4866
2002-08-29 20:01:27 +00:00
Max Horn
bbcae3efbe experimental support for the V2 resource format (patch #601560)
svn-id: r4864
2002-08-29 16:57:43 +00:00
Paweł Kołodziejski
73b031515e applied patch #599909
svn-id: r4855
2002-08-25 18:40:23 +00:00
Ralph Brorsen
d473d295c4 Fix for #556564
svn-id: r4846
2002-08-25 11:35:13 +00:00
Max Horn
3d75868558 added/corrected some missing opcodes - this fixes the issues with the voodoo lady in MI1VGA
svn-id: r4815
2002-08-24 13:12:29 +00:00
Max Horn
ee3ea28e6c first go at modularizing the build system
svn-id: r4796
2002-08-21 17:35:46 +00:00
Max Horn
ce46866403 Initial revision
svn-id: r4785
2002-08-21 16:07:07 +00:00