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
D G Turner
24ac81ead8
SWORD1: Replace snprintf() usage with Common::String::format()
...
Safer and less portability issues.
2011-06-02 04:21:48 +01:00
Matthew Hoops
e18401a07c
ALL: armour -> armor
2011-05-25 10:50:47 -04:00
Matthew Hoops
1277975c66
ALL: neighbour -> neighbor
2011-05-25 10:50:46 -04:00
Thierry Crozat
d2a55b42c9
ENGINES: Further unify engine names
2011-05-22 12:47:35 +01:00
Max Horn
d84ae94b54
SWORD1: Const correctness, code cleanup & simplification
2011-05-17 15:05:20 +02:00
Max Horn
4cbe4ede66
COMMON: Registers RandomSources in constructor with the event recorder
...
This also removes the dependency of engines on the event recorder header
and API, and will make it easier to RandomSources that are not properly
registered.
2011-05-17 12:17:26 +02:00
strangerke
69b1485a22
GIT: Clean up: Suppress SVN tags, now useless
2011-05-12 01:16:22 +02:00
Ori Avtalion
9414d7a6e2
JANITORIAL: Reduce header dependencies in shared code
...
Some backends may break as I only compiled SDL
2011-04-28 15:08:58 +03:00
Ori Avtalion
cd6ee0589d
JANITORIAL: Format forward declarations to follow convention
2011-04-28 12:20:34 +03:00
Max Horn
73f04118f3
COMMON: Rename Error to ErrorCode, introduce new Error class
2011-04-18 18:22:02 +02:00
Max Horn
84184aabc0
ALL: colour -> color
2011-04-14 14:12:35 +02:00
Max Horn
0ce2ca4e00
COMMON: Replace MKID_BE by MKTAG
...
MKID_BE relied on unspecified behavior of the C++ compiler,
and as such was always a bit unsafe. The new MKTAG macro
is slightly less elegant, but does no longer depend on the
behavior of the compiler.
Inspired by FFmpeg, which has an almost identical macro.
2011-04-12 16:53:15 +02:00
dhewg
02956eaf0b
SWORD1: Cleanup syncSoundSettings()
2011-03-19 16:49:15 +01:00
dhewg
40333617ee
SWORD1: Don't set the same cursor on every frame
...
Removes unnecessary overhead on the backend when the cursor has just
one frame.
2011-03-13 08:24:19 +01:00
Johannes Schickel
83f66284a7
SWORD1: Adapt to setPalette RGBA->RGB change.
2011-02-15 22:16:48 +01:00
Ori Avtalion
84a8bdc86b
JANITORIAL: Remove duplicate #include's
...
svn-id: r55889
2011-02-12 10:00:52 +00:00
Max Horn
42ab839dd6
AUDIO: Rename sound/ dir to audio/
...
svn-id: r55850
2011-02-09 01:09:01 +00:00
Max Horn
805a5b2996
VIDEO: In overloaded methods, invoke correct parent implementation
...
This should not cause any code behavior changes at this time, but if any
of the intermediate VideoDecoder classes ever starts to overload stuff,
this would become important.
svn-id: r55841
2011-02-09 00:12:58 +00:00