5234 Commits

Author SHA1 Message Date
Lars Skovlund
9a0b6ad69a SCI: Add resource manager support for SCI3 games.
ScummVM now rejects them properly instead of spewing lots of
unintelligible stuff. 

svn-id: r54155
2010-11-09 14:25:39 +00:00
Filippos Karapetis
1e9407be3f SCI: Added comments for rev. 54150 and fixed a typo
svn-id: r54153
2010-11-09 11:57:54 +00:00
Lars Skovlund
53a4a64b16 treat pushSelf opcode with low bit set as pushSelf (in fangames only, currently). Fixes bug #3038686.
(SCI Fanmade - Circus Quest: Crash when starting).

svn-id: r54150
2010-11-09 10:07:34 +00:00
Max Horn
059944e59c COMMON: Push #include audiocd.h in system.h out to .cpp files
svn-id: r54148
2010-11-08 23:07:42 +00:00
Max Horn
82e473bc3b BACKENDS: Partial merge of gsoc2010-opengl: Audio CD changes only
This commit contains the AudioCDManager changes from the gsoc2010-opengl
branch. The other changes in that branch are restricted to the backends
directory only (plus configure).

The Nintendo DS and Dreamcast ports still need to be ported over to
the new Audio CD system, but that should be fairly easy to do.

svn-id: r54147
2010-11-08 22:53:36 +00:00
Filippos Karapetis
8504e30dac SCI2: Added some currently unused code for drawing text on a buffer
svn-id: r54143
2010-11-08 16:12:58 +00:00
Filippos Karapetis
d8eefdb52a SCI/SCI2: Some slight changes to the graphics code
- Changed the SCI1 EGA games workaround in kGraphDrawLine() to match the ones in kGraphFillBoxAny() and kNewWindow, updating the relevant comments
- Added some comments in kSetShowStyle()

svn-id: r54142
2010-11-08 16:09:59 +00:00
Lars Skovlund
416025cda9 Fix assertion failure in SCI0 saving code
svn-id: r54138
2010-11-08 11:02:43 +00:00
Filippos Karapetis
05eb352e5c SCI: Bugfix for script workarounds
Get the English versions of objects and methods when checking for script
workarounds, as the objects/methods could be translated. Fixes bug #3104623,
"PQ3: Crash when click on City map"

svn-id: r54134
2010-11-08 00:41:39 +00:00
Filippos Karapetis
5de2668939 SCI: Some changes regarding the string heap in saved games
- Maintain the state of the string heap space in saved games
- Merged SegManager::reconstructScripts() inside SegManager::saveLoadWithSerializer()
- Disabled a now unnecessary script patch for the cipher puzzle in Castle of Dr. Brain, and performed some cleanup for another disabled patch
- Removed direct access to the _baseObj variable of objects

svn-id: r54133
2010-11-08 00:18:34 +00:00
Willem Jan Palenstijn
e065a8a797 SCI: Fix blend rounding, style
svn-id: r54093
2010-11-05 12:33:07 +00:00
Filippos Karapetis
2416cbf75b COMMON/GUI/SCI: Changes to the EGA dithering checkbox
- Changed the new dithering checkbox to be more generic (i.e. relevant for all engines that may support such a feature in the future)
- Changed the checkbox to be unchecked by default. As discussed on -devel, game enhancements in ScummVM should be off by default, and opt-in
- Changed the option from "sci_undither" to "disable_dithering"
- Changed theme version style to X.Y.Z and bumped it to 0.8.2

svn-id: r54090
2010-11-05 10:53:37 +00:00
Johannes Schickel
8c997e2608 SCI: Add a default case to a switch statement to silence some compiler warnings.
svn-id: r54078
2010-11-05 00:10:26 +00:00
Filippos Karapetis
7d71d07075 SCI: Renamed findBlock() to findBlockSCI0()
svn-id: r54077
2010-11-04 23:19:23 +00:00
Willem Jan Palenstijn
51f7c4c525 SCI: Fix precedence error in comment
svn-id: r54071
2010-11-04 19:45:38 +00:00
Filippos Karapetis
5bab2d570b SCI: Set undither to on by default again, like it was.
From our current stance, this is a game enhancement, and should be on by default, like the rest of the game enhancements (AGI mouse, save/load replacement etc)

