Commit graph

143 commits

Author SHA1 Message Date
Martin Kiewitz
54ec4654e9 SCI: new music code / removed unused sz from Track struct
svn-id: r46503
2009-12-23 16:21:32 +00:00
Martin Kiewitz
fd861aaac4 SCI: new music code / variable-names changed to make it more verbose
svn-id: r46502
2009-12-23 16:17:42 +00:00
Filippos Karapetis
fa859f6ab1 Directly modify the sound objects, instead of modifying a local copy. Remove duplicate code (which now resides in resource.*)
svn-id: r46427
2009-12-20 13:13:07 +00:00
Filippos Karapetis
0c1b646c7f - Started wrapping the current sound code around appropriate defines
- Introduced a new resource type, SoundResource, used in the new music code

svn-id: r46421
2009-12-19 16:19:53 +00:00
Max Horn
51933629d1 Changed foo(void) to foo() in almost all non-backend source files
svn-id: r45616
2009-11-02 21:54:57 +00:00
Filippos Karapetis
04ab6bc9fc Enclose all of the old graphics code within the INCLUDE_OLDGFX safeguard (defined in sci.h)
svn-id: r45459
2009-10-28 13:20:30 +00:00
Max Horn
3399c3aeb6 Change doxygen inline comments from "//!" to "///" as proposed on -devel
svn-id: r44802
2009-10-08 21:28:57 +00:00
Filippos Karapetis
13ad217cdd - Moved the SCI version in a global variable
- Changed all the SCI version checks to use getSciVersion()
- Also made getSciVersionDesc a global function (removes some ugly accessing of the SCI engine)

The fallback detector should work correctly now

svn-id: r44269
2009-09-23 10:55:35 +00:00
Max Horn
8e28469f1f Coding best practice: Always use enums instead of #defines to define integer constants (for many good reasons)
svn-id: r43881
2009-09-01 13:02:47 +00:00
Walter van Niftrik
fff023794f SCI: Cleanup
svn-id: r43811
2009-08-30 01:37:27 +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
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
8bd4cee2d2 SCI: Add autodetection of Amiga views.
svn-id: r43547
2009-08-19 21:08:17 +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
65ac355efa Removed the maxMemory parameter of the resource manager and replaced it with a define
svn-id: r43503
2009-08-18 09:12:41 +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
Walter van Niftrik
83e541900d SCI: Fix regression in previous commit (QFG2).
svn-id: r43450
2009-08-16 19:19:26 +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
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
Filippos Karapetis
74670cc834 Removed the superfluous sci_version_types array (it's essentially the same as the versionNames array)
svn-id: r42216
2009-07-07 12:29:55 +00:00
Filippos Karapetis
c716e43a2b - Added auto-detection for EGA graphics. As a result of this, GF_SCI1_EGA has been removed and versions SCI_VERSION_01_EGA and SCI_VERSION_01_VGA have been merged into SCI_VERSION_01
- Simplified the checks for EGA and VGA graphics
- Fixed a bug in script_adjust_opcode_formats()
- Simplified the code in GfxResManager::getView() a bit

svn-id: r42206
2009-07-07 07:44:25 +00:00
Filippos Karapetis
b093511239 - Merged the "early" and "late" SCI1 versions - these are functionally equivalent, and the code that does the version check is unreliable (e.g. it sets SQ1 VGA to SCI1 "late" and EcoQuest 1 to SCI1 "early")
- Cleanup of the vocabulary setting functions
- Cleanup of the cursor manipulation code

svn-id: r42097
2009-07-04 16:30:20 +00:00
Walter van Niftrik
1fb78d577f SCI: Moved audio code from AudioResource to the sfx core.
svn-id: r41486
2009-06-12 23:46:23 +00:00
Walter van Niftrik
5e68fbfe87 SCI: Moved SCI1 audio map handling into the resource manager.
svn-id: r41408
2009-06-09 19:18:48 +00:00
Walter van Niftrik
f2fe13b064 SCI: Cleanup
svn-id: r41368
2009-06-08 12:20:36 +00:00
Walter van Niftrik
a6ed05740f SCI: Moved resource36 handling into resource manager.
svn-id: r41349
2009-06-07 19:15:55 +00:00
Walter van Niftrik
e3d3195a43 SCI: Resmgr cleanup and preparations for moving resource36 handling into resmgr.
svn-id: r41318
2009-06-07 02:18:38 +00:00
Walter van Niftrik
61a7b7c625 SCI: Moved the handling of 65535.map into the resource manager.
svn-id: r41205
2009-06-06 00:07:18 +00:00
Max Horn
fa02e0df7b SCI: Made some members of class Resource protected; some cleanup
svn-id: r41180
2009-06-04 22:16:31 +00:00
Walter van Niftrik
a440d77408 SCI: Added support for early SCI1.1 audio maps.
svn-id: r41170
2009-06-04 15:56:11 +00:00
Walter van Niftrik
6e079f7ea8 SCI: Added some of the missing pieces for speech support in CD games. It now partially works.
svn-id: r41146
2009-06-03 18:43:22 +00:00
Filippos Karapetis
b43094cec0 - Added brief Doxygen comments to the ResourceSync and AudioResource classes to explain what they do
- Removed the outdated info page on "codebugging"
- Moved the "addresses" info page as a comment above parse_reg_t()
- Removed con_hook_page()

svn-id: r41013
2009-05-29 17:39:55 +00:00
Filippos Karapetis
74e87bf05d Some WIP code on the speech used in KQ6CD
svn-id: r40996
2009-05-29 13:52:10 +00:00
Max Horn
32975b25f4 SCI: cleanup
svn-id: r40959
2009-05-28 11:15:09 +00:00
Filippos Karapetis
780899fb0e Rewrote the Audio stream parser. The introduction of KQ6 should work more correctly now (apart from Cassima's speech)
svn-id: r40904
2009-05-26 10:02:25 +00:00
Filippos Karapetis
16d6499617 WIP code for the speech in the floppy version of KQ6 (still needs work)
svn-id: r40894
2009-05-25 19:57:09 +00:00
Filippos Karapetis
d59796fb54 Objectified the AudioResource code (used for speech and digitized music in CD talkie games)
svn-id: r40880
2009-05-25 10:30:19 +00:00
Max Horn
bba91075bf removed trailing whitespaces
svn-id: r40742
2009-05-20 17:53:31 +00:00
Walter van Niftrik
df3357159c SCI: Added some stubs for LSL6CD (lores).
svn-id: r40719
2009-05-19 02:10:58 +00:00
Filippos Karapetis
87e8f94fde - Moved all the files out of /sci/scicore and into /sci
- Moved /scicore/sciconsole.h into /engine, and renamed /engine/scriptconsole.cpp to /engine/sciconsole.cpp

svn-id: r40608
2009-05-15 14:07:45 +00:00
Renamed from engines/sci/scicore/resource.h (Browse further)