[Scummvm-cvs-logs] CVS: scummvm 2xsai.cpp,1.2,1.3 gameDetector.cpp,1.31,1.32 readme.txt,1.31,1.32 sdl.cpp,1.100,1.101 system.h,1.15,1.16
James Brown
ender at users.sourceforge.net
Wed Apr 24 00:43:04 CEST 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv20653
Modified Files:
2xsai.cpp gameDetector.cpp readme.txt sdl.cpp system.h
Log Message:
Add new Scale mode. Thanks Gregory Montoir.
Index: 2xsai.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/2xsai.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** 2xsai.cpp 18 Apr 2002 08:34:47 -0000 1.2
--- 2xsai.cpp 24 Apr 2002 07:42:29 -0000 1.3
***************
*** 732,733 ****
--- 732,763 ----
}
}
+
+ void AdvMame2x(uint8 *srcPtr, uint32 srcPitch, uint8 *null, uint8 *dstPtr, uint32 dstPitch, int width, int height)
+ {
+ unsigned int nextlineSrc = srcPitch / sizeof(short);
+ short* p = (short*)srcPtr;
+
+ unsigned nextlineDst = dstPitch / sizeof(short);
+ short* q = (short*)dstPtr;
+
+ for(int j = 0; j < height; ++j) {
+ for(int i = 0; i < width; ++i) {
+ short A = *(p + i - nextlineSrc - 1);
+ short B = *(p + i - nextlineSrc);
+ short C = *(p + i - nextlineSrc + 1);
+ short D = *(p + i - 1);
+ short E = *(p + i );
+ short F = *(p + i + 1);
+ short G = *(p + i + nextlineSrc - 1);
+ short H = *(p + i + nextlineSrc);
+ short I = *(p + i + nextlineSrc + 1);
+
+ *(q + (i << 1)) = D == B && B != F && D != H ? D : E;
+ *(q + (i << 1) + 1) = B == F && B != D && F != H ? F : E;
+ *(q + (i << 1) + nextlineDst) = D == H && D != B && H != F ? D : E;
+ *(q + (i << 1) + nextlineDst + 1) = H == F && D != H && B != F ? F : E;
+ }
+ p += nextlineSrc;
+ q += nextlineDst << 1;
+ }
+ }
Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** gameDetector.cpp 23 Apr 2002 18:11:35 -0000 1.31
--- gameDetector.cpp 24 Apr 2002 07:42:29 -0000 1.32
***************
*** 47,51 ****
"\tr - emulate roland mt32 instruments\n"
"\tf - fullscreen mode\n"
! "\tg<mode> - graphics mode. normal,2x,3x,2xsai,super2xsai,supereagle\n"
"\ta - specify game is amiga version\n"
;
--- 47,51 ----
"\tr - emulate roland mt32 instruments\n"
"\tf - fullscreen mode\n"
! "\tg<mode> - graphics mode. normal,2x,3x,2xsai,super2xsai,supereagle.advmame2x\n"
"\ta - specify game is amiga version\n"
;
***************
*** 180,183 ****
--- 180,184 ----
{"super2xsai",GFX_SUPER2XSAI},
{"supereagle",GFX_SUPEREAGLE},
+ {"advmame2x",GFX_ADVMAME2X}
};
Index: readme.txt
===================================================================
RCS file: /cvsroot/scummvm/scummvm/readme.txt,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** readme.txt 22 Apr 2002 11:18:11 -0000 1.31
--- readme.txt 24 Apr 2002 07:42:29 -0000 1.32
***************
*** 93,101 ****
Sam and Max:
- Subgames are not fully functional.
- - Some overlap may occur in graphics, expecially the intro
- - Music isn't perfect. Some overlap may occur
Loom (256 Talkie):
- - CD music and voices are not totally syncronised
- If you are having random crashes, this is a Windows bug.
Try copying the data files from CD to your harddisk.
--- 93,98 ----
***************
*** 228,231 ****
--- 225,229 ----
-gsuper2xsai - Enhanced 2xsai filtering. 640x480 screen/window size
-gsupereagle - Less blurry than 2xsai, but slower. Also 640x480
+ -gadvmame2x - 640x480 scaling. Doesn't rely on blurring like 2xSAI.
Note that filters are very slow when ScummVM is compiled in a debug
***************
*** 350,358 ****
Janne Huttunen - Zak256/Indy256/LoomCD actor mask support
Jeroen Janssen - Numerous readability and bugfix patches
Edward Rudd - Fixes for playing MP3 versions of MI1/Loom Audio
Daniel Schepler - Final MI1 CD music support
Tim 'realmz' - Initial MI1 CD music support
Jonathan 'khalek' - Expert weaver in the Loom
!
And to all the contributors, users, and beta testers we've missed.
Thanks!
--- 348,357 ----
Janne Huttunen - Zak256/Indy256/LoomCD actor mask support
Jeroen Janssen - Numerous readability and bugfix patches
+ Gregory Montoir - AdvanceMAME Scale-2X implementation
Edward Rudd - Fixes for playing MP3 versions of MI1/Loom Audio
Daniel Schepler - Final MI1 CD music support
Tim 'realmz' - Initial MI1 CD music support
Jonathan 'khalek' - Expert weaver in the Loom
!
And to all the contributors, users, and beta testers we've missed.
Thanks!
Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** sdl.cpp 22 Apr 2002 18:01:32 -0000 1.100
--- sdl.cpp 24 Apr 2002 07:42:29 -0000 1.101
***************
*** 189,192 ****
--- 189,195 ----
void SuperEagle(uint8 *srcPtr, uint32 srcPitch, uint8 *deltaPtr,
uint8 *dstPtr, uint32 dstPitch, int width, int height);
+ void AdvMame2x(uint8 *srcPtr, uint32 srcPitch, uint8 *null,
+ uint8 *dstPtr, uint32 dstPitch, int width, int height);
+
***************
*** 251,254 ****
--- 254,260 ----
case GFX_SUPEREAGLE:
_sai_func = SuperEagle;
+ break;
+ case GFX_ADVMAME2X:
+ _sai_func = AdvMame2x;
break;
Index: system.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/system.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** system.h 21 Apr 2002 17:46:41 -0000 1.15
--- system.h 24 Apr 2002 07:42:29 -0000 1.16
***************
*** 154,157 ****
--- 154,158 ----
GFX_SUPER2XSAI = 4,
GFX_SUPEREAGLE = 5,
+ GFX_ADVMAME2X = 6
};
More information about the Scummvm-git-logs
mailing list