svn-id: r54070
2010-11-04 19:19:07 +00:00
Willem Jan Palenstijn
7e6aa1b4a9 SCI: Use gamma 2.2 for blending undithered colours
svn-id: r54069
2010-11-04 19:17:44 +00:00
Martin Kiewitz
bb716c23fa SCI: adding force to memorial area for SQ3/intro
makes the view getting fully undithered

svn-id: r54068
2010-11-04 18:37:03 +00:00
Filippos Karapetis
1dac4fbd55 SCI/SCUMMVM: Added an option to enable the dithering removal algorithm (so called "undithering") in the graphics options tab. The algorithm is now disabled by default, after popular demand. In retrospect, we really shouldn't have made it default, in order to preserve the authenticity of the graphics in early SCI EGA games, and allow the user to opt in and enable the option if needed. Unfortunately, the lack of an easy way to modify the option made it hard to do so.
svn-id: r54066
2010-11-04 15:58:53 +00:00
Filippos Karapetis
db133990e9 SCI: Properly cast the results of kTimesSin and kTimesCos to 16-bit integers
svn-id: r54042
2010-11-02 16:07:22 +00:00
Max Horn
ba3e826872 SCI: Remove any use of printf
svn-id: r54037
2010-11-02 09:49:47 +00:00
Martin Kiewitz
130365ef0d SCI: fixing port restoring
- recalculate _freeCounter
- dont push disposed windows onto windowlist

svn-id: r54017
2010-11-01 20:08:42 +00:00
Martin Kiewitz
a46b1adeae SCI: fixing bug when restoring ports
fixes assert

svn-id: r54016
2010-11-01 19:56:01 +00:00
Filippos Karapetis
3d431a215f SCI: Fixed a silly bug when restoring port rectangles. This uncovered a bug with the recently added port save/restore code
svn-id: r54015
2010-11-01 19:42:00 +00:00
Martin Kiewitz
548e67f413 SCI: fixing lf
(stupid msvc)

svn-id: r54014
2010-11-01 16:42:54 +00:00
Martin Kiewitz
eefa151d70 SCI: saving/restoring script created windows now
fixes "GfxPorts::kernelSetActive" error
based on code by [md5]

svn-id: r54012
2010-11-01 16:09:33 +00:00
Max Horn
9a350f4398 ENGINES: Get rid of some (f)printfs
svn-id: r54011
2010-11-01 16:04:47 +00:00
Max Horn
a984fb17c2 GUI: Add GCC_PRINTF to GUI::Debugger::DebugPrintf & fix resulting warnings
svn-id: r54007
2010-11-01 16:03:35 +00:00
Max Horn
e27b05ef35 COMMON: Rename String::printf() to String::format()
This is a first step towards getting rid of all uses of regular printf,
fprintf, vprintf, vfprintf, puts, fputs, etc. in our codebase.

The name format() reflects the purpose of the function, and parallels
String.format() in Java, boost::format, and others.

svn-id: r54004
2010-11-01 16:02:28 +00:00
Filippos Karapetis
e3dfadc6c1 SCI: Fix for bug #3100292 - "QFG2: signature mismatch at the WIT"
svn-id: r53993
2010-10-31 23:34:36 +00:00
Filippos Karapetis
43221a3253 SCI: Removing obsolete function parameter
svn-id: r53986
2010-10-31 20:57:50 +00:00
Max Horn
3df411df66 MOTOEZX: Fix warning about static not at beginning of declaration
svn-id: r53981
2010-10-31 17:23:53 +00:00
Filippos Karapetis
dca3c8d8bf SCI: Play time related changes
- Added support for savegame play time
- Removed obsolete variables for calculating the play time (EngineState::gameStartTime and Console::_enterTime)
- Renamed some variables to camelCase

