[Scummvm-cvs-logs] SF.net SVN: scummvm:[41672] scummvm/branches/gsoc2009-mods
nolange at users.sourceforge.net
nolange at users.sourceforge.net
Fri Jun 19 13:24:07 CEST 2009
Revision: 41672
http://scummvm.svn.sourceforge.net/scummvm/?rev=41672&view=rev
Author: nolange
Date: 2009-06-19 11:24:06 +0000 (Fri, 19 Jun 2009)
Log Message:
-----------
Ugly hack for fixing color palette
Modified Paths:
--------------
scummvm/branches/gsoc2009-mods/engines/scumm/palette.cpp
scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp
scummvm/branches/gsoc2009-mods/sound/mods/tfmx.h
Modified: scummvm/branches/gsoc2009-mods/engines/scumm/palette.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/scumm/palette.cpp 2009-06-19 11:16:57 UTC (rev 41671)
+++ scummvm/branches/gsoc2009-mods/engines/scumm/palette.cpp 2009-06-19 11:24:06 UTC (rev 41672)
@@ -167,7 +167,7 @@
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 @@
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 @@
memcpy(_darkenPalette, _currentPalette, 768);
}
+ setAmigaPalette();
+
setDirtyColors(0, numcolor - 1);
}
Modified: scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp 2009-06-19 11:16:57 UTC (rev 41671)
+++ scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp 2009-06-19 11:24:06 UTC (rev 41672)
@@ -211,7 +211,7 @@
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;
Modified: scummvm/branches/gsoc2009-mods/sound/mods/tfmx.h
===================================================================
--- scummvm/branches/gsoc2009-mods/sound/mods/tfmx.h 2009-06-19 11:16:57 UTC (rev 41671)
+++ scummvm/branches/gsoc2009-mods/sound/mods/tfmx.h 2009-06-19 11:24:06 UTC (rev 41672)
@@ -144,7 +144,7 @@
uint8 relVol;
uint8 note;
uint8 prevNote;
- int16 fineTune;
+ int16 fineTune; // always a signextended byte
uint8 portaSkip;
uint8 portaCount;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list