ScummVM/scummvm
1
0 Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
86,814 Commits 45 Branches 139 Tags
578a6794de9ba7679966fee9aec02c6b2bdbce94
Commit Graph
86814 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Gilbert 72303564f7 MADS: Hook up Rex game endings to show the correct animation and/or credits 2014-10-18 11:20:50 -04:00
Ben Castricum dd3e877b14 GUI: Fix for bug 6719 (last line of help missing) 
Since 1.4 the font changed from a 14 to 15 pixel height wich causes
one line of help text no longer to be shown. By changing the padding
of the buttons the last lines fits again.
 2014-10-18 15:08:20 +02:00
Filippos Karapetis 22aaf995ed SCI: Hopefully fix bug #6718 in LSL6 Polish 
View flags are mainly used by LB2. The flag in the LSL6 view seems to
be garbage, so we ignore it
 2014-10-18 16:03:50 +03:00
Filippos Karapetis 4736c490e1 SCI: Separate the rest of the detection-only functions 
This should fix bug #6717 - "SCI fallback detection assert failure"
 2014-10-18 16:03:49 +03:00
Filippos Karapetis fe3ed8ded2 SCI: Rename the version of addAppropriateSources() used in detection 2014-10-18 16:03:49 +03:00
Filippos Karapetis 17a77ff69c SCI: Fix some typos, and remove some redundant curly braces 2014-10-18 16:03:48 +03:00
Torbjörn Andersson 497324467f TINSEL: Move object creation from constructor to run() 
Moved the creation of _midiMusic, _pcmMusic, _sound and _bmv from
the constructor to run(). It was reported on the forum that the
MT-32 emulator didn't work for Discworld, and I'm speculating that
this is because it was being initialized before the "extra path"
had been added to the search path.

It's likely that not all of these objects are needed for every
version of the game. Fixing that is left as an exercise for
someone more familiar with the different game versions than me.
 2014-10-17 19:19:55 +02:00
Paul Gilbert dee4fd193d MADS: Fix stopping digital audio, music, and palette cycling when animation ends 2014-10-16 21:53:21 -04:00
Strangerke fa5c223931 TSAGE: R2R - Remove useless includes 2014-10-16 08:07:38 +02:00
Strangerke c878731937 TSAGE: Move Air Duct and Vampire lair mazes in separate source files 2014-10-16 07:56:48 +02:00
Paul Gilbert 8ee1a85f35 MADS: Save redundant reloads of digital audio when switching animations 2014-10-15 21:18:17 -04:00
Tobia Tesan e12f30ed03 WINTERMUTE: Add a bunch of comments in loadSubtitles 2014-10-15 21:36:47 +02:00
Tobia Tesan a4b9bc5877 WINTERMUTE: Rename a bunch of variabiles in loadSubtitles 2014-10-15 21:36:47 +02:00
Tobia Tesan e9b722278e WINTERMUTE: Declare and init size in one place in VideoSubtitler 2014-10-15 21:36:47 +02:00
Tobia Tesan 3cef639f91 WINTERMUTE: new char[str.size()+1] in BaseStringTable::expand 
This makes room for the EOS char.
 2014-10-15 21:36:47 +02:00
Tobia Tesan d5ed8c29f1 WINTERMUTE: Turn _subtitles into Common::Array<SubtitleCard> in VideoSubtitler 
This necessarily loses const in SubtitleCard's attributes
 2014-10-15 21:36:47 +02:00
Tobia Tesan 2fc69d770c WINTERMUTE: Initialize tokenSomething vars in VideoSubtitler 
MSVC complains otherwise.
 2014-10-15 21:36:47 +02:00
Tobia Tesan c6930d9a64 WINTERMUTE: Use int32 for _lastSample in VideoSubtitler 
We are thus making room for the sentinel == -1
 2014-10-15 21:36:47 +02:00
Tobia Tesan ebb48a1704 WINTERMUTE: s/delete array/delete[] array/ 2014-10-15 21:36:47 +02:00
Tobia Tesan f525514da5 WINTERMUTE: Use BaseGame->expandStringByStringTable(&Common::String) in SubtitleCard 2014-10-15 21:36:46 +02:00
Tobia Tesan 578edde66f WINTERMUTE: Const'fy members of class SubtitleCard 2014-10-15 21:36:46 +02:00
Tobia Tesan 856e281bf1 WINTERMUTE: Remove useless constructor from SubtitleCard. 2014-10-15 21:36:46 +02:00
Tobia Tesan 5f25cf1bd7 WINTERMUTE: Don't bother inheriting BaseGame in SubtitleCard 2014-10-15 21:36:46 +02:00
Tobia Tesan f1ae8e6e8d WINTERMUTE: Introduce BaseGame->expandStringByStringTable(&Common::String) 2014-10-15 21:36:46 +02:00
Tobia Tesan 599390a5ad WINTERMUTE: Lose unnecessary if() in VideoTheoraPlayer 2014-10-15 21:36:46 +02:00
Tobia Tesan 4742acf939 WINTERMUTE: Rename VideoTheoraPlayer->_subtitles to _foundSubtitles for clarity 2014-10-15 21:36:46 +02:00
Tobia Tesan 1a571d9611 WINTERMUTE: Avoid doing check before delete (deleting 0-pointer is safe) 2014-10-15 21:36:46 +02:00
Tobia Tesan 388fbdb6eb WINTERMUTE: Rename VideoSubtitle to SubtitleCard 2014-10-15 21:36:46 +02:00
Tobia Tesan dd820a7a1e WINTERMUTE: Turn a bunch of uint into uint32 in VideoSubtitle 2014-10-15 21:36:46 +02:00
Tobia Tesan 7b4084b7e0 WINTERMUTE: s/uint32 _lastSample/long _lastSample/ 2014-10-15 21:36:45 +02:00
Tobia Tesan a4d5d14581 WINTERMUTE: Turn display() and update() into void functions. 
No idea why they were bools in the first place.
 2014-10-15 21:36:45 +02:00
Tobia Tesan 2acb2f558c WINTERMUTE: Add clarification comment in loadSubtitles 2014-10-15 21:36:45 +02:00
Tobia Tesan 40c5b01aad WINTERMUTE: Preserve const when handing chars over to drawText 2014-10-15 21:36:45 +02:00
Tobia Tesan 7c6f9772d3 WINTERMUTE: Save frames as uint rather than long 
It's just as good: at 30 FPS, this allows for
2 ^ 32 / 30 / 60 = 2386093 mins, which is, I guess, a reasonable limit.
 2014-10-15 21:36:45 +02:00
Tobia Tesan afb3ae3034 WINTERMUTE: Treat edge case - prevents crash if SRT file is blank. 2014-10-15 21:36:45 +02:00
Tobia Tesan 581aff7f8f WINTERMUTE: Keep a bunch of attrs private in VideoSubtitler 2014-10-15 21:36:45 +02:00
Tobia Tesan a78a4d40dd WINTERMUTE: Use Common::String in place of char *text in loadSubtitles 2014-10-15 21:36:45 +02:00
Tobia Tesan 8decf3d742 WINTERMUTE: Remove ////-style separators from imported subtitle code 2014-10-15 21:36:45 +02:00
Tobia Tesan 2eee488e36 WINTERMUTE: Do some refactoring over a bunch of attrs in VideoSubtitle 
Conflicts:
	engines/wintermute/video/video_subtitler.cpp
 2014-10-15 21:36:45 +02:00
Tobia Tesan f2441da3da WINTERMUTE: Make sure subtitle files could be found before anything else 2014-10-15 21:36:44 +02:00
Tobia Tesan 6d16fdbf4a WINTERMUTE: Expand subtitles by string table 2014-10-15 21:36:44 +02:00
Tobia Tesan 647b721744 WINTERMUTE: Refactor/Reformat VideoSubtitler::update 2014-10-15 21:36:44 +02:00
Tobia Tesan 113e837d55 WINTERMUTE: Correctly delete _subtitler (which is not an array) 2014-10-15 21:36:44 +02:00
Tobia Tesan 0475fd1a5c WINTERMUTE: Declare counters as uint to match Array::size() 2014-10-15 21:36:44 +02:00
Tobia Tesan 621a068c00 WINTERMUTE: Mass ScummVM-style renaming in subtitles code 2014-10-15 21:36:38 +02:00
Tobia Tesan ad5fde9db3 WINTERMUTE: Reinstate CVidSubtitle destructor 2014-10-15 20:17:04 +02:00
Tobia Tesan 389e06bdfc WINTERMUTE: Port actual subtitle display code. 2014-10-15 20:16:07 +02:00
Tobia Tesan 472d3e3231 WINTERMUTE: Add getter for _videoFont 2014-10-15 20:11:17 +02:00
Tobia Tesan d8b432fe51 WINTERMUTE: Use native C types instead of macros 2014-10-15 20:11:16 +02:00
Tobia Tesan 1715196325 WINTERMUTE: Re-enable and use PathUtils for auto SRT detection 2014-10-15 20:09:31 +02:00