Commit Graph

71839 Commits

Author SHA1 Message Date
Willem Jan Palenstijn
b0cd1d6587 Revert "SCUMM: Fix detection of Maniac Mansion from within DoTT"
This reverts commit e11a370fe4.
2016-03-09 23:37:10 +01:00
Johannes Schickel
14c8bdafe5 Merge pull request #702 from ckorn/ftbfs2
SHERLOCK: Add format to fix compile error
2016-03-09 22:42:45 +01:00
Christoph Korn
305e34a718 SHERLOCK: Add format to fix compile error
This patch fixes the compile error:
format not a string literal and no
format arguments [-Werror=format-security]

Just suply "%s" as the standard format.
This way the string is not interpreted as format
which may lead to security issues.
2016-03-09 22:24:55 +01:00
Johannes Schickel
66a74cf3f3 DEVTOOLS: Check configuration and architecture specific directories for MSBuild. 2016-03-09 22:03:47 +01:00
Johannes Schickel
7127fadc96 DEVTOOLS: Use DLL runtime for MSBuild output. 2016-03-09 22:03:47 +01:00
Johannes Schickel
5510fdc7e4 DEVTOOLS: Use libpng16.lib for libpng for MSVC.
Modern libpng releases use this library name as output for their MSVC project files.
2016-03-09 22:03:47 +01:00
Johannes Schickel
46ef80963f DEVTOOLS: Enable Edit&Continue on x64 for MSVC2015+. 2016-03-09 22:03:47 +01:00
Johannes Schickel
1c2dc2f89d DEVTOOLS: Do not ignore libcmt.lib for MSBuild output.
This hints at broken library builds and thus should not be set for us.
2016-03-09 22:03:47 +01:00
Johannes Schickel
24558307c2 DEVTOOLS: Do not hardcode runtime libraries for MSVC2015. 2016-03-09 22:03:47 +01:00
Johannes Schickel
d3dba1b086 DEVTOOLS: Do not specify SCUMMVM_LIBS include dir twice for MSBuild. 2016-03-09 22:03:47 +01:00
Johannes Schickel
d2f3bc39b4 DEVTOOLS: Fix path separator in MSBuild's global props output. 2016-03-09 22:03:47 +01:00
Johannes Schickel
4ee3623f5d SDL: Fix compilation with SDL2 and MSVC2015. 2016-03-09 22:03:47 +01:00
Eugene Sandulenko
df5fabd887 WAGE: Recomputed md5s of rest of the games 2016-03-09 21:28:24 +01:00
Eugene Sandulenko
e96800d595 WAGE: Recalculate all md5s based on Mac Resource fork. This eliminates 2 duplicates 2016-03-09 21:28:24 +01:00
Torbjörn Andersson
e11a370fe4 SCUMM: Fix detection of Maniac Mansion from within DoTT
It turns out that in some versions of ScummVM, paths end with a
directory separator, while in others they don't. This should handle
both cases, I hope. (It's a bit tricky for me to test.)
2016-03-09 21:24:32 +01:00
Eugene Sandulenko
0f2e7fcdf0 WAGE: Fix gameid for Twisted! 2016-03-09 20:18:47 +01:00
Eugene Sandulenko
ee56fb805b WAGE: Skip flood fill in Bitmap when calclating bounds 2016-03-09 20:12:34 +01:00
Eugene Sandulenko
ca7720960a WAGE: Attempt to fix bounds calculation 2016-03-09 18:56:42 +01:00
Eugene Sandulenko
f5f41d7daa GCW0: Remove hardcoded list of skipped engines.
Now we rely on highres feature of the backends
2016-03-09 16:33:52 +01:00
Eugene Sandulenko
4fdef191b3 CONFIGURE: Fix options for GCW0 2016-03-09 16:33:27 +01:00
Eugene Sandulenko
a378e771c8 WAGE: Added alternate versions of Karth of the Jungle 2016-03-09 15:47:22 +01:00
Eugene Sandulenko
2408766f2d WAGE: Precalculate design bounds based on real data 2016-03-09 15:47:22 +01:00
Eugene Sandulenko
c47122cb63 WAGE: More detection entries 2016-03-09 15:47:22 +01:00
Eugene Sandulenko
c44a7f6020 WAGE: Added Minitorian game detection 2016-03-09 15:47:22 +01:00
Eugene Sandulenko
19c9993db9 WAGE: Added one more game 2016-03-09 15:47:21 +01:00
Eugene Sandulenko
54ec965f89 Merge pull request #699 from criezy/sword25-en-speech
SWORD25: Add engine option to use English speech instead of German
2016-03-09 10:16:54 +01:00
Thierry Crozat
2f1ae3fb4e SWORD25: Fix error after changing language in-game with the data file distributed by ScummVM
Changing the language in-game causes the language to be set for the target in the
scummvm.ini file. Then the next time we try to start the engine, if was causing an error
(Sword25 failed to instantiate engine: Game data not found) because there was no match
for the path and language in the detection table. Setting the language to Unknown in
the detection table for this multilingual data file fixes the issue.
2016-03-09 00:38:08 +00:00
Johannes Schickel
2ca642e3e2 SCUMM: Fix bugs #7070, #7071.
When adding support for Russian fan translations the font source data was
accidentally switched to the Russian font data for all game versions, not just
the Russian one. Now we only use the Russian font data only for the Russian
versions.

Bug #7071 "MM V2: Umlauts disappeared in German versions" is a regression from
556d65713b.

Bug #7070 "ZAK V2: Umlauts disappeared in German versions" is a regression from
c809a65b93.
2016-03-09 01:22:12 +01:00
Thierry Crozat
90a86fd39c SWORD25: Add engine option to use English speech instead of German
When selecting non-English language, the scripts default to using
German voices. This commit edits the file path on the fly to use instead
English voices for all languages other than German. This implements bug
#6804 - SWORD25: add option to choose language speech.

If the English voice pack is not present it falls back to using German voices.

The way this is implemented here however does not allow to use German
voices with English text or English voices with German text. This could be
achieved with a slightly different implementation of the same idea.
2016-03-09 00:02:45 +00:00
Johannes Schickel
c0163de084 SCI: Fix build with SCI32 disabled.
Regression from d486921820.
2016-03-08 20:20:36 +01:00
Johannes Schickel
7be486ae27 SCI: Slight template formatting fixes. 2016-03-08 20:15:22 +01:00
Johannes Schickel
693f8dc295 SCI: Add missing namespace comments in graphics/. 2016-03-08 20:13:05 +01:00
Filippos Karapetis
a2c6e647e6 SCI: Spacing 2016-03-08 20:36:04 +02:00
Filippos Karapetis
f450ca0ebf SCI: Split color remapping functionality into a separate class
Currently, only the SCI16 remapping functionality is implemented
(used in the QFG4 demo)
2016-03-08 20:36:03 +02:00
Filippos Karapetis
8f6bbe79ab SCI: Update the game ID of a workaround that's only used in QFG4 demo 2016-03-08 20:36:03 +02:00
Filippos Karapetis
aa69563f8a SCI32: Disable kRemapColors32, as SCI32 remapping is still incomplete 2016-03-08 20:36:02 +02:00
Filippos Karapetis
6958aa9890 SCI: Separate the demos of QFG4, PQ4 and GK1 from their full versions
The demo versions of these games were using a very different engine -
SCI1.1 vs SCI2/SCI2.1. Thus, we split them into different game IDs,
to avoid mixing specific game checks for them, as well as specific
game workarounds, which are different for the demos than the full
versions. Also, the demos should be working when SCI32 is disabled.
For these games, we don't use ADGF_DEMO, to avoid game IDs like
foodemo-demo
2016-03-08 20:36:02 +02:00
Johannes Schickel
7fde01b658 LAB: Remove gap handling from removeSaveState.
This removes the annoying behavior that removing a save state causes your
physical files to be renamed.
2016-03-08 19:07:48 +01:00
Johannes Schickel
e515fc18db ENGINES: Make variable names of PlainGameDescriptor conform to our guidelines.
gameid -> gameId
2016-03-08 19:01:42 +01:00
Johannes Schickel
3aecd8ef2a ENGINES: Make variable names of ADGameDescription conform to our guidelines.
gameid     -> gameId
guioptions -> guiOptions
2016-03-08 19:01:38 +01:00
Johannes Schickel
0b6befdcc5 ENGINES: Make variable names of AdvancedMetaEngine conform to our guidelines.
_singleid   -> _singleId
_gameids    -> _gameIds
_guioptions -> _guiOptions
2016-03-08 19:01:13 +01:00
Johannes Schickel
3ec225f127 ENGINES: Fix formatting. 2016-03-08 18:23:04 +01:00
Colin Snover
a2e9cc4965 SCI32: Clean up kIsOnMe and fix rounding bug
The implementation was not correctly rounding the scaled position
with mulru, leading to occasionally incorrect hit detection at
the boundaries of boxes.
2016-03-08 10:29:05 -06:00
Kirben
ea3f2ba60e CONFIGURE: Remove out dated comment for MinGW. 2016-03-08 19:23:50 +11:00
Kirben
2dc3346c08 CONFIGURE: Update FluidSynth libraries for MinGW. 2016-03-08 19:22:07 +11:00
Colin Snover
729d0182d8 SCI32: Add unnecessary micro-optimisation to palette merging code 2016-03-07 23:48:13 -06:00
Colin Snover
0afb056e2d SCI32: Fix palette color overflow 2016-03-07 23:47:44 -06:00
Colin Snover
82be9326f7 SCI32: Actually use the BitmapFlags enum 2016-03-07 22:57:46 -06:00
Colin Snover
0235a84b90 SCI32: Enable GfxPalette32::cycleAllPause
This is used by the Mr Soylent machines in SQ6 (e.g. room 370).
2016-03-07 22:52:49 -06:00
Colin Snover
b9fa04c201 SCI32: Implement kBitmapDrawText 2016-03-07 20:51:06 -06:00