ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
86,814 Commits 45 Branches 139 Tags
578a6794de9ba7679966fee9aec02c6b2bdbce94
Commit Graph
4076 Commits
Author SHA1 Message Date
Matthew Hoops 6a50e6dc7f Oops! Missed a comma. 
svn-id: r43753
 2009-08-26 06:28:12 +00:00
Filippos Karapetis c212b5ad1d Disabled the signature checks for kNewWindow and kGetEvent, which are different in Mac versions. At least, Mac versions should start now 
svn-id: r43747
 2009-08-25 23:39:06 +00:00
Filippos Karapetis f7acc7f669 Fixed compilation when ENABLE_SCI32 is not set 
svn-id: r43744
 2009-08-25 23:15:18 +00:00
Matthew Hoops b5da8a5cdc - Split SCI_VERSION_32 into SCI_VERSION_2, SCI_VERSION_2_1, and SCI_VERSION_3 (each version has a different kernel table). 
- Improve map detection.
- Fix SCI32 object and script initialization (Torin's Passage and GK1 scripts now start up, and probably most SCI2/2.1 games).
- Add SCI2 and SCI2.1 kernel tables.

svn-id: r43742
 2009-08-25 23:02:57 +00:00
Filippos Karapetis 97e0293dfd When opening files, open the English language part of the filename. Fixes some multilingual SCI1 games 
svn-id: r43730
 2009-08-25 18:27:55 +00:00
Filippos Karapetis ac025f4294 - Replaced more cases of EngineState parameters 
- Made some version comparisons for old SCI0 versions easier to read
- Removed the GET_SEL32SV macro

svn-id: r43729
 2009-08-25 15:14:29 +00:00
Filippos Karapetis eb83ca267d Silenced warnings (thanks wjp) 
svn-id: r43725
 2009-08-25 09:02:00 +00:00
Filippos Karapetis ed66cad677 - Simplified the parameters of some functions 
- Replaced some EngineState parameters
- The SCI version is now obtained from the resource manager or the segment manager, thereby simplifying several functions
- Plugged 2 leaks in the fallback detector
- Renamed the segment manager and resource manager to "segmentManager" and "resourceManager" in all places, for consistency

svn-id: r43722
 2009-08-25 08:38:14 +00:00
Walter van Niftrik 4c8c31d769 SCI: Fix interpretation of ShowMovie speed argument. 
svn-id: r43718
 2009-08-25 00:18:11 +00:00
Walter van Niftrik d5f61d13b6 SCI: Reverted r40889. New fix for window erasing issue in SCI1.1 games. 
svn-id: r43711
 2009-08-24 21:56:54 +00:00
Walter van Niftrik 7359c8f968 SCI: Read class table from vocab resource instead of scanning. This fixes 
several "invalid selector" VM crashes caused by duplicate classes.

svn-id: r43680
 2009-08-24 01:59:58 +00:00
Filippos Karapetis 60af2db2fd - Added more mappings from Sierra's internal IDs to our own ones. Hopefully, all SCI0-SCI11 games can now be detected correctly from the fallback detector 
- Simplified some checks for old script types

svn-id: r43678
 2009-08-23 21:57:30 +00:00
Walter van Niftrik a7ab084ecf SCI: Fix for the "Memory fragmented" dialogs popping up in some games. 
svn-id: r43572
 2009-08-20 21:18:52 +00:00
Joost Peters 6a3c595b01 remove \n's from error() calls 
svn-id: r43571
 2009-08-20 21:03:03 +00:00
Matthew Hoops 83835ce93c Add a static selector table for use with the lsl5 demo. 
svn-id: r43566
 2009-08-20 18:25:55 +00:00
Matthew Hoops 0a6161233b Remove useless include guard 
svn-id: r43564
 2009-08-20 17:12:46 +00:00
Walter van Niftrik c3462a8c76 SCI: Add partial support for Amiga SCI1 games. 
svn-id: r43549
 2009-08-19 21:10:24 +00:00
Johannes Schickel 2f162c72c9 Comment out unused function (which was also currently only enabled when SCI32 is enabled). 
svn-id: r43528
 2009-08-19 07:13:29 +00:00
Filippos Karapetis db0cd620f6 Started rewriting the SCI engine to use FSNode instead of file names. This is the proper solution for removing the hack in the fallback detector, but it still needs work. Also, reduced the things needed to be initialized a bit, so that the detection is a bit faster 
svn-id: r43510
 2009-08-18 14:10:31 +00:00
Filippos Karapetis ca9bbce9b3 - Added game ID detection to the fallback detector. We still need to map some of Sierra's internal IDs to our own ones 
- The class table is now created in the segment manager constructor

svn-id: r43504
 2009-08-18 10:01:18 +00:00
Walter van Niftrik 2fc7660e43 SCI: Fix kernel table for multilingual SCI01 games. Cleanup. 
svn-id: r43497
 2009-08-17 23:11:25 +00:00
Walter van Niftrik 4b9bfe2013 SCI: Build fix. 
svn-id: r43483
 2009-08-17 16:07:47 +00:00
Walter van Niftrik 260a2019b6 SCI: Add autodetection for DoSound. Cleanup. 
svn-id: r43482
 2009-08-17 15:49:22 +00:00
Johannes Schickel 71c9700420 Fix compilation of the SCI engine. It seems that all of the SCI header files I touched (and probably others I luckily didn't touch) seem to assume that files including them will supply needed types. That looks like a major issue in SCI. Someone with knowledge of the SCI code should look into this and cleanup the includes of *all* SCI headers. 
svn-id: r43459
 2009-08-17 07:36:08 +00:00
Filippos Karapetis c38f58598b - Simplified some functions to accept only the parts of the EngineState they need as parameters, instead of the whole EngineState 
- Moved the class table in the Segment manager - it's the only class using it directly
- Removed the sci11 flag from save games (we already know this, we don't need to store it)
- Moved script_get_segment() and get_class_address() inside the segment manager class
- Removed the script_locate_by_segment wrapper
- Simplified script_lookup_export() a lot by removing some paranoia checks
- Added some WIP code for automatically determining the game id in the fallback detector (still not working)
- General cleanup

svn-id: r43458
 2009-08-17 05:55:21 +00:00
Walter van Niftrik 00f4794c0a SCI: Stage 1 of the game detection overhaul. The end goal is to autodetect 
as much as possible. All SCI_VERSION_* information was removed from
detection.cpp (much of it was incorrect anyway).

svn-id: r43449
 2009-08-16 19:18:19 +00:00
Walter van Niftrik 5709e524f9 SCI: Rename sci_version_t to SciVersion 
svn-id: r43407
 2009-08-15 12:09:47 +00:00
Walter van Niftrik f99932b72a SCI: Added enum for map and volume versions. Removed res_version setting from 
detection.cpp (should be detectable). Cleanup.

svn-id: r43390
 2009-08-15 00:28:59 +00:00
Walter van Niftrik 65e9ae163f SCI: Added a crude speed throttler. 
svn-id: r43289
 2009-08-11 20:18:15 +00:00
Walter van Niftrik 353e9fb36a SCI: Turn off logging in debugger. 
svn-id: r43268
 2009-08-11 12:57:51 +00:00
Walter van Niftrik 867b1c2b4d SCI: Fix warnings. 
svn-id: r43218
 2009-08-10 18:43:15 +00:00
Walter van Niftrik dd9e569325 SCI: Improved multilanguage support for SCI1 and SCI1.1. 
svn-id: r43217
 2009-08-10 18:37:47 +00:00
Max Horn 50cd2750cc SCI: Avoid using perror (it's not portable) 
svn-id: r42866
 2009-07-28 22:28:40 +00:00
Willem Jan Palenstijn 3c8e328e5c SCI: check shouldQuit() in main loop 
svn-id: r42609
 2009-07-19 10:50:14 +00:00
Willem Jan Palenstijn 8cb1cbfa7a SCI: Fix breakpoints 
svn-id: r42599
 2009-07-18 22:46:07 +00:00
Willem Jan Palenstijn a1bb715611 SCI: Fix stepping in debugger 
svn-id: r42587
 2009-07-18 12:51:12 +00:00
Filippos Karapetis 31a0c80905 Moved the kernel and the vocabulary outside of the engine state (they're static data, which never changes during a game) 
svn-id: r42398
 2009-07-11 23:45:54 +00:00
Filippos Karapetis 116d225411 Changed an incorrect warning back to scidprintf - the relevant message is for testing only 
svn-id: r42394
 2009-07-11 19:38:41 +00:00
Willem Jan Palenstijn 8dd3492194 SCI: don't let TimerSongIterator loop forever, and don't immediately 
signal completion when starting it. This fixes a sync issue with
the departing spaceship at the start of SQ4CD (after the intro).

svn-id: r42385
 2009-07-11 15:00:40 +00:00
Travis Howell 9594beb39f Only error out, if checkStaticSelectorNames() fails. 
svn-id: r42376
 2009-07-11 07:03:28 +00:00
Filippos Karapetis 2b5fac58d5 Applied patch 2818733 - "SCI: Timer iterator for audio resources played via doSound" 
svn-id: r42375
 2009-07-11 06:53:39 +00:00
Filippos Karapetis 0b47fa50ae Applied a slightly modified patch from clone2727 which adds static selector names to some demos which are missing them (KQ4, LSL1, LSL3, Iceman and Christmas1992) 
svn-id: r42372
 2009-07-11 06:33:19 +00:00
Filippos Karapetis 763c6c8ca1 Fixed regression in the script parser from commit 42260 
svn-id: r42371
 2009-07-11 06:19:29 +00:00
Filippos Karapetis 982153e0ab restAdjust should be a signed integer. Fixes crashes with SCI1 games that take absolute lofs parameters (a regression of commit #42260) 
svn-id: r42297
 2009-07-09 15:46:26 +00:00
Filippos Karapetis 5ca94c5cce - Moved printObject inside the Console class 
- Enabled the parts where disassemble() is called

svn-id: r42263
 2009-07-08 13:08:51 +00:00
Filippos Karapetis d351c7b9cb Only the kernel needs to be initialized before anything else, when saving/loading 
svn-id: r42262
 2009-07-08 10:44:25 +00:00
Filippos Karapetis a764f274f8 Fixed saving/loading again (broken with the latest changes for game feature auto-detection) 
svn-id: r42261
 2009-07-08 10:35:51 +00:00
Filippos Karapetis 62499054a0 Some cleanup for the script debugger code: 
- Renamed struct DebugState to ScriptState and r_amp_rest to restAdjust inside EngineState. Changed restAdjust to be a uint16 (actually it is a uint16, but it was being casted back and forth from an unsigned integer, so this clears up its type and size)
- Moved the script state variables from inside the run_vm() into the ScriptState struct, so that they can be accessed by the console commands and the script debugger all the time, and removed the weird isValid code

svn-id: r42260
 2009-07-08 10:25:37 +00:00
Filippos Karapetis a62b26ea80 Silenced the very chatty song iterator console messages by converting them to appropriate debug messages 
svn-id: r42240
 2009-07-07 20:43:27 +00:00
Filippos Karapetis ab8c3d56b8 Removed the weird checks for a maximum resource number (the sci_max_resource_nr array), as it doesn't serve any real purpose and leads to strange errors: if a resource is found which is bigger than the maximum number, it will be remapped to an incorrect number from this check. This makes KQ5CD work properly again (resources would be remapped to incorrect resource numbers from this code as a result of not updating this array with the latest SCI version merges). 
svn-id: r42219
 2009-07-07 13:39:24 +00:00