libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-25 03:07:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- Fix AMIGA to DOS palette conversion

Browse Source 
- Amiga version uses 13 instead of 12 palette buffers

svn-id: r43220
This commit is contained in:
Johannes Schickel 2009-08-10 19:08:00 +00:00
parent 7dfa30d3fe
commit cb8b2d7799
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
engines/kyra/screen.cpp
View File

@ -110,7 +110,7 @@ bool Screen::init() {
memset(_shapePages, 0, sizeof(_shapePages)); memset(_shapePages, 0, sizeof(_shapePages));
const int paletteCount = (_vm->gameFlags().platform == Common::kPlatformAmiga) ? 12 : 4; const int paletteCount = (_vm->gameFlags().platform == Common::kPlatformAmiga) ? 13 : 4;
const int numColors = _use16ColorMode ? 16 : ((_vm->gameFlags().platform == Common::kPlatformAmiga) ? 32 : 256); const int numColors = _use16ColorMode ? 16 : ((_vm->gameFlags().platform == Common::kPlatformAmiga) ? 32 : 256);
_interfacePaletteEnabled = false; _interfacePaletteEnabled = false;
@ -3247,9 +3247,9 @@ void Palette::loadAmigaPalette(Common::ReadStream &stream, int startIndex, int c
for (int i = 0; i < colors; ++i) { for (int i = 0; i < colors; ++i) {
uint16 col = stream.readUint16BE(); uint16 col = stream.readUint16BE();
_palData[(i + startIndex) * 3 + 2] = ((col & 0xF) * 0xFF) / 0x3F; col >>= 4; _palData[(i + startIndex) * 3 + 2] = ((col & 0xF) * 0x3F) / 0xF; col >>= 4;
_palData[(i + startIndex) * 3 + 1] = ((col & 0xF) * 0xFF) / 0x3F; col >>= 4; _palData[(i + startIndex) * 3 + 1] = ((col & 0xF) * 0x3F) / 0xF; col >>= 4;
_palData[(i + startIndex) * 3 + 0] = ((col & 0xF) * 0xFF) / 0x3F; col >>= 4; _palData[(i + startIndex) * 3 + 0] = ((col & 0xF) * 0x3F) / 0xF; col >>= 4;
} }
} }
@ -3259,9 +3259,9 @@ void Palette::loadPC98Palette(Common::ReadStream &stream, int startIndex, int co
for (int i = 0; i < colors; ++i) { for (int i = 0; i < colors; ++i) {
const byte g = stream.readByte(), r = stream.readByte(), b = stream.readByte(); const byte g = stream.readByte(), r = stream.readByte(), b = stream.readByte();
_palData[(i + startIndex) * 3 + 0] = ((r & 0x0F) * 0x3F) / 0x0F; _palData[(i + startIndex) * 3 + 0] = ((r & 0xF) * 0x3F) / 0xF;
_palData[(i + startIndex) * 3 + 1] = ((g & 0x0F) * 0x3F) / 0x0F; _palData[(i + startIndex) * 3 + 1] = ((g & 0xF) * 0x3F) / 0xF;
_palData[(i + startIndex) * 3 + 2] = ((b & 0x0F) * 0x3F) / 0x0F; _palData[(i + startIndex) * 3 + 2] = ((b & 0xF) * 0x3F) / 0xF;
} }
} }