Commit Graph

111 Commits

Author SHA1 Message Date
Torbjörn Andersson
700953cff7 Oops. I just noticed I was using _black to track the white colour, and _white
to track the black colour.

svn-id: r23522
2006-07-15 22:22:39 +00:00
Torbjörn Andersson
68c150df3c This is more consistent with how we usually initialize arrays of structs, and
seems to still keep msvc8 happy.

svn-id: r23521
2006-07-15 22:04:42 +00:00
Johannes Schickel
db58d3477b Should fix shadowing warnings with gcc.
svn-id: r23520
2006-07-15 21:27:29 +00:00
Johannes Schickel
59d0ddf806 Fix building with msvc8.
svn-id: r23518
2006-07-15 21:23:08 +00:00
Torbjörn Andersson
cd020a688e Moved the initial screen clearing from play() to load(), so that it will be
done before the MPEG player calls showOverlay().

svn-id: r23482
2006-07-10 18:57:40 +00:00
Torbjörn Andersson
d8e974ba72 Fixed bug #1519817, "ALL: Build failure if libmpeg2 is disabled".
svn-id: r23470
2006-07-10 09:29:12 +00:00
Torbjörn Andersson
7bfaa0db78 Cleanup
svn-id: r23439
2006-07-08 20:45:01 +00:00
Torbjörn Andersson
1e0b6995aa More robust handling of the optional startup.inf file.
svn-id: r23436
2006-07-08 20:20:55 +00:00
Torbjörn Andersson
5aff1df220 Slightly more verbose debug message.
svn-id: r23428
2006-07-08 15:39:26 +00:00
Torbjörn Andersson
5658e71f4d Added support for DXA cutscenes, while still retaining support for the old MPEG
cutscenes and the "dummy" (subtitles and voice-over) mode. Several tweaks and
cleanups were made in this process, and there may very well be regressions, but
it should be stable enough to commit.

svn-id: r23420
2006-07-08 11:42:07 +00:00
Max Horn
9a955180a4 * Renamed config.mak to config.mk
* Renamed common.rules to rules.mk
* Removed explicit declaration of MODULE_DIRS in various spots (instead we let rules.mk compute it)

svn-id: r23275
2006-06-24 08:48:11 +00:00
Max Horn
d210b19aec Move backends/fs/fs.h and .cpp to common/fs/fs.h and .cpp
Rationale: backend implementations belong to backends/, but portable APIs meant to be used by high level code is for common / sound / graphics / ... (compare also with backends/midi vs. sound/mididrv.h)

