5002 Commits

Author SHA1 Message Date
Walter van Niftrik
97067a75db SCI: Allow paths along the edge of the screen in kAvoidPath.
Paths along the edge of the screen are now taken as a last resort. Fixes
bugs #3047418 and #3059595.

svn-id: r54199
2010-11-11 11:24:12 +00:00
Filippos Karapetis
203ff5e19a SCI: Fixed bug #3104624 - "PQ3: Crash when loading saved game on the highway"
svn-id: r54197
2010-11-11 10:09:57 +00:00
Matthew Hoops
da33617061 SCI: Allow duck videos to be played from the console
svn-id: r54195
2010-11-11 05:18:40 +00:00
Matthew Hoops
dc02bd2b4e SCI: Add missing new line
svn-id: r54189
2010-11-10 14:40:23 +00:00
Filippos Karapetis
9d1006c7a3 SCI3: Some changes
- Placed the SCI3 version detection in the proper place
- Some new types of SCI3 MT-32 patches (e.g. in the Lighthouse SCI3 demo) are
ignored, for now

svn-id: r54188
2010-11-10 14:28:45 +00:00
Matthew Hoops
988d9f3401 SCI: Fix SCI2.1+ fallback detection
Each map has to be mapped with its own specific volume (as opposed to earlier versions that had one map for all volumes); this code was passing the same map pointer for all volumes.

svn-id: r54179
2010-11-10 03:34:08 +00:00
Filippos Karapetis
7dec2bd6a8 SCI: Some SCI3 changes
- Extended the SCI2.1 kernel function signatures for SCI3, as they share 
the same kernel table
- All the engine parts are now initialized in SCI3 games, apart from the VM

svn-id: r54178
2010-11-10 01:08:17 +00:00
Filippos Karapetis
c3fd3e2329 SCI: Updated the SCI2.1 kernel function table with the SCI3 changes/additions
svn-id: r54177
2010-11-10 00:36:43 +00:00
Filippos Karapetis
e8e23a83e9 SCI: Removed the Shivers 2 hack from the segment manager (it isn't SCI)
svn-id: r54174
2010-11-09 22:20:36 +00:00
Filippos Karapetis
581a090204 SCI3: Removed detection and any possible support of Shivers 2
Shivers 2 doesn't contain SCI scripts. The whole game logic has
been reimplemented from SCI in native code placed in DLL files.
Each room has its own DLL file, and some SCI functions have been
reimplemented/rewritten for this purpose in native code. The
game and demo have all the resources of a SCI game, apart from
the SCI scripts themselves. Thus, they cannot be directly
supported, unless their whole room logic is rewritten from
scratch, which classifies Shivers 2 as "not SCI"

svn-id: r54173
2010-11-09 22:01:12 +00:00
Filippos Karapetis
1a85ce8e03 SCI: Some slight work on SCI3
- Enabled the SCI3 game entries for testing purposes
- The resource manager is initialized fully now (with a slight hack)
- Added a hack for the demo of Shivers 2 (which seemingly has no
scripts or vocabularies)
- The engine will stop before parsing any game scripts in SCI3 games,
and opens the console for resource manager-related functionality

svn-id: r54167
2010-11-09 19:37:42 +00:00
Filippos Karapetis
55f0b88c07 SCI: Fixed the fallback detector again
This is a regression from r54155, as we previously ignored the result of 
addInternalSources() in the fallback detector

svn-id: r54163
2010-11-09 17:07:34 +00:00
Matthew Hoops
4582a94ff9 SCI: Fix Lighthouse SCI2.1 demo
This is a regression from r54155. Fixed by moving the chunk resource loading earlier.

svn-id: r54162
2010-11-09 16:56:31 +00:00
Matthew Hoops
567441f032 SCI: Formatting convention fixes
svn-id: r54161
2010-11-09 16:23:08 +00:00
Matthew Hoops
8a788d16d7 SCI: Fix compile when SCI32 is not enabled
svn-id: r54160
2010-11-09 16:06:33 +00:00
Lars Skovlund
acf581fe67 SCI: Temporarily disable the PrintDebug call, which is only partially
implemented and insufficient for Shivers/Full. It is also unnecessary
for normal play.

svn-id: r54158
2010-11-09 15:45:20 +00:00
Lars Skovlund
32ff20477b SCI: Add uninitialized temp workaround for Shivers
svn-id: r54157
2010-11-09 15:16:40 +00:00
Lars Skovlund
3a9d935023 SCI: Fix error message in ShowMovie(), perhaps avoiding some confusion later
svn-id: r54156
2010-11-09 15:15:13 +00:00
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