[Scummvm-cvs-logs] CVS: scummvm scumm.h,1.74,1.75 scummvm.cpp,1.72,1.73 sdl.cpp,1.38,1.39
James Brown
ender at users.sourceforge.net
Sat Mar 9 23:49:02 CET 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv28413
Modified Files:
scumm.h scummvm.cpp sdl.cpp
Log Message:
Basic 2xSaI support. A little buggy. Use by starting with a -g1 parameter.
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** scumm.h 9 Mar 2002 00:56:21 -0000 1.74
--- scumm.h 10 Mar 2002 07:48:01 -0000 1.75
***************
*** 827,836 ****
WIO_GLOBAL = 2,
WIO_LOCAL = 3,
! WIO_FLOBJECT = 4,
};
enum MouseButtonStatus {
msDown = 1,
! msClicked = 2,
};
--- 827,841 ----
WIO_GLOBAL = 2,
WIO_LOCAL = 3,
! WIO_FLOBJECT = 4
};
enum MouseButtonStatus {
msDown = 1,
! msClicked = 2
! };
!
! enum VideoMode {
! VIDEO_SCALE = 0,
! VIDEO_2XSAI = 1
};
***************
*** 976,979 ****
--- 981,985 ----
bool _fullScreen;
+ int _videoMode;
byte _bkColor;
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** scummvm.cpp 9 Mar 2002 15:07:32 -0000 1.72
--- scummvm.cpp 10 Mar 2002 07:48:01 -0000 1.73
***************
*** 201,204 ****
--- 201,205 ----
_gameDataPath = NULL;
_gameTempo = 0;
+ _videoMode = 0;
parseCommandLine(argc, argv);
***************
*** 419,423 ****
"\tp<path> - look for game in <path>\n" \
"\tm<num> - Set music volume to <num> (0-100)\n" \
! "\tf - fullscreen mode\n"
void Scumm::parseCommandLine(int argc, char **argv) {
--- 420,425 ----
"\tp<path> - look for game in <path>\n" \
"\tm<num> - Set music volume to <num> (0-100)\n" \
! "\tf - fullscreen mode\n" \
! "\tg - graphics mode. 1 for 2xSai anti-aliasing\n"
void Scumm::parseCommandLine(int argc, char **argv) {
***************
*** 491,494 ****
--- 493,502 ----
goto NextArg;
}
+ case 'g':
+ if (*(s+1) == '\0')
+ goto ShowHelpAndExit;
+ _videoMode = atoi(s+1);
+ goto NextArg;
+
default:
ShowHelpAndExit:;
Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** sdl.cpp 9 Mar 2002 13:48:02 -0000 1.38
--- sdl.cpp 10 Mar 2002 07:48:01 -0000 1.39
***************
*** 40,43 ****
--- 40,49 ----
static SDL_CD *cdrom;
+ /* For 2xSAI */
+ static SDL_Surface *sdl_hwscreen;
+ static SDL_Surface *sdl_tmpscreen;
+ int Init_2xSaI (uint32 BitFormat);
+ void _2xSaI (uint8 *srcPtr, uint32 srcPitch, uint8 *deltaPtr, uint8 *dstPtr, uint32 dstPitch, int width, int height);
+
static int current_shake_pos;
[...967 lines suppressed...]
+ else if (y2 <= x1) // close to D
+ {
+ a1 = x1 - y2;
+ product1 = Bilinear (B, D, a1);
+ }
+ }
+ /*3*/
+ else
+ {
+ product1 = Bilinear4 (A, B, C, D, x1, y1);
+ }
+
+ //end First Pixel
+ *(uint32 *) dP = product1;
+ dP += 2;
+ w += dw;
+ }
+ dstPtr += dstPitch;
+ }
+ }
More information about the Scummvm-git-logs
mailing list