diff -ur scummvm-20030109\backends\sdl\sdl-common.cpp scummvm-20030109_tv2x\backends\sdl\sdl-common.cpp
old
|
new
|
|
485 | 485 | quit(); |
486 | 486 | break; |
487 | 487 | } |
488 | | // Ctr-Alt-1 till Ctrl-Alt-7 will change the GFX mode |
| 488 | // Ctr-Alt-1 till Ctrl-Alt-8 will change the GFX mode |
489 | 489 | if (b == (KBD_CTRL|KBD_ALT) && |
490 | | (ev.key.keysym.sym>='1') && (ev.key.keysym.sym<='7')) { |
| 490 | (ev.key.keysym.sym>='1') && (ev.key.keysym.sym<='8')) { |
491 | 491 | Property prop; |
492 | 492 | prop.gfx_mode = ev.key.keysym.sym - '1'; |
493 | 493 | property(PROP_SET_GFX_MODE, &prop); |
Only in scummvm-20030109_tv2x\backends\sdl: sdl-common.cpp.orig
diff -ur scummvm-20030109\backends\sdl\sdl.cpp scummvm-20030109_tv2x\backends\sdl\sdl.cpp
old
|
new
|
|
99 | 99 | _scaleFactor = 2; |
100 | 100 | _scaler_proc = AdvMame2x; |
101 | 101 | break; |
| 102 | case GFX_TV2X: |
| 103 | _scaleFactor = 2; |
| 104 | _scaler_proc = TV2x; |
| 105 | break; |
102 | 106 | |
103 | 107 | case GFX_DOUBLESIZE: |
104 | 108 | _scaleFactor = 2; |
… |
… |
|
339 | 343 | #endif |
340 | 344 | return 1; |
341 | 345 | } else if (param == PROP_SET_GFX_MODE) { |
342 | | if (value->gfx_mode >= 7) |
| 346 | if (value->gfx_mode >= 8) |
343 | 347 | return 0; |
344 | 348 | |
345 | 349 | _mode = value->gfx_mode; |
diff -ur scummvm-20030109\common\gameDetector.cpp scummvm-20030109_tv2x\common\gameDetector.cpp
old
|
new
|
|
47 | 47 | "\t-p<path> - look for game in <path>\n" |
48 | 48 | "\t-x[<num>] - load this savegame (default: 0 - autosave)\n" |
49 | 49 | "\t-f - fullscreen mode\n" |
50 | | "\t-g<mode> - graphics mode (normal,2x,3x,2xsai,super2xsai,supereagle,advmame2x)\n" |
| 50 | "\t-g<mode> - graphics mode (normal,2x,3x,2xsai,super2xsai,supereagle,advmame2x,tv2x)\n" |
51 | 51 | "\t-e<mode> - set music engine (see README for details)\n" |
52 | 52 | "\t-a - specify game is amiga version\n" |
53 | 53 | "\n" |
… |
… |
|
178 | 178 | {"super2xsai", "Super2xSAI", GFX_SUPER2XSAI}, |
179 | 179 | {"supereagle", "SuperEagle", GFX_SUPEREAGLE}, |
180 | 180 | {"advmame2x", "AdvMAME2x", GFX_ADVMAME2X}, |
| 181 | {"tv2x", "TV2x", GFX_TV2X}, |
181 | 182 | {0, 0} |
182 | 183 | }; |
183 | 184 | |
diff -ur scummvm-20030109\common\scaler.cpp scummvm-20030109_tv2x\common\scaler.cpp
old
|
new
|
|
810 | 810 | dstPtr += dstPitch3; |
811 | 811 | } |
812 | 812 | } |
| 813 | |
| 814 | void TV2x(uint8 *srcPtr, uint32 srcPitch, uint8 *null, uint8 *dstPtr, uint32 dstPitch, |
| 815 | int width, int height) |
| 816 | { |
| 817 | unsigned int nextlineSrc = srcPitch / sizeof(short); |
| 818 | short *p = (short *)srcPtr; |
| 819 | |
| 820 | unsigned int nextlineDst = dstPitch / sizeof(short); |
| 821 | short *q = (short *)dstPtr; |
| 822 | |
| 823 | while(height--) { |
| 824 | for (int i = 0, j = 0; i < width; ++i, j += 2) { |
| 825 | unsigned short p1 = *(p + i); |
| 826 | unsigned short p2 = *(p + i + nextlineSrc); |
| 827 | unsigned short pi = (unsigned short)((INTERPOLATE(p1, p2) & colorMask) >> 1); |
| 828 | |
| 829 | *(q + j) = p1; |
| 830 | *(q + j + 1) = p1; |
| 831 | *(q + j + nextlineDst) = pi; |
| 832 | *(q + j + nextlineDst + 1) = pi; |
| 833 | } |
| 834 | p += nextlineSrc; |
| 835 | q += nextlineDst << 1; |
| 836 | } |
| 837 | } |
diff -ur scummvm-20030109\common\scaler.h scummvm-20030109_tv2x\common\scaler.h
old
|
new
|
|
36 | 36 | uint8 *dstPtr, uint32 dstPitch, int width, int height); |
37 | 37 | extern void Normal3x(uint8 *srcPtr, uint32 srcPitch, uint8 *null, |
38 | 38 | uint8 *dstPtr, uint32 dstPitch, int width, int height); |
| 39 | extern void TV2x(uint8 *srcPtr, uint32 srcPitch, uint8 *null, |
| 40 | uint8 *dstPtr, uint32 dstPitch, int width, int height); |
39 | 41 | |
40 | 42 | #endif |
diff -ur scummvm-20030109\common\system.h scummvm-20030109_tv2x\common\system.h
old
|
new
|
|
215 | 215 | GFX_2XSAI = 3, |
216 | 216 | GFX_SUPER2XSAI = 4, |
217 | 217 | GFX_SUPEREAGLE = 5, |
218 | | GFX_ADVMAME2X = 6 |
| 218 | GFX_ADVMAME2X = 6, |
| 219 | GFX_TV2X = 7 |
219 | 220 | }; |
220 | 221 | |
221 | 222 | |
diff -ur scummvm-20030109\gui\options.cpp scummvm-20030109_tv2x\gui\options.cpp
old
|
new
|
|
69 | 69 | gfxPopUp->appendEntry("Super2xSAI"); |
70 | 70 | gfxPopUp->appendEntry("SuperEagle"); |
71 | 71 | gfxPopUp->appendEntry("AdvMAME2x"); |
| 72 | gfxPopUp->appendEntry("TV2x"); |
72 | 73 | gfxPopUp->setSelected(0); |
73 | 74 | |
74 | 75 | // The MIDI mode popup & a label |