svn-id: r53974
2010-10-31 01:45:24 +00:00
Andrew Kurushin
f1ed9c9a6f SCI: add Russian SQ4 & SQ5
svn-id: r53955
2010-10-30 19:51:17 +00:00
Filippos Karapetis
bf44b0e545 SCI: Fixed script bug #3098353 - "ECOQUEST1 German: Crash at the blackboard in the dolphin room"
svn-id: r53941
2010-10-30 11:21:28 +00:00
Filippos Karapetis
ef7cc2d506 SCI: Fixed detection of fan made script patches for LSL1
svn-id: r53940
2010-10-30 11:07:44 +00:00
Johannes Schickel
6aec3882a4 SCI: Remove unused variable + some formatting fixes.
svn-id: r53921
2010-10-29 16:28:22 +00:00
Filippos Karapetis
5cfb461b5b SCI: Added detection of some fan made script patches.
When such a script patch is found, a dialog pops up at the beginning
of the game, asking the user to remove it. The issues that these
script patches fix have already been fixed in ScummVM, thus these
patches aren't necessary, plus they can lead to crashes, freezes, buggy
behavior and/or unexpected errors, thus it is better if they aren't
used at all, if possible

svn-id: r53920
2010-10-29 10:58:54 +00:00
Filippos Karapetis
509f79990d SCI: Updated kSetShowStyle signature for SCI2.1. SQ6 starts again
svn-id: r53919
2010-10-29 10:28:20 +00:00
Filippos Karapetis
88ad2d3991 SCI: Fixed a detection entry of Hoyle 1 (bug report #3090841)
svn-id: r53913
2010-10-28 23:59:37 +00:00
Filippos Karapetis
d7f8fc108e SCI: Updated help page on the new console command "map_instrument"
svn-id: r53910
2010-10-28 22:58:39 +00:00
Filippos Karapetis
b3e42b94c9 SCI: Added some missing GM mappings for MT-32 instruments:
- MT-32 Castanets -> GM Claves
- MT-32 OneNoteJam -> GM Celesta
- MT-32 JungleTune -> GM Pan Flute
For PQ3 (from rev #53902, not in the commit description):
- MT-32 Warm Pad -> GM Pad 2 (warm)

Thanks to digitall and waltervn for their help with these

svn-id: r53907
2010-10-28 18:45:11 +00:00
Filippos Karapetis
27c52434ba SCI: Split the GM related names out of map-mt32-to-gm.h and into a separate header file
svn-id: r53906
2010-10-28 16:26:04 +00:00
Filippos Karapetis
408d0e6c5f SCI: Fixed typo
svn-id: r53905
2010-10-28 15:33:28 +00:00
Filippos Karapetis
0e7444a463 SCI: Fixed compilation and added include safeguards to map-mt32-to-gm.h
svn-id: r53904
2010-10-28 15:27:44 +00:00
Filippos Karapetis
a7b5133903 SCI: Improved the description of the "map_instrument" console command a bit. Also, the dynamic mappings are now checked before the static ones
svn-id: r53903
2010-10-28 13:00:21 +00:00
Filippos Karapetis
3a4647dc50 SCI: Several changes related to MT-32 -> GM mapping
- Changed C - style comments in map-mt32-to-gm.h to C++ - style comments
- Added a new dynamic MT-32 -> GM mapping, complementary to the normal one, which can be done on the fly using the new console command "map_instrument"
- The "show_instruments" command has been moved to the music section and now displays the instruments of the game which aren't in the MT32-> GM mapping

svn-id: r53902
2010-10-28 12:48:51 +00:00
Filippos Karapetis
8a08ca1f39 SCI: Cleanup, invoking pauseEngine() on Console::preEnter() and Console::postEnter()
svn-id: r53890
2010-10-27 21:43:08 +00:00
Filippos Karapetis
e85f43877a SCI: Proper pausing/resuming of MIDI music in SciEngine::pauseEngineIntern(), Console::preEnter() and Console::postEnter() and added a sanity check in SciEngine::getDebugger()
svn-id: r53886
2010-10-27 19:22:37 +00:00
Martin Kiewitz
bd7d9965e9 SCI: removing unneeded call
was a left-over from debugging

svn-id: r53857
2010-10-26 20:56:55 +00:00