Commit Graph

396 Commits

Author SHA1 Message Date
Torbjörn Andersson
e8ad4df1fa SWORD1: Enable American ("Circle of Blood") panel
If the language is explicitly set to American English, use the
American version of the panel for the main control panel. In all
other aspects, American English will behave as British English,
so it shouldn't break anything.
2012-10-06 16:24:00 +02:00
Johannes Schickel
89abab97e3 JANITORIAL: Remove trailing whitespaces.
Powered by:
git ls-files "*.cpp" "*.h" "*.m" "*.mm" | xargs sed -i -e 's/[ \t]*$//'
2012-09-26 04:17:55 +02:00
Matthew Hoops
857b92f8ff Merge pull request #268 from clone2727/video-rewrite
VideoDecoder upgrade & partial rewrite
2012-08-26 15:41:56 -04:00
Matthew Hoops
18823198ad VIDEO: Merge AdvancedVideoDecoder into VideoDecoder 2012-08-16 14:00:14 -04:00
Matthew Hoops
fb35c7f46f VIDEO: Remove setSystemPalette() 2012-08-16 13:30:32 -04:00
Johannes Schickel
155118dc1e SWORD1: Fix delete[] formatting. 2012-07-25 21:11:04 +02:00
Matthew Hoops
3117e4a8ff VIDEO: Convert DXADecoder to the AdvancedVideoDecoder API 2012-07-24 13:24:01 -04:00
Matthew Hoops
a652f6669e VIDEO: Rewrite SmackerDecoder to use the new API 2012-07-23 21:04:51 -04:00
Matthew Hoops
24c97b8913 VIDEO: Move PSXStreamDecoder to the new VideoDecoder API 2012-07-21 17:31:00 -04:00
Johannes Schickel
89b8f6bb56 SWORD1: Slight cleanup in querySaveMetaInfos. 2012-07-03 18:39:50 +02:00
Thierry Crozat
57e84b9632 SWORD1: Add source of the translations for the missing subtitles
This adds a few comment to explain were the translations come from
for the missing subtitle workaround (and give credits were they are
due).
2012-06-26 21:31:12 +01:00
Thierry Crozat
7705c13cc4 SWORD1: Add workaround for missing subtitles in the demo 2012-06-26 21:20:24 +01:00
Thierry Crozat
54fba98347 SWORD1: Add warning for untranslated subtitles
This should help adding workarounds for those by providing all the
needed information (textId and english text).
2012-06-24 18:00:20 +01:00
Johannes Schickel
d8aff72402 SWORD1: Get rid of casts on OSystem::copyRectToScreen calls. 2012-06-16 02:39:00 +02:00
Thierry Crozat
ac76994781 SWORD1: Use _missingSubTitleStr when asking for an out of bound textId
It was using textId 0, which is not the subtitle we want anyway. So
instead of using the wrong subtitle, it is probably better to not display
a subtitle at all. A test case for this is with the demo when using
non-english language as several subtitles are missing toward the end.
2012-06-05 22:35:36 +01:00
Thierry Crozat
d2c6525d88 SWORD1: Fix crash in demo when using French subtitles 2012-06-05 22:35:36 +01:00
Matthew Hoops
9e330174c8 VIDEO: Change getElapsedTime() into getTime()
This name change accompanies a slight meaning change; now it means the current time position from the beginning of the video and not from starting the video.
2012-05-12 21:28:13 -04:00
Max Horn
215b41b244 COMMON: Move RenderMode and GUIOptions functionality into separate files 2012-02-26 15:19:31 +01:00
Willem Jan Palenstijn
4637d55337 Merge pull request #171 from clone2727/psx-stream-2
This is a manual merge based on clone2727's merge of his branch
with the sword1 subtitle changes on master.
2012-02-23 22:49:59 +01:00
Matthew Hoops
7a3e0ea453 SWORD1: Add some TODO's for PSX stream subtitles
And some other minor cleanup
2012-02-23 22:48:19 +01:00
Matthew Hoops
a352c3cc00 SWORD1: Add support for the PSX demo videos 2012-02-23 22:48:18 +01:00
Matthew Hoops
66cd8bdd68 VIDEO: Make PSX streams calculate frame timing solely from CD speed
BS2 videos now play at the proper rate and BS1 videos have improved a/v sync.
2012-02-23 22:48:18 +01:00
Matthew Hoops
df21e72fe2 SWORD1: Add support for PSX stream playback 2012-02-23 22:48:17 +01:00
Max Horn
4f8665fc83 COMMON: Move isFoo functions to namespace Common, add doxygen comments 2012-02-20 16:18:27 +01:00
Max Horn
658080deed ALL: Avoid using is* macros from ctype.h
On some systems, passing signed chars to macros like isspace() etc. lead
to a runtime error. Hence, mark these macros as forbidden by default,
and introduce otherwise equivalent alternatives for them.
2012-02-15 16:51:37 +01:00
Filippos Karapetis
51ef8a78cc SWORD1: Silence some MSVC warnings (conversion from double to float) 2012-02-13 02:30:05 +02:00
Thierry Crozat
4546ca0e22 SWORD1: Do not look for color indexes in cutscenes when there is no subtitles 2012-01-18 02:44:02 +00:00
Thierry Crozat
ace3bf6187 SWORD1: Use color for subtitles during cutscene
During the game, different colors are used for subtitles depending
which character is speaking. This commit tries to use the same colors
for the cutscene subtitles. The color to use has to be specified in the
subtitle file between the frame end and the start of text using @1, @2,
@3 or @4 (for George, George as a narrator, Nicole and Maguire
respectively).
2012-01-18 02:44:02 +00:00
Torbjörn Andersson
1ffb832666 SWORD1: Fix bug #3431552 ("Wrong background sound in Windows demo")
This is a slightly updated version of the patch I attached to the
bug report. Apparently, the DOS/Windows demo has a slightly different
set of sound resources than the full game. (There were also some
other minor differences in the sound effects list, but I didn't think
them worth the trouble to implement.) I've played through the demo,
and I didn't notice any problems.
2011-11-08 21:46:10 +01:00
Thierry Crozat
5e4ee6d077 SWORD1: Fix bug #3430793 Freeze before meeting with police 2011-10-31 21:03:52 +00:00
Thierry Crozat
6abd63b804 SWORD1: Fix crash when using cutscene subtitles with mac version
It might have been simpler to add a bool to Text::makeTextSprite() to
tell it to not byteswap the frame size when called from the movie
player but I was not sure it was a good idea to have frames with
different endianness stored in Text depending where they came from.
2011-10-27 21:49:33 +01:00
Strangerke
7350ddf640 SWORD1: Re-add GUIO_NOASPECT to Sword1, as it was erroneously removed.
Sorry for the noise...
2011-10-24 12:55:30 +02:00
Strangerke
9b112fb56a SWORD1: After discussion with clone2727 and eriktorbjorn, remove GUIO_NOASPECT from Sword1 2011-10-24 06:57:41 +02:00
Strangerke
829df06599 SWORD1: Add GUIO_NOASPECT to Sword1 2011-10-24 04:31:39 +02:00
Eugene Sandulenko
32972a5ffb AD: Switched rest of the engines to new GUIO 2011-10-23 17:53:13 +01:00
Johannes Schickel
c386a5520f SWORD1: Replace inRange with CLIP. 2011-09-08 00:19:43 +02:00
Johannes Schickel
3a15c10241 SWORD1: Made some static data const. 2011-09-08 00:05:09 +02:00
Johannes Schickel
928cb5ab11 SWORD1: Made code conform a bit better to our formatting guidelines.
Most is automatically converted via astyle + some manual fixes, hopefully I
did not miss anything astyle messed up...
2011-09-07 23:54:34 +02:00
Matthew Hoops
481a5e0e7c SWORD1: Let the XA audio use its own looping 2011-08-25 10:14:17 -04:00
Matthew Hoops
40fd9ce27c AUDIO: Remove default rate parameter from xa 2011-08-24 09:54:19 -04:00
Matthew Hoops
adb69a5a39 AUDIO: Rename Vag to XA
Vag is really an XA container, and one that we do not have a decoder for (nor need)
2011-08-24 09:54:19 -04:00
Christoph Mallon
e35b4f20c1 GRAPHICS: Simplify the interface of Graphics::loadThumbnail().
Now it returns the Surface, so the caller does not need to create one and pass it.
2011-08-07 15:19:09 +02:00
Christoph Mallon
23a0f5318c JANITORIAL: Remove trailing empty lines. 2011-08-07 13:53:33 +02:00
Littleboy
b694a78f62 ANALYSIS: Add static casts to is* functions
This fixes a potential problem with passing char values that would be sign-extended and yield unexpected results.
See http://msdn.microsoft.com/en-us/library/ms245348.aspx
2011-06-23 08:52:52 -04:00
Max Horn
88913c0139 ALL: Remove trailing whitespaces
This tries to make our code a bit more compliant with our code formatting
conventions. For future use, this is the command I used:
  git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
2011-06-20 00:59:48 +02:00
Max Horn
6412d09126 DETECTOR: Remove PlainGameDescriptorGUIOpts 2011-06-14 18:17:02 +02:00
Max Horn
e4a4aa30f7 SWORD1: Cleanup music stream initialization 2011-06-14 18:17:01 +02:00
Max Horn
929e7ba4a5 SWORD1: Replace some sprintf uses 2011-06-14 18:17:01 +02:00
Thierry Crozat
06bbb57ad7 I18N: Make many more GUI MessageDialog strings translatable 2011-06-13 22:19:18 +01:00
Max Horn
477d6233c3 ENGINES: Change 2nd param of Engine::saveGameState to Common::String 2011-06-02 18:31:59 +02:00