svn-id: r23274
2006-06-24 08:07:48 +00:00
Torbjörn Andersson
3114f19d94 MPEG player fixes:
* Initialise _frameWidth and _frameHeight to prevent them from being undefined.
* Fix BS2 subtitle positioning. (Fixes bug #1499916)
* In BS2, copy the frame to the backend in 8-bit mode.
* Fix compilation in 8-bit mode.

BS2 subtitles aren't quite right in 8-bit mode, but I expect we want to
re-design things a bit if we ever add DXA cutscenes. We can fix minor details
then.

svn-id: r22859
2006-06-03 09:43:10 +00:00
Torbjörn Andersson
e06ee0c490 We already have a default setting for subtitles, so this shouldn't be needed.
svn-id: r22704
2006-05-28 08:16:07 +00:00
Torbjörn Andersson
8062eb6ec3 Set and show/hide mouse cursors through a "cursor manager" (analogous to the
recently added (cursor) palette manager) so that the cursor can be properly
restored after returning from the GUI.

If there's any C++ magic that can keep the backend functions from being called
by anything else than these managing classes, that would probably be a good
idea. Also, since the cursor manager keeps a copy of the cursor image, perhaps
there are at least some backends that will no longer need to?

svn-id: r22639
2006-05-25 22:51:42 +00:00
Torbjörn Andersson
f83f1a77b6 Only check if the files on "CD 0" are present. The others are requested with
"insert CD" messages. (Of course, that isn't supported, or even well tested,
but the idea is sound.) This makes it possible to run the BS2 demo again.

Incidentally, this is how I *meant* for it to work when I added that check - I
even wrote so in the comment above that section of the code - so how on earth
did I manage to screw it up like that?

svn-id: r22594
2006-05-24 04:48:39 +00:00
Torbjörn Andersson
6b90c405e8 Initialise _resList to avoid crash (from freeing an invalid pointer) if the
data files are missing.

svn-id: r22520
2006-05-18 14:28:19 +00:00
Torbjörn Andersson
e563d0c182 Renamed screenChanged() to handleScreenChanged().
svn-id: r22518
2006-05-18 13:58:33 +00:00
Torbjörn Andersson
5c1f91eed4 Allow changing scaler while playing MPEG cutscenes.
svn-id: r22515
2006-05-18 13:18:02 +00:00
Eugene Sandulenko
14ec3f45fa - Heavily modified patch #1214784: "Disable overlay scaling"
- Eriktorbjorn's patch from same tracker item for scaling sword1/2 cutscenes
  is applied as is. It lacks resolution switch on-the-fly.
- GUI widgets are repositioned on the fly and use most space, even aspect
  ratio corrected screen is used without scaling
- Heavy tesing is required, but works for me in all cases except for bug
  #1483272: "GUI: SCUMM pause dialog breaks upon scaler switch" which needs more
  work.
- I probavly broke some backend or two

svn-id: r22505
2006-05-17 23:52:45 +00:00
Torbjörn Andersson
d2030f17b3 Removed hack that was used to limit the mouse cursor to (at most) 80x80 pixels.
That limit has been lifted from the SDL backend.

NOTE: This may cause problems in other backends!

svn-id: r22405
2006-05-10 20:50:59 +00:00
Max Horn
b727a89b6c Set speech_mute/sfx_mute/music_mute values in one single central place
svn-id: r22342
2006-05-04 21:14:50 +00:00
Max Horn
27307acd7c Moved the AudioCDManager as well as class AudioStream and its (standard) subclasses to namespace Audio
svn-id: r22231
2006-04-29 22:33:31 +00:00
Max Horn
bf73598811 * Changed the createEngine() factory function of our plugins to return an error code (the engine is now passed indirectly via a double pointer)
* Removed Engine_Empty (obsolete now that engines can return actual error codes)

svn-id: r22199
2006-04-29 00:27:20 +00:00
Max Horn
8fdcfedf19 Do not call static class methods as if they were instance methods
svn-id: r22172
2006-04-26 08:34:01 +00:00
Torbjörn Andersson
2cbcd49893 If the resource manager fails to initialize itself properly, instead of
printing a fatal error, use the new GUIErrorMessage function and return to
the launcher. Also, verify that all files that should be present on "CD 0"
(i.e. on the hard disk) are present at startup, at least. (Any other missing
CLU file is already requested with an "Insert CD" message.)

svn-id: r22168
2006-04-26 06:12:03 +00:00
Torbjörn Andersson
6b10484513 Fixed the output from the "res" debugger command that I accidentally broke, oh,
almost four months ago.

svn-id: r22167
2006-04-26 05:59:58 +00:00
Max Horn
74edd90aba Fix for bug #1471383: Instead of overloading ConfigManager::set, we now have new setInt and setBool methods (matching getInt/getBool), which avoids strange quirks & bugs caused by (char *) being implicitly cast to int (ouch)
svn-id: r21951
2006-04-16 19:23:14 +00:00
Max Horn
453aad9ec3 Do not override the 'directory' param when dumping BS2 resources
svn-id: r21935
2006-04-16 12:23:37 +00:00
Max Horn
68cb7f52c8 - Renamed ConfigManager::getActiveDomain to getActiveDomainName, and added a new getActiveDomain method that returns a pointer to the actual active *domain*
- Added Engine::_targetName whose value is computed from the name of the active domain
- Removed GameDetector::_targetName, instead code now uses either Engine::_targetName or the name of the active domain
- This in turn allowed for removing usage of GameDetector in many places

svn-id: r21916
2006-04-15 20:36:41 +00:00
Max Horn
ad45318328 Removed GameDetector::_gameid in favor of using a config manager entry
svn-id: r21915
2006-04-15 17:39:14 +00:00
Max Horn
e7a8bb6abf Modified the REGISTER_PLUGIN macro so that it allows (and requires) a trailing semicolon (this helps certain tools to parse our code better)
svn-id: r21689
2006-04-08 12:06:07 +00:00
Max Horn
8cf8acfd63 Renamed various *GameSettings to GameSettings (our namespaces are enough to distinguish them)
svn-id: r21686
2006-04-08 11:21:04 +00:00
Eugene Sandulenko
d292c0ec55 Since our debug() adds an exclamation mark at the message end, remove
it in several calls to avoid duplication!!11!

svn-id: r21607
2006-04-04 22:04:51 +00:00
Torbjörn Andersson
a55ebd5fb2 Merged d_draw.cpp and rdwin.cpp (what little remained of them) into screen.cpp.
svn-id: r21573
2006-04-03 09:54:05 +00:00
Torbjörn Andersson
c4955466fd Simplified loading of startup.inf
svn-id: r21538
2006-04-01 21:56:10 +00:00
Torbjörn Andersson
d6f348638d Guard against too many entries in resource.inf, since there has been a TODO
comment about that (removed in the previous commit) since roughly forever.

svn-id: r21536
2006-04-01 21:55:41 +00:00
Torbjörn Andersson
f59d472155 Simplified the loading of resource.inf
svn-id: r21533
2006-04-01 21:42:11 +00:00
Max Horn
0bb6d64064 A lot of code in sword1/router.cpp and sword2/router.cpp is virtually identical -- unified the two files in many places (but a lot more could be done, feel free to pick up and continue this work)
svn-id: r21526
2006-04-01 12:47:09 +00:00
Max Horn
8cdee5a931 Do not #include endian.h in scummsys.h (cuts down deps on endian.h from ~400 to ~250). Many greetings to eriktorbjorn, and have fun recompiling.
svn-id: r21500
2006-03-29 15:59:37 +00:00
Travis Howell
6632a4df53 Revert FLAG_AUTOFREE changes to loadWAVFromStreammakeWAVStream
svn-id: r21376
2006-03-19 05:15:49 +00:00
Max Horn
86565fcca5 - Renamed GameSettings to PlainGameDescriptor
- Added new GameDescriptor struct (similar to PlainGameDescriptor but with
  Common::String members instead of const char * ones)
- Changed DetectedGame to subclass GameDescriptor
- Removed toGameSettings() in favor of new (template) constructors in
  DetectedGame and GameDescriptor
- Fixed a bug in the obsolete gameid handling in the SCUMM & SIMON engines

svn-id: r21150
2006-03-09 02:52:51 +00:00
Max Horn
d2f78184af - added new toDetectedGame() template function (analog to toGameSettings)
- made use of the new DetectedGame constructor from my last commit
- some related cleanup

svn-id: r21149
2006-03-09 01:42:56 +00:00
Max Horn
d9a9fac937 Fixed tons of format string warnings for debug/error calls (including several errors where the format string didn't match the number of arguments to the call)
svn-id: r21141
2006-03-08 11:37:25 +00:00
Max Horn
907bd7128d Fix for bug #1438822 (Targets are case sensitive)
svn-id: r21017
2006-03-02 22:29:01 +00:00
Paweł Kołodziejski
11f348dd6c fixed warnings
svn-id: r20829
2006-02-23 17:51:27 +00:00
Max Horn
0712b468a3 Fix for bug #1428261 (Solaris x86 build fails: variable name collision)
svn-id: r20787
2006-02-20 14:18:30 +00:00
Max Horn
01fc7034b5 - Merged GameDetector::detectGame() into GameDetector::detectMain()
- Replaced GameSettings GameDetector::_game by a simple gameid string

svn-id: r20753
2006-02-18 12:50:48 +00:00
Max Horn
8ac17430ac - renamed PLUGIN_getSupportedGames to PLUGIN_gameIDList for consistency
- renamed Engine_XXX_gameList to Engine_XXX_gameList for consistency
- added new Engine_XXX_findGameID / PLUGIN_findGameID function
- updated plugins code to take advantage of the new plugin API, to support
  obsolete gameids w/o showing them to the user

svn-id: r20752
2006-02-18 11:15:37 +00:00
Max Horn
81798556db - Removed the 'features' field from GameSettings
- Removed GF_DEFAULT_TO_1X_SCALER

svn-id: r20747
2006-02-18 00:12:36 +00:00
Torbjörn Andersson
147c17989a This file was obsoleted by the previous commit, but I didn't want to force SVN
to remove it. Removed it now instead.

svn-id: r20742
2006-02-17 15:15:29 +00:00
Torbjörn Andersson
002c587965 Removed includes from sword2.h so that (hopefully) there will eventually be
less dependencies.

svn-id: r20741
2006-02-17 15:07:36 +00:00
Max Horn
7967e30c73 Added global toGameSettings() template function for convenience; simplified GameSettings usage in some engines
svn-id: r20739
2006-02-17 00:22:53 +00:00
Max Horn
a96760a2fd Reduced use of GF_DEFAULT_TO_1X_SCALER in favor of a new param to Engine::initCommonGFX; added a TODO stating that it should eventually be removed completly
svn-id: r20738
2006-02-17 00:01:18 +00:00
Torbjörn Andersson
441ead453a Merged _mouse.cpp and mouse.cpp into mouse.cpp
svn-id: r20659
2006-02-12 21:41:34 +00:00
Torbjörn Andersson
8935cac6da Standardized the preprocessor constants used to prevent double inclusion of
header files. Each now begins with "SWORD2_" and ends with "_H". (Well, except
for "SWORD2_H", since I didn't want to name it "SWORD2_SWORD2_H".)

svn-id: r20655
2006-02-12 19:57:23 +00:00
Torbjörn Andersson
0dbeb2f65b Oops. Forgot to tell SVN to actually *move* the files. I'll get the hang of it
eventually.

svn-id: r20652
2006-02-12 19:38:26 +00:00
Torbjörn Andersson
2ec8584828 Renamed files for consistency with other engines:
build_display  -> screen
    save_rest      -> saveload

More to come, no doubt.

svn-id: r20651
2006-02-12 19:33:45 +00:00
Torbjörn Andersson
d6fea31251 Removed layers.h since it was a) empty and b) never included.
svn-id: r20644
2006-02-12 19:20:10 +00:00
Max Horn
80cf2fa46f Reduced data duplication in module.mk files; added module.mk files for null and x11 backends; added engines/module.mk
svn-id: r20584
2006-02-12 00:16:31 +00:00
Max Horn
26ee630756 Moved engines to the new engines/ directory
svn-id: r20582
2006-02-11 22:45:04 +00:00