diff options
| author | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
| commit | 75e8452b6e6a2bf4fb2f588aa00b428a60d873b5 (patch) | |
| tree | f29541d55309487a94bd1d38e8b53bb3dde9aec6 /engines/cine | |
| parent | 48ee83b88957dab86bc763e9ef21a70179fa8679 (diff) | |
| parent | e9f50882ea5b6beeefa994040be9d3bab6a1f107 (diff) | |
| download | scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.gz scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.bz2 scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.zip | |
OPENGL: Merged from trunk, from rev 52105 to 53396.
This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.
Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.
svn-id: r53399
Diffstat (limited to 'engines/cine')
| -rw-r--r-- | engines/cine/pal.cpp | 3 | ||||
| -rw-r--r-- | engines/cine/part.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/engines/cine/pal.cpp b/engines/cine/pal.cpp index 27d0e593da..34b196d5c7 100644 --- a/engines/cine/pal.cpp +++ b/engines/cine/pal.cpp @@ -186,8 +186,7 @@ const Graphics::PixelFormat &Palette::colorFormat() const { void Palette::setGlobalOSystemPalette() const { byte buf[256 * 4]; // Allocate space for the largest possible palette // The color format used by OSystem's setPalette-function: - static const Graphics::PixelFormat kSystemPalFormat(4, 8, 8, 8, 0, 0, 8, 16, 0); - save(buf, sizeof(buf), kSystemPalFormat, CINE_LITTLE_ENDIAN); + save(buf, sizeof(buf), Graphics::PixelFormat(4, 8, 8, 8, 0, 0, 8, 16, 0), CINE_LITTLE_ENDIAN); if (g_cine->getPlatform() == Common::kPlatformAmiga && colorCount() == 16) { // The Amiga version of Future Wars does use the upper 16 colors for a darkened diff --git a/engines/cine/part.cpp b/engines/cine/part.cpp index 95f3789abd..f5c9402388 100644 --- a/engines/cine/part.cpp +++ b/engines/cine/part.cpp @@ -164,7 +164,7 @@ void CineEngine::readVolCnf() { // All file name blocks' sizes were divisible by either 11 or 13, but not with both. fileNameLength = (fileNameLenMod11 ? 11 : 13); } else { - warning("Couldn't deduce file name length from data in 'vol.cnf', using a backup deduction scheme."); + warning("Couldn't deduce file name length from data in 'vol.cnf', using a backup deduction scheme"); // Here we use the former file name length detection method // if we couldn't deduce the file name length from the data. fileNameLength = (compressed ? 11 : 13); |