Commit Graph

1217 Commits

Author SHA1 Message Date
Filippos Karapetis
50c1d5c3a1 WINTERMUTE: Remove trailing whitespace 2014-10-28 15:38:52 +02: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
Tobia Tesan
6f6e49f4cf WINTERMUTE: Display subtitles in console 2014-10-15 20:08:21 +02:00
Tobia Tesan
532217bcee WINTERMUTE: Reinstate subtitle loading 2014-10-15 19:50:50 +02:00
Tobia Tesan
d9d80db869 WINTERMUTE: Take const char in loadSubtitles 2014-10-15 19:50:48 +02:00
Tobia Tesan
ba1862ecb8 WINTERMUTE: Use BaseFileManager to load SUB file
Conflicts:
	engines/wintermute/video/video_subtitler.cpp
2014-10-15 19:43:26 +02:00
Tobia Tesan
ec3b8fdde2 WINTERMUTE: Use long-style braces around blocks in imported subtitle code 2014-10-15 19:40:48 +02:00
Tobia Tesan
5ee11d6c21 WINTERMUTE: Astyle imported WME subtitle code 2014-10-15 19:29:12 +02:00
Tobia Tesan
cc175b5af4 WINTERMUTE: Import subtitle code from WME1 2014-10-15 19:28:21 +02:00
Einar Johan Trøan Sømåen
2f4f7d480e Merge pull request #514 from tobiatesan/fix_audio_loop
WINTERMUTE: Use SubLoopingAudio for music w/arbitrary loop points
2014-10-04 20:34:16 +02:00
Tobia Tesan
64695b5624 WINTERMUTE: Use SubLoopingAudio for music w/arbitrary loop points
Should fix #6648 (music not looping correctly in 5MA)
2014-10-04 20:32:11 +02:00
Thierry Crozat
78fcc7987d WINTERMUTE: Add list of files that contain translatable strings 2014-10-04 01:09:15 +01:00
Tobia Tesan
a3ea75e080 WINTERMUTE: Make a bunch of attributes private in BaseSoundBuffer 2014-10-01 08:34:11 +02:00
Torbjörn Andersson
9baf687f2f WINTERMUTE: Silence GCC signed/unsigned comparison warning 2014-09-03 18:08:38 +02:00
Einar Johan Trøan Sømåen
55c8b7a11a WINTERMUTE: Save the names of any language files that are loaded. (Fix bug #6651)
This way, they will be reloaded in the same order when loading a save game. Old save games will
continue to show the bug, but new savegames will be consistent. A quick fix for old save games in
the white chamber, is to launch the game with the correct language BEFORE loading the save game.

This increases the save-game-version to 1.3.1ScummVM
2014-09-03 17:47:49 +02:00
Johannes Schickel
ec634ea07c Merge pull request #495 from somaen/docuFix
Doxygen-fixes
2014-08-30 14:14:31 +02:00
Einar Johan Trøan Sømåen
77e2c637f7 WINTERMUTE: Remove unused Sqr-function. 2014-08-29 19:53:33 +02:00
Einar Johan Trøan Sømåen
2fa1340438 ENGINES: Fix some Doxygen comments that seem wrong. 2014-08-29 03:28:43 +02:00
Pawel Kolodziejski
78258151ea WME: added few more games. added ability to detect from exe files. 2014-07-22 21:22:45 +02:00
Einar Johan Trøan Sømåen
6bffa2a824 WINTERMUTE: Do syncSoundSettings on initialization of sound manager, so that sound settings are actually applied on launch 2014-06-20 10:57:06 +02:00
Eugene Sandulenko
1ebb8aa6de Merge pull request #466 from sev-/transparent-surface
COMMON: Move TransparentSurface to common code
2014-06-15 21:15:31 +03:00
Eugene Sandulenko
385f8358ab WINTERMUTE: Switch to use of moved to OSystem TransparentSurface 2014-06-15 15:43:18 +03:00
Einar Johan Trøan Sømåen
0a1c75bc32 WINTERMUTE: Add detection for Vsevolod Prologue 2014-06-09 16:25:23 +02:00
Einar Johan Trøan Sømåen
767368f1ea WINTERMUTE: Add detection for Oknytt 2014-06-09 16:09:41 +02:00
Johannes Schickel
b6b6d39992 WINTERMUTE: Silence/fix some warnigns when compiling Symbian port.
See bug #6625 "WINTERMUTE: Symbian Compilation Warnings".
2014-06-08 18:53:39 +02:00
Johannes Schickel
257f9fd2ae WINTERMUTE: Fix endian issues in findPackageSignature.
Thanks to somaen for looking over it too.

This also silences bug #6624 "SYMBIAN: WINTERMUTE: Warnings in base_package.cpp".
2014-06-08 18:28:13 +02:00
Eugene Sandulenko
215f5f9a49 WINTERMUTE: Speeding up blitting routines for TransparentSurface 2014-06-02 18:41:21 +03:00
Einar Johan Trøan Sømåen
7b7f0222ba WINTERMUTE: Add detection for 5 versions of The Kite 2014-05-31 21:26:55 +02:00
Einar Johan Trøan Sømåen
3640914624 WINTERMUTE: Add detection for Bickadoodle 1.1 2014-05-31 21:12:55 +02:00
Einar Johan Trøan Sømåen
aea94110d1 WINTERMUTE: Add detection for "Boredom of Agustin Cordes" 2014-05-31 21:07:34 +02:00
Einar Johan Trøan Sømåen
7141df0729 WINTERMUTE: Add another Rhiannon-version to the detection tables.
As it's unclear how this version differs from the current version,
I've tagged it as DVD.
2014-05-31 20:57:15 +02:00
Johannes Schickel
ae4ffe01f0 ALL: Rename Debugger::DCmd_Register to Debugger::registerCmd. 2014-05-27 02:04:08 +02:00
Johannes Schickel
daa8d57a86 ALL: Rename Debugger::DebugPrintf to Debugger::debugPrintf. 2014-05-27 02:04:07 +02:00
Einar Johan Trøan Sømåen
4904554bb6 WINTERMUTE: Add a warning when trying to play video without Theoradec-support 2014-04-17 11:21:33 +02:00
Einar Johan Trøan Sømåen
3377784b35 WINTERMUTE: Add a warning when loading TTF-fonts without FreeType2-support. 2014-04-17 11:15:24 +02:00
Einar Johan Trøan Sømåen
5064ae15e5 WINTERMUTE: Correct mistaken identification of JULIA 1.2 as Steam-version
It is actually the version from Bundle in a Box
2014-04-07 16:33:29 +02:00
Einar Johan Trøan Sømåen
3fc63d37b6 WINTERMUTE: Add detection for 1/2 Ritter 2014-04-06 14:28:25 +02:00
Einar Johan Trøan Sømåen
64f30861b5 WINTERMUTE: Add detection for the Reversion2 2.0.2412 (Linux) 2014-04-05 16:02:25 +02:00
Einar Johan Trøan Sømåen
c402074385 WINTERMUTE: Add detection entry for Rhiannon: Curse of the four Branches 2014-04-05 15:33:04 +02:00
Einar Johan Trøan Sømåen
f565e20a01 WINTERMUTE: Add detection entry for Corrosion: Cold Winter Waiting 2014-04-05 15:30:16 +02:00
Einar Johan Trøan Sømåen
adacad71db WINTERMUTE: Add detection entry for Ghost in the Sheet 2014-04-05 15:26:44 +02:00
Einar Johan Trøan Sømåen
b9286099f8 WINTERMUTE: Add a detection entry for the steam version of J.U.L.I.A. 2014-04-05 15:21:08 +02:00
Einar Johan Trøan Sømåen
09e069368f WINTERMUTE: Add another detection-entry for Bickadoodle 2014-04-05 14:27:26 +02:00
Einar Johan Trøan Sømåen
6afe5547c0 WINTERMUTE: Replace (fangame) and wmefan-, with (unknown version) and wmeunk- 2014-04-05 14:02:06 +02:00
JenniBee
bd0f37fe65 WINTERMUTE: Add md5 for Zilm: A Game of Reflex. 2014-03-19 00:42:36 +00:00
Einar Johan Trøan Sømåen
7da44b6b03 WINTERMUTE: Run astyle on transparent_surface.{h,cpp} mainly adding braces. 2014-03-15 15:40:03 +01:00
Matthew Hoops
740b6e8fbd IMAGE: Move all ImageDecoders to image/ 2014-02-28 00:27:28 -05:00
Einar Johan Trøan Sømåen
cda0598047 WINTERMUTE: Use the correct field for dpi when loading FreeSans from scummmodern.zip 2014-02-21 16:35:47 +01:00
Strangerke
719f8f23ec WINTERMUTE: Some British to American English 2014-02-19 21:45:30 +01:00
Filippos Karapetis
a1dea147bb WME: Remove translation tags from names found by the fallback detector
Fixes cases like bug #6532
2014-02-19 00:42:12 +02:00
Filippos Karapetis
5d0ebad996 WME: Fix bug #6531 - "WME: Art of Murder - Assertion" 2014-02-19 00:42:10 +02:00
Johannes Schickel
fc5ef58fff WINTERMUTE: Make GPL headers consistent in themselves. 2014-02-18 02:39:40 +01:00
Johannes Schickel
3333084eaf WINTERMUTE: Indent REGISTER_PLUGIN_* for consistency. 2014-02-17 23:03:28 +01:00
Strangerke
81f0a5dc42 WINTERMUTE: Janitorial - Remove trailing spaces 2014-02-16 18:41:25 +01:00
Johannes Schickel
24d2e246b4 WINTERMUTE: Use game format for fallback font rendering.
BDF fonts got 32bit drawing support in ece8b7fb65
Thus it is not necessary to draw onto a 16bit surface.
2014-02-12 18:31:06 +01:00
Filippos Karapetis
867efd477c WINTERMUTE: Prevent scripts from setting invalid scroll times
Scroll times (ScrollSpeedX, ScrollSpeedY) can't be zero, as this leads
to a division by zero later on. This allows Dreamscape to start and
work properly.
2014-02-11 19:09:39 +02:00
Einar Johan Trøan Sømåen
2ad7625831 WINTERMUTE: Change the copyFrom-simplifications to depend on pitch instead of width. (Fix bug #6157) 2014-02-05 17:18:46 +01:00
Johannes Schickel
1fa74e355c WINTERMUTE: Two minor formatting fixes. 2014-01-22 17:33:04 +01:00
Einar Johan Trøan Sømåen
2e93f5aba2 WINTERMUTE: Enable Wintermute by default. 2014-01-21 18:45:23 +01:00
Einar Johan Trøan Sømåen
2dfbad8074 WINTERMUTE: Avoid using Graphics::copyFrom to copy FMV-frames.
copyFrom frees and reallocates the surface for every update, as long
as the dimensions and format stay the same, we can do with just a
memcpy.

This gives a tiny improvement in the update-part of the Theora-player
(on the order of a bit more than 1 second saved total in the 1:28 long
J.U.L.I.A.-intro)
2014-01-21 02:25:18 +01:00
Einar Johan Trøan Sømåen
0b76f66edc WINTERMUTE: Special-case FMV-handling to not fill the screen with background color.
If we have only one thing being drawn, and that is opaque, we can
skip filling the render surface with background color.
This shaves another few wasted cycles of the FMV playback. (Since we
now don’t have to write the entire render surface TWICE).

This reduces the time spent in drawTickets() to ~60% of what it was before.
2014-01-21 01:32:49 +01:00
Einar Johan Trøan Sømåen
4f4599b542 WINTERMUTE: Fix bug that prevented the opaque and binary blit speedups from working. 2014-01-21 01:32:40 +01:00
Einar Johan Trøan Sømåen
74282cd415 WINTERMUTE: Stop any playing FMV when loading a savegame. 2014-01-15 12:11:07 +01:00
Einar Johan Trøan Sømåen
0c0ed9fdd8 WINTERMUTE: Limit the range of the panning-variable to stay within [-1,1].
Also, store the panning state, so that the next playback starts with the same pan.
2014-01-14 00:24:28 +01:00
Einar Johan Trøan Sømåen
12c330c5b9 Merge pull request #418 from JenniBee/md5s
WINTERMUTE: Adding more detection entries.
2014-01-11 07:51:38 -08:00
Einar Johan Trøan Sømåen
7d2dc87df0 WINTERMUTE: Add detection for french, italian, spanish and czech versions of Dirty Split. 2014-01-11 11:37:21 +01:00
JenniBee
2c6102a9d4 WINTERMUTE: Adding more detection entries. 2013-12-30 18:34:30 -05:00
Eugene Sandulenko
4b2cd71956 WINTERMUTE: Fix new detection entries 2013-12-22 11:38:48 +02:00
Einar Johan Trøan Sømåen
56bbc9e796 WINTERMUTE: Fix build issues in previous commit. 2013-12-22 02:24:03 +01:00
Einar Johan Trøan Sømåen
7fe40098d1 Merge pull request #412 from JenniBee/md5s
WINTERMUTE: Adding detection for more games.
2013-12-21 16:05:00 -08:00
JenniBee
9bbe836b12 WINTERMUTE: Adding detection for more games. 2013-12-21 18:50:23 -05:00
Johannes Schickel
e180612ff5 WINTERMUTE: Skip Latvian language package if not selected. 2013-12-05 16:27:57 +01:00
Johannes Schickel
ba7bbe6b89 WINTERMUTE: Fix typo in Polish language filename in Reversion1. 2013-12-05 16:26:44 +01:00
Johannes Schickel
dce90064b9 WINTERMUTE: Add Reversion: The Escape 1.3.2369 release.
This release has different hashes and file sizes than the previous Reversion
1.3 entries but is marked as 1.3.2369 in the installer filename.
2013-12-05 16:26:44 +01:00
Johannes Schickel
0e017f007a Merge pull request #375 from digitall/engineAutoPlug
RFC: Pluggable Engines #2 (No Python, just evolution of current configure shell and make code)
2013-11-26 02:27:11 -08:00
D G Turner
ef85456859 BUILD: Remove need for engine.mk in each engine directory.
Each engine now only has to provide a single configure.engine file
adding the engine into the configure script, which then produces the
required other files automatically.
2013-11-24 00:48:01 +00:00
D G Turner
1ac01d2333 BUILD: Remove need for engine-plugin.h in engines.
This is now generated automatically by the configure script from the
engine directory names.
2013-11-24 00:48:01 +00:00
D G Turner
00c27a28f9 BUILD: Split engines/plugins_table header down to a file per engine.
This is the third and final commit enabling fully pluggable engines.

Now providing an engine folder contains a configure.engine, engine.mk
and engine-plugin.h file, it will be picked up automatically by the
configure script.
2013-11-24 00:48:01 +00:00
D G Turner
d77cf95a18 BUILD: Split engines.mk down to a single file per engine.
This is the second part of allowing engines to be added dynamically.
Each folder in engines/ which must contain a file named "engine.mk"
containing the make definitions for that engine.
2013-11-24 00:48:01 +00:00
D G Turner
aa947c9474 BUILD: Split configure.engines down to a single file per engine.
This is the first part of allowing engines to be added dynamically.
They are placed into a folder in engines/ which must contain a file
named "configure.engine" to add the engine, which is pulled into the
top level configure script automatically.
2013-11-24 00:45:38 +00:00
Johannes Schickel
a6fff7a805 WINTERMUTE: Switch WideString to U32String. 2013-11-23 21:34:54 +01:00
Johannes Schickel
67ce244567 WINTERMUTE: Use const_iterator in BaseFileManager::registerPackages. 2013-11-23 21:01:39 +01:00
Johannes Schickel
7409f3eb54 WINTERMUTE: Slight interator usage cleanup. 2013-11-23 21:00:39 +01:00
Johannes Schickel
5166fce2eb WINTERMUTE: Remove another unused variable. 2013-11-23 21:00:39 +01:00
Johannes Schickel
9a78ac265d WINTERMUTE: Make BaseFileManager::registerPackages case agnostic.
The old version did only work as expected when all the filenames were all
lowercase. This seems to be the case for most (or even all?) WME games.
However, we are better safe than sorry and make the code case agnostic.
2013-11-23 21:00:33 +01:00
Johannes Schickel
29fae3914e WINTERMUTE: Remove unused variables. 2013-11-23 20:45:13 +01:00
Einar Johan Trøan Sømåen
b1bcf12791 WINTERMUTE: Add a fake detection entry for Czech Dead City.
The language data for the Czech version are in data.dcp, but the pairs
of {language.dcp, data.dcp} get preference over just a match on data.dcp,
thus we need to detect Czech as one of these pairs, giving the user the
choice of language on detection. In this case I just copied the english-detection.
2013-11-18 12:05:21 +01:00
Einar Johan Trøan Sømåen
ff574579bb WINTERMUTE: Add quite a bit of hackery to allow Reversion 1.3 to select languages properly.
Reversion 1.3 seems to have one language file in it’s main-folder, and
a full set in languages/ (not language/ like a few other games), the names
of the language-files are also different from what we’ve seen earlier.
2013-11-18 12:00:34 +01:00
Einar Johan Trøan Sømåen
eceaf7f8cb WINTERMUTE: Add bold-font support for FreeSans.ttf (and only FreeSans for now).
This is mostly a quick fix to solve the rather common case of wanting
to use bold Arial. This will not handle the user adding the actual Arial.ttf
file to the folder yet, but atleast it solves the common case of having
to fallback to FreeSans.
2013-11-15 15:27:50 +01:00
Filippos Karapetis
4af998b96c WINTERMUTE: Move the isAscii() string changing code to another function 2013-11-08 12:17:48 +02:00
Filippos Karapetis
492cefacb6 WINTERMUTE: Allow utf8ToWide() and wideToUtf8() work with ASCII strings
This is needed for English versions of multilingual games, which use
UTF-8 strings, but we can treat them as plain ASCII, since wide and
UTF-8 strings are not yet supported in Wintermute. This allows at least
the English versions of these games to run.

This allows Reversion 2 and Shaban to start
2013-11-08 12:04:07 +02:00
Einar Johan Trøan Sømåen
1e6a37394f Merge pull request #396 from JenniBee/md5s
Adding detection for more fan games
2013-11-07 23:10:04 -08:00
Filippos Karapetis
eba0c0ff62 WINTERMUTE: Add the keycode for the ESC key
This is used by Looky
2013-11-07 13:47:38 +02:00
JenniBee
90481b6409 WINTERMUTE: Adding detection for more games. 2013-11-06 16:12:03 -05:00
Einar Johan Trøan Sømåen
c0f9455b28 WINTERMUTE: Remove unused transfer-function. (AnsiStringArray). 2013-11-05 14:02:54 +01:00
Einar Johan Trøan Sømåen
cc33cf74ae WINTERMUTE: Transfer Common::Strings explicitly when saving/loading. 2013-11-05 13:59:55 +01:00
Einar Johan Trøan Sømåen
4e2bec5311 WINTERMUTE: Transfer Const Char* explicitly when saving/loading. 2013-11-05 13:58:02 +01:00
Einar Johan Trøan Sømåen
237d3d86ec WINTERMUTE: Transfer Char* explicitly when saving/loading. 2013-11-05 13:54:25 +01:00
Einar Johan Trøan Sømåen
d07409def7 WINTERMUTE: Transfer Sint32s explicitly when saving/loading. 2013-11-05 13:48:11 +01:00
Einar Johan Trøan Sømåen
7892188bcf WINTERMUTE: Transfer Uint32s explicitly when saving/loading. 2013-11-05 13:31:13 +01:00
Einar Johan Trøan Sømåen
d6b9d7de8f WINTERMUTE: Remove BasePlatform::setRect (replace with member-call) 2013-10-29 02:59:53 +01:00
Einar Johan Trøan Sømåen
efb8031b3c WINTERMUTE: Remove BasePlatform::isRectEmpty (replace with member-call). 2013-10-29 02:59:53 +01:00
Einar Johan Trøan Sømåen
3fb4183909 WINTERMUTE: Remove BasePlatform::setRectEmpty (replace with member-call) 2013-10-29 02:59:53 +01:00
Einar Johan Trøan Sømåen
211b8c9732 WINTERMUTE: Remove unused BasePlatform-functions (showWindow/setCapture/releaseCapture) 2013-10-29 02:59:53 +01:00
Einar Johan Trøan Sømåen
4c3c707671 WINTERMUTE: Transfer Doubles explicitly when saving/loading. 2013-10-29 02:59:53 +01:00
Einar Johan Trøan Sømåen
538c5935f9 WINTERMUTE: Transfer Point32s explicitly when saving/loading. 2013-10-29 02:59:53 +01:00
Einar Johan Trøan Sømåen
95d2ed1a9b WINTERMUTE: Transfer Rect32s explicitly when saving/loading. 2013-10-29 02:59:52 +01:00
Einar Johan Trøan Sømåen
dc4e3150f3 WINTERMUTE: Correct some doxygen-comments in TransparentSurface. 2013-10-29 02:59:52 +01:00
Einar Johan Trøan Sømåen
047a7171ee WINTERMUTE: Transfer Vector2s explicitly when saving/loading. 2013-10-29 02:59:52 +01:00
Einar Johan Trøan Sømåen
ee5adb84c5 WINTERMUTE: Transfer bytes explicitly when saving/loading. 2013-10-29 02:59:52 +01:00
Einar Johan Trøan Sømåen
6b4adab654 WINTERMUTE: Transfer booleans explicitly when saving/loading. 2013-10-28 19:19:12 +01:00
Einar Johan Trøan Sømåen
ba17ed9490 WINTERMUTE: Change BaseObject::getHeight() to return int32 instead of int. 2013-10-28 18:38:17 +01:00
Einar Johan Trøan Sømåen
889c3c9801 WINTERMUTE: Deconstify UIObject::getHeight() to fix a shadowed overload. 2013-10-28 18:37:20 +01:00
Einar Johan Trøan Sømåen
ad58641242 WINTERMUTE: Fix compile errors in XCode 5 caused by nullptr-issues. 2013-10-28 18:23:05 +01:00
Matthew Hoops
821a7430da WINTERMUTE: Remove useless __inline 2013-10-17 23:39:05 -04:00
Willem Jan Palenstijn
2271bf404c WINTERMUTE: Remove superfluous assignments 2013-10-09 11:29:13 +02:00
Willem Jan Palenstijn
f248a09f0f WINTERMUTE: Fix displayTransOffset
Regression from 14cb1f09c0.
This fixes font border drawing.
2013-10-08 23:30:21 +02:00
Willem Jan Palenstijn
7a3fb2f06a WINTERMUTE: Call updateScreen() every frame, even without updates.
This fixes expose events with the opengl backend.
2013-10-07 19:49:17 +02:00
Willem Jan Palenstijn
2b926cbe48 WINTERMUTE: Fix typo causing tiled image corruption 2013-10-06 23:17:05 +02:00
Willem Jan Palenstijn
8c8b1b7da7 WINTERMUTE: Integrate SDL_rotozoom code for scale/rotoscale 2013-10-06 17:36:32 +02:00
Willem Jan Palenstijn
14cb1f09c0 WINTERMUTE: Partially fix rotoscale coordinate confusion
This fixes two issues:

* The rendering rectangle was not rotated, causing garbage to be
drawn if the rotated rectangle did not fully cover the unrotated
rectangle, or sprites to be clipped in the opposite case.

* The order of mirror/scale/rotation operations was inconsistent.
This commit does scaling first, followed by rotation. (This is only an
issue because scaling is specified separately in X and Y directions.)
For now only FIXMEs are added for mirroring.
2013-10-06 17:34:19 +02:00
Willem Jan Palenstijn
f19fd06e24 WINTERMUTE: Remove outdated comment 2013-10-06 14:24:42 +02:00
Willem Jan Palenstijn
ead4e83180 WINTERMUTE: Remove presumably outdated off-by-one correction
This correction no longer seems to be necessary, and removes an
off-by-one in the J.U.L.I.A. Demo main menu screen.
2013-10-06 14:24:38 +02:00
Willem Jan Palenstijn
15d57c8a9c WINTERMUTE: Let pixel blending functions be inlined 2013-10-05 17:45:00 +02:00
Willem Jan Palenstijn
0e2cf28d99 WINTERMUTE: Speed up scale()
This is a tweaked version of a patch from eriktorbjorn.
2013-10-05 00:10:09 +02:00
Willem Jan Palenstijn
25bff46fe6 WINTERMUTE: Update full screen on ScreenChanged
This fixes the screen not updating after e.g., scaler changes.
Bug #3594245.
2013-10-03 22:00:21 +02:00
Willem Jan Palenstijn
3384befff7 WINTERMUTE: Add missing break
Confirmed by Mnemonic.
2013-10-03 11:14:31 +02:00
Willem Jan Palenstijn
98efd44407 WINTERMUTE: Remove unused _drawNum 2013-10-02 10:54:43 +02:00
Willem Jan Palenstijn
408880fa54 WINTERMUTE: Fix regression with _skipThisFrame
This broke loading in Broken Circle demo.

We now reset the queue state when skipping a frame, and re-use
lastFrameIter instead of keeping track of lastAddedTicket separately.
2013-10-02 09:39:07 +02:00
Willem Jan Palenstijn
92bd22b1d5 WINTERMUTE: Fix regression in ticketing
This caused a crash when pressing 'New Game' in the Black Circle demo.
Regression from 544e4a2f49.
2013-10-02 00:41:18 +02:00
Filippos Karapetis
db5ff22410 WINTERMUTE: Handle invalid file access in Carol Reed 6: Black Circle 2013-10-02 00:45:29 +03:00
Willem Jan Palenstijn
a979072410 WINTERMUTE: Clean up byte/char casts in loading/parsing 2013-10-01 23:20:43 +02:00
Willem Jan Palenstijn
e0dd19a21c WINTERMUTE: Fix broken uint32/ulong cast 2013-10-01 23:20:42 +02:00
Willem Jan Palenstijn
2ec84600a9 WINTERMUTE: Fix up doxygen comment 2013-10-01 08:11:27 +02:00
Willem Jan Palenstijn
8e58be7a1d Merge branch 'master' into wme_rendering 2013-09-30 22:05:32 +02:00
Willem Jan Palenstijn
057b01951a WINTERMUTE: Add displayTiled function to replace repeatLastDraw
This avoids queueing many tickets for a UITiledImage, replacing
them by a single tiled ticket.
2013-09-30 22:03:48 +02:00
Eugene Sandulenko
5cc0850a67 WINTERMUTE: Fix compiler warnings 2013-09-30 14:36:59 +03:00
Einar Johan Trøan Sømåen
48ad18d266 Merge branch 'refac'
Conflicts:
	engines/wintermute/graphics/transparent_surface.cpp
	engines/wintermute/graphics/transparent_surface.h
2013-09-30 11:23:57 +02:00
Einar Johan Trøan Sømåen
ccd3258bdc WINTERMUTE: Use ; and not , to separate delete and new. 2013-09-30 11:19:54 +02:00
Einar Johan Trøan Sømåen
12e7cb401f WINTERMUTE: Formatting with Astyle (UIButton, UIEdit, UIObject, UIWindow, TransparentSurface) 2013-09-30 11:18:54 +02:00
Einar Johan Trøan Sømåen
15d98724d8 WINTERMUTE: Formatting (Clean up extra whitespace in UIObject). 2013-09-30 11:13:29 +02:00
Einar Johan Trøan Sømåen
5afb297e39 WINTERMUTE: Constify some getters in TransparentSurface, UIObject and UIWindow 2013-09-30 11:12:25 +02:00
Willem Jan Palenstijn
af8fa194be WINTERMUTE: Remove almost unused _colorMod field
The one actual use of this left-over variable was a bug breaking at
least menu text color in Chivalry when dirty rects were disabled.
2013-09-30 09:38:32 +02:00
Willem Jan Palenstijn
1c3202794a WINTERMUTE: Fix typo in comment 2013-09-29 22:49:07 +02:00
Willem Jan Palenstijn
2242917dda WINTERMUTE: Do antialiased TT font rendering 2013-09-29 22:27:56 +02:00
Willem Jan Palenstijn
265f7e463e WINTERMUTE: Cleanup 2013-09-26 10:49:25 +02:00
Willem Jan Palenstijn
efdf2d3ab7 WINTERMUTE: Remove ticket->_drawNum 2013-09-26 02:17:31 +02:00
Willem Jan Palenstijn
4386889dd5 WINTERMUTE: Remove left-over asserts 2013-09-26 02:17:31 +02:00
Willem Jan Palenstijn
4aa4c427da WINTERMUTE: Remove unnecessary loop 2013-09-26 02:17:28 +02:00
Willem Jan Palenstijn
544e4a2f49 WINTERMUTE: No longer update ticket->_drawNum 2013-09-26 02:17:26 +02:00
Willem Jan Palenstijn
6d1ca9d94e WINTERMUTE: No longer use ticket->_drawNum 2013-09-26 02:17:26 +02:00
Willem Jan Palenstijn
b27ac796d8 WINTERMUTE: Remove unnecessary re-iteration 2013-09-26 02:17:26 +02:00
Willem Jan Palenstijn
dbbf95ca50 WINTERMUTE: Mirror _drawNum with an iterator 2013-09-26 02:17:22 +02:00
Willem Jan Palenstijn
c6220a9cd1 WINTERMUTE: Remove _tempDisableDirtyRects 2013-09-26 02:17:05 +02:00
Willem Jan Palenstijn
aa24cb5e8d WINTERMUTE: Remove ticket batching 2013-09-26 02:17:05 +02:00
Willem Jan Palenstijn
ade516a996 WINTERMUTE: Fix warning 2013-09-26 02:16:20 +02:00
Einar Johan Trøan Sømåen
f5fa2edd22 WINTERMUTE: Remove asserts in Blend-functions in TransparentSurface. 2013-09-23 19:07:24 +02:00
Tobia Tesan
d6c21f8c1e WINTERMUTE: Pass blendMode to blit() in RenderTicket. 2013-09-23 19:06:57 +02:00
Tobia Tesan
b4161f54b6 WINTERMUTE: Add support for additive/subtractive blending in TransparentSurface 2013-09-23 19:06:32 +02:00
Tobia Tesan
c0c3854fe2 WINTERMUTE: Match type of angle constant to struct in TransformStruct, silence warnings 2013-09-23 19:05:58 +02:00
Tobia Tesan
f7a9e921ae WINTERMUTE: Formatting 2013-09-21 23:22:50 +02:00
Tobia Tesan
1023ac4b33 WINTERMUTE: const'ify getters 2013-09-21 23:22:48 +02:00