[Scummvm-cvs-logs] CVS: scummvm/scumm palette.cpp,2.56,2.57 saveload.cpp,1.257,1.258 scumm.cpp,1.645,1.646 scumm.h,1.657,1.658
kirben
kirben at users.sourceforge.net
Sun Nov 20 00:30:01 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv358/scumm
Modified Files:
palette.cpp saveload.cpp scumm.cpp scumm.h
Log Message:
Update Commodore 64 palette table.
Cleanup.
Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/palette.cpp,v
retrieving revision 2.56
retrieving revision 2.57
diff -u -d -r2.56 -r2.57
--- palette.cpp 1 Nov 2005 02:43:54 -0000 2.56
+++ palette.cpp 20 Nov 2005 08:29:17 -0000 2.57
@@ -32,21 +32,21 @@
void ScummEngine::setupC64Palette() {
setPalColor( 0, 0x00, 0x00, 0x00);
- setPalColor( 1, 0xFF, 0xFF, 0xFF);
- setPalColor( 2, 0x99, 0x00, 0x00);
- setPalColor( 3, 0x00, 0xff, 0xcc);
- setPalColor( 4, 0xcc, 0x00, 0xcc);
- setPalColor( 5, 0x44, 0xcc, 0x44);
- setPalColor( 6, 0x11, 0x00, 0x99);
- setPalColor( 7, 0xff, 0xff, 0x00);
- setPalColor( 8, 0xaa, 0x55, 0x00);
- setPalColor( 9, 0x66, 0x33, 0x00);
- setPalColor(10, 0xff, 0x66, 0x66);
- setPalColor(11, 0x40, 0x40, 0x40);
- setPalColor(12, 0x80, 0x80, 0x80);
- setPalColor(13, 0x66, 0xff, 0x66);
- setPalColor(14, 0x77, 0x77, 0xff);
- setPalColor(15, 0xc0, 0xc0, 0xc0);
+ setPalColor( 1, 0xFD, 0xFE, 0xFC);
+ setPalColor( 2, 0xBE, 0x1A, 0x24);
+ setPalColor( 3, 0x30, 0xE6, 0xC6);
+ setPalColor( 4, 0xB4, 0x1A, 0xE2);
+ setPalColor( 5, 0x1F, 0xD2, 0x1E);
+ setPalColor( 6, 0x21, 0x1B, 0xAE);
+ setPalColor( 7, 0xDF, 0xF6, 0x0A);
+ setPalColor( 8, 0xB8, 0x41, 0x04);
+ setPalColor( 9, 0x6A, 0x33, 0x04);
+ setPalColor(10, 0xFE, 0x4A, 0x57);
+ setPalColor(11, 0x42, 0x45, 0x40);
+ setPalColor(12, 0x70, 0x74, 0x6F);
+ setPalColor(13, 0x59, 0xFE, 0x59);
+ setPalColor(14, 0x5F, 0x53, 0xFE);
+ setPalColor(15, 0xA4, 0xA7, 0xA2);
setPalColor(16, 255, 85, 255);
}
@@ -185,7 +185,7 @@
setPalColor(15, 255, 255, 255);
}
-void ScummEngine::setupV1ManiacPalette() {
+void ScummEngine::setupV1Palette() {
setPalColor( 0, 0, 0, 0);
setPalColor( 1, 255, 255, 255);
setPalColor( 2, 170, 0, 0);
@@ -201,28 +201,11 @@
setPalColor(12, 170, 170, 170);
setPalColor(13, 85, 255, 85);
setPalColor(14, 85, 85, 255);
- setPalColor(15, 85, 85, 85);
-
- setPalColor(16, 255, 85, 255);
-}
-void ScummEngine::setupV1ZakPalette() {
- setPalColor( 0, 0, 0, 0);
- setPalColor( 1, 255, 255, 255);
- setPalColor( 2, 170, 0, 0);
- setPalColor( 3, 0, 170, 170);
- setPalColor( 4, 170, 0, 170);
- setPalColor( 5, 0, 170, 0);
- setPalColor( 6, 0, 0, 170);
- setPalColor( 7, 255, 255, 85);
- setPalColor( 8, 255, 85, 85);
- setPalColor( 9, 170, 85, 0);
- setPalColor(10, 255, 85, 85);
- setPalColor(11, 85, 85, 85);
- setPalColor(12, 170, 170, 170);
- setPalColor(13, 85, 255, 85);
- setPalColor(14, 85, 85, 255);
- setPalColor(15, 170, 170, 170);
+ if (_gameId == GID_ZAK)
+ setPalColor(15, 170, 170, 170);
+ else
+ setPalColor(15, 85, 85, 85);
setPalColor(16, 255, 85, 255);
}
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -d -r1.257 -r1.258
--- saveload.cpp 15 Nov 2005 22:50:14 -0000 1.257
+++ saveload.cpp 20 Nov 2005 08:29:17 -0000 1.258
@@ -320,16 +320,12 @@
// for backwards compatibility, and it may still prove useful if we
// ever add options for using different 16-colour palettes.
if (_version == 1) {
- if (_platform == Common::kPlatformC64)
+ if (_platform == Common::kPlatformC64) {
setupC64Palette();
- else {
- if (_gameId == GID_MANIAC)
- if (_platform == Common::kPlatformNES)
- setupNESPalette();
- else
- setupV1ManiacPalette();
- else
- setupV1ZakPalette();
+ } else if (_platform == Common::kPlatformNES) {
+ setupNESPalette();
+ } else {
+ setupV1Palette();
}
} else if (_features & GF_16COLOR) {
switch (_renderMode) {
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.645
retrieving revision 1.646
diff -u -d -r1.645 -r1.646
--- scumm.cpp 19 Nov 2005 04:07:47 -0000 1.645
+++ scumm.cpp 20 Nov 2005 08:29:17 -0000 1.646
@@ -1822,16 +1822,12 @@
// line
// Original games used some kind of dynamic
// color table remapping between rooms
- if (_platform == Common::kPlatformC64)
+ if (_platform == Common::kPlatformC64) {
setupC64Palette();
- else {
- if (_gameId == GID_MANIAC) {
- if (_platform == Common::kPlatformNES)
- setupNESPalette();
- else
- setupV1ManiacPalette();
- } else
- setupV1ZakPalette();
+ } else if (_platform == Common::kPlatformNES) {
+ setupNESPalette();
+ } else {
+ setupV1Palette();
}
} else if (_features & GF_16COLOR) {
for (i = 0; i < 16; i++)
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.657
retrieving revision 1.658
diff -u -d -r1.657 -r1.658
--- scumm.h 19 Nov 2005 03:37:34 -0000 1.657
+++ scumm.h 20 Nov 2005 08:29:17 -0000 1.658
@@ -982,8 +982,7 @@
void setupHercPalette();
void setupCGAPalette();
void setupEGAPalette();
- void setupV1ManiacPalette();
- void setupV1ZakPalette();
+ void setupV1Palette();
void setPalette(int pal);
void setRoomPalette(int pal, int room);
virtual void setPaletteFromPtr(const byte *ptr, int numcolor = -1);
More information about the Scummvm-git-logs
mailing list