Commit graph

165 commits

Author SHA1 Message Date
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
Max Horn
0d0c25d764 rest of patch #655594: Handling Y/N questions
svn-id: r6784
2003-03-09 02:41:35 +00:00
Max Horn
c739960176 added yet another sanity check (assert); fixed long standing evil bug in getObjNewDir / getObjOldDir
svn-id: r6763
2003-03-08 00:56:43 +00:00
Max Horn
12d09b57b5 ah yeah, I did that on purpose. Really. Just wanted to check if everybody is paying attention
svn-id: r6757
2003-03-07 22:44:25 +00:00
Max Horn
992b4f479f cleanup toSimpleDir: should be easier to understand this way, and hopefully fixes the valgrind warnings
svn-id: r6755
2003-03-07 21:56:38 +00:00
Paweł Kołodziejski
243c4ffbc0 implemented formating string error for each engine
svn-id: r6744
2003-03-07 15:38:11 +00:00
Max Horn
22e6d4581b fixed OOB acces (thx valgrind)
svn-id: r6731
2003-03-07 02:19:26 +00:00
Paweł Kołodziejski
093428ae9a and more cleanup
svn-id: r6718
2003-03-06 17:58:13 +00:00
Max Horn
bc60419fa6 if a script triggers a load, immediatly perform it (this also covers the case where the user requests a load while a SMUSH video is playing. This avoids the annoying affect of seeing 1 frame of the old room immediately after you requested the load
svn-id: r6687
2003-03-04 03:18:12 +00:00
Max Horn
89f6ebb77c added some asserts; added a hack that helps the COMI demo
svn-id: r6684
2003-03-04 02:43:43 +00:00
Jonathan Gray
0af6652b0b enable newgui f5 dialog for comi as per erik's patch
svn-id: r6676
2003-03-03 22:32:02 +00:00
Max Horn
f4e147e5d2 removed the single big VersionSettings list; instead, the simon & scumm modules now keep their target lists seperatly (and when we add BASS, it can have its own target list)
svn-id: r6652
2003-03-01 22:04:48 +00:00
Jonathan Gray
af19cac738 patch #689164 comi verb coin hack by erik, fixes the verb coin drawing behind the inventory
svn-id: r6642
2003-02-27 10:17:29 +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
Jonathan Gray
80bd149156 add ability to specify language for comi see scummvm -h for possible values
svn-id: r6567
2003-01-29 08:07:10 +00:00
James Brown
d1eb2636f4 Patch 671031: Fix for MI1 intro crash + others (move new object
clearing code into a more generic function, and call it earlier)

svn-id: r6548
2003-01-26 10:57:01 +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
James Brown
5f7cd1c93d LCA'03 commit: Fix talking where no sound hardware is present
svn-id: r6536
2003-01-24 06:41:10 +00:00
James Brown
945dee311e Possible hack to get the cannons firing. Of course... well, they still don't quite work :)
svn-id: r6487
2003-01-17 07:20:54 +00:00
James Brown
4e07c1bb91 Patch 668634: Actor iteration fix
svn-id: r6484
2003-01-16 17:37:34 +00:00
James Brown
355d079a30 Dumb, dumb, DUMB typo. :)
svn-id: r6481
2003-01-16 13:10:43 +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
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
0b46f85b7e Early init of the scaler - to prevent ComI trying to use a huge window by default.
This may require porters to make a small backend change, not to reinit a scaler on hotswap if the display has not been init_size'ed.

svn-id: r6449
2003-01-13 18:59:53 +00:00
Max Horn
d900d280c0 fixed checkRange output; added checkRange call to drawObject; cleanup
svn-id: r6447
2003-01-13 15:27:06 +00:00
Max Horn
e704837f5c fix off by one error
svn-id: r6442
2003-01-13 13:37:43 +00:00
Max Horn
eb9726c497 added V8 scaling code
svn-id: r6440
2003-01-13 01:29:45 +00:00
James Brown
f8dce1dc1f Fix ComI inventory crash, properly.
svn-id: r6430
2003-01-12 16:34:05 +00:00
Max Horn
5db47f56d0 fix for the COMI inventory crash
svn-id: r6426
2003-01-12 13:40:12 +00:00
James Brown
74f01de444 Fix game-specific scalers overriding global... when game started from Launcher
svn-id: r6414
2003-01-12 06:44:59 +00:00
Max Horn
02ff516590 scaling bug fix
svn-id: r6349
2003-01-06 18:46:07 +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
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
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
Max Horn
7f15b5d08b more cleanup
svn-id: r6292
2002-12-31 14:59:06 +00:00
Max Horn
b231ef38f0 fix COMI transparency color (but maybe there is a replacement for TRNS in V8?)
svn-id: r6287
2002-12-31 04:19:10 +00:00
Max Horn
bac0245250 added V8 support to drawVerbBitmap - not even sure if that is used in COMI, though
svn-id: r6286
2002-12-31 03:32:06 +00:00
Max Horn
5d4f06cf1f implemented object drawing (still somewhat broken, we get a 'green screen' effetc :-). Oh yes, this probably breaks save game compatibility for COMI. Oh yeah. As if I would care <g>
svn-id: r6285
2002-12-31 03:26:02 +00:00
Max Horn
166ea5bcee get rid of DUMP_SCRIPTS; in its place, added run time option '-u' to enabled script dumping
svn-id: r6284
2002-12-31 02:09:57 +00:00
Max Horn
ceac475714 cleanup
svn-id: r6262
2002-12-29 19:54:11 +00:00
James Brown
88bb10ee25 Fix silly typo - thanks max :)
svn-id: r6253
2002-12-29 17:07:45 +00:00
James Brown
056feec44c override var was wrong, update mouse click code
svn-id: r6250
2002-12-29 15:06:44 +00:00
James Brown
669e5b8ebc de-verbalise some debug messages (move from debug(1) to debug(2)).. so we can see printDebug lines easier
svn-id: r6227
2002-12-28 12:42:55 +00:00
Max Horn
2367625da4 cleanup
svn-id: r6187
2002-12-27 00:58:21 +00:00
Max Horn
c05a308fad doSentence only takes three params in V8
svn-id: r6179
2002-12-26 23:05:19 +00:00
Paweł Kołodziejski
2046fc8217 fixed compilation under VC6
svn-id: r6165
2002-12-26 02:13:19 +00:00
Max Horn
a43355a1bf reuse the old (ugly nasty dreaded) string system for V8, too (by supplying a NUT based CharsetRenderer)
svn-id: r6162
2002-12-26 01:47:40 +00:00
James Brown
d8839f1be6 Don't go to the save/load screen
svn-id: r6157
2002-12-26 01:15:25 +00:00
Max Horn
48c66ba210 fixed save/load; more restructuring of the charset rendering code
svn-id: r6154
2002-12-26 00:21:19 +00:00