libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-01 23:18:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ugly hack for fixing color palette

Browse Source 
svn-id: r41672
This commit is contained in:
Norbert Lange 2009-06-19 11:24:06 +00:00
parent 6126341755
commit c3596c184b
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
engines/scumm/palette.cpp
View File

@ -167,7 +167,7 @@ void ScummEngine::setNESPalette() {
setPalColor(0x3E,0x00,0x00,0x00);
setPalColor(0x3F,0x00,0x00,0x00);
}
/*
void ScummEngine::setAmigaPalette() {
setPalColor( 0, 0, 0, 0);
setPalColor( 1, 0, 0, 187);
@ -185,6 +185,25 @@ void ScummEngine::setAmigaPalette() {
setPalColor(13, 255, 0, 255);
setPalColor(14, 255, 255, 0);
setPalColor(15, 255, 255, 255);
} */
void ScummEngine::setAmigaPalette() {
setPalColor( 0, 0, 0, 0);
setPalColor( 1, 0, 0, 170);
setPalColor( 2, 0, 136, 34);
setPalColor( 3, 0, 102, 119);
setPalColor( 4, 187, 102, 102);
setPalColor( 5, 170, 34, 170);
setPalColor( 6, 136, 85, 34);
setPalColor( 7, 119, 119, 119);
setPalColor( 8, 51, 51, 51);
setPalColor( 9, 34, 85, 221);
setPalColor(10, 34, 221, 68);
setPalColor(11, 0, 204, 255);
setPalColor(12, 255, 153, 153);
setPalColor(13, 255, 85, 255);
setPalColor(14, 255, 255, 119);
setPalColor(15, 255, 255, 255);
}
void ScummEngine::setHercPalette() {
@ -302,6 +321,8 @@ void ScummEngine::setPaletteFromPtr(const byte *ptr, int numcolor) {
memcpy(_darkenPalette, _currentPalette, 768);
}
setAmigaPalette();
setDirtyColors(0, numcolor - 1);
}

2
sound/mods/tfmx.cpp
View File

@ -211,7 +211,7 @@ FORCEINLINE bool Tfmx::macroStep(ChannelContext &channel) {
case 0x13: // DMA Off. Parameters: deferWait, addset, vol
// TODO: implement PArameters
Paula::disableChannel(channel.paulaChannel);
channel.deferWait = macroPtr[1] >= 1;
channel.deferWait = (macroPtr[1] != 0);
if (channel.deferWait) {
// if set, then we expect a DMA On in the same tick.
channel.period = 4;

2
sound/mods/tfmx.h
View File

@ -144,7 +144,7 @@ public:
uint8 relVol;
uint8 note;
uint8 prevNote;
int16 fineTune;
int16 fineTune; // always a signextended byte
uint8 portaSkip;
uint8 portaCount;