[Scummvm-cvs-logs] CVS: scummvm gameDetector.cpp,1.18,1.19 gameDetector.h,1.9,1.10 gfx.cpp,1.66,1.67 gfx.h,1.3,1.4
James Brown
ender at users.sourceforge.net
Tue Apr 16 20:12:04 CEST 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv16469
Modified Files:
gameDetector.cpp gameDetector.h gfx.cpp gfx.h
Log Message:
Add Amiga palette option (-a)
Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** gameDetector.cpp 16 Apr 2002 23:24:59 -0000 1.18
--- gameDetector.cpp 17 Apr 2002 03:11:37 -0000 1.19
***************
*** 47,51 ****
"\tf - fullscreen mode\n"
"\tg<mode> - graphics mode. normal,2x,3x,2xsai,super2xsai,supereagle\n"
! "\ta - load autosave game (for recovering from crashes)\n"
;
--- 47,51 ----
"\tf - fullscreen mode\n"
"\tg<mode> - graphics mode. normal,2x,3x,2xsai,super2xsai,supereagle\n"
! "\ta - specify game is amiga version\n"
;
***************
*** 71,75 ****
switch (tolower(*s)) {
case 'a':
! _restore = true;
break;
case 'b':
--- 71,75 ----
switch (tolower(*s)) {
case 'a':
! _amiga = true;
break;
case 'b':
***************
*** 388,391 ****
--- 388,394 ----
_gameDataPath = strdup("");
}
+
+ if (_amiga)
+ _features = _features | GF_AMIGA;
return (0);
Index: gameDetector.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gameDetector.h 15 Apr 2002 18:07:55 -0000 1.9
--- gameDetector.h 17 Apr 2002 03:11:37 -0000 1.10
***************
*** 38,41 ****
--- 38,42 ----
byte _sfx_volume;
bool _mt32emulate;
+ bool _amiga;
uint16 _debugMode;
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gfx.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** gfx.cpp 16 Apr 2002 12:07:16 -0000 1.66
--- gfx.cpp 17 Apr 2002 03:11:37 -0000 1.67
***************
*** 750,756 ****
byte code = *_smap_ptr++;
-
assert(_numLinesToProcess);
switch (code) {
case 1:
--- 750,760 ----
byte code = *_smap_ptr++;
assert(_numLinesToProcess);
+ if (_vm->_features & GF_AMIGA)
+ _palette_mod = 16;
+ else
+ _palette_mod = 0;
+
switch (code) {
case 1:
***************
*** 1054,1058 ****
_currentX = 8;
do {
! FILL_BITS * dst++ = color;
againPos:;
--- 1058,1062 ----
_currentX = 8;
do {
! FILL_BITS * dst++ = color + _palette_mod;;
againPos:;
***************
*** 1072,1076 ****
return;
}
! *dst++ = color;
} while (--reps);
bits >>= 8;
--- 1076,1080 ----
return;
}
! *dst++ = color + _palette_mod;
} while (--reps);
bits >>= 8;
***************
*** 1106,1110 ****
do {
FILL_BITS if (color != _transparency)
! *dst = color;
dst++;
if (!READ_BIT) {
--- 1110,1114 ----
do {
FILL_BITS if (color != _transparency)
! *dst = color + _palette_mod;
dst++;
if (!READ_BIT) {
***************
*** 1141,1145 ****
do {
FILL_BITS if (color != _transparency)
! *dst = color;
dst++;
--- 1145,1149 ----
do {
FILL_BITS if (color != _transparency)
! *dst = color + _palette_mod;
dst++;
***************
*** 1173,1177 ****
return;
}
! *dst++ = color;
} while (--reps);
}
--- 1177,1181 ----
return;
}
! *dst++ = color + _palette_mod;
} while (--reps);
}
***************
*** 1206,1210 ****
do {
FILL_BITS if (color != _transparency)
! *dst = color;
dst += 320;
if (!READ_BIT) {
--- 1210,1214 ----
do {
FILL_BITS if (color != _transparency)
! *dst = color + _palette_mod;
dst += 320;
if (!READ_BIT) {
***************
*** 1240,1244 ****
_currentX = 8;
do {
! FILL_BITS * dst++ = color;
if (!READ_BIT) {
} else if (!READ_BIT) {
--- 1244,1248 ----
_currentX = 8;
do {
! FILL_BITS * dst++ = color + _palette_mod;
if (!READ_BIT) {
} else if (!READ_BIT) {
***************
*** 1272,1276 ****
_tempNumLines = _numLinesToProcess;
do {
! FILL_BITS * dst = color;
dst += 320;
if (!READ_BIT) {
--- 1276,1280 ----
_tempNumLines = _numLinesToProcess;
do {
! FILL_BITS * dst = color + _palette_mod;
dst += 320;
if (!READ_BIT) {
***************
*** 2192,2197 ****
{
int w, h, i;
! if (_features & GF_SMALL_HEADER)
! return 0;
l >>= 3;
if (l < 0)
--- 2196,2200 ----
{
int w, h, i;
!
l >>= 3;
if (l < 0)
***************
*** 2211,2216 ****
do {
for (i = 0; i <= w; i++)
! if (mem[i])
return true;
mem += 40;
} while (--h);
--- 2214,2221 ----
do {
for (i = 0; i <= w; i++)
! if (mem[i]) {
! //printf("memi is %d\n", mem[i]);
return true;
+ }
mem += 40;
} while (--h);
Index: gfx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gfx.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gfx.h 12 Apr 2002 21:26:34 -0000 1.3
--- gfx.h 17 Apr 2002 03:11:37 -0000 1.4
***************
*** 129,132 ****
--- 129,133 ----
byte *_z_plane_ptr;
+ byte _palette_mod;
byte _decomp_shr, _decomp_mask;
byte _transparency;
More information about the Scummvm-git-logs
mailing list