[Scummvm-cvs-logs] SF.net SVN: scummvm:[38321] scummvm/trunk/engines/sci/gfx
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sun Feb 15 23:33:37 CET 2009
Revision: 38321
http://scummvm.svn.sourceforge.net/scummvm/?rev=38321&view=rev
Author: fingolfin
Date: 2009-02-15 22:33:36 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
SCI: Run astyle to make the code be more compliant with our Code Formatting Guidelines: gfx dir
Modified Paths:
--------------
scummvm/trunk/engines/sci/gfx/alpha_mvi_crossblit.cpp
scummvm/trunk/engines/sci/gfx/antialias.cpp
scummvm/trunk/engines/sci/gfx/font.cpp
scummvm/trunk/engines/sci/gfx/gfx_crossblit.cpp
scummvm/trunk/engines/sci/gfx/gfx_driver.cpp
scummvm/trunk/engines/sci/gfx/gfx_line.cpp
scummvm/trunk/engines/sci/gfx/gfx_pixmap_scale.cpp
scummvm/trunk/engines/sci/gfx/gfx_res_options.cpp
scummvm/trunk/engines/sci/gfx/gfx_resource.cpp
scummvm/trunk/engines/sci/gfx/gfx_support.cpp
scummvm/trunk/engines/sci/gfx/gfx_test.cpp
scummvm/trunk/engines/sci/gfx/gfx_tools.cpp
scummvm/trunk/engines/sci/gfx/menubar.cpp
scummvm/trunk/engines/sci/gfx/operations.cpp
scummvm/trunk/engines/sci/gfx/resmgr.cpp
scummvm/trunk/engines/sci/gfx/resource/sci_cursor_0.cpp
scummvm/trunk/engines/sci/gfx/resource/sci_font.cpp
scummvm/trunk/engines/sci/gfx/resource/sci_pal_1.cpp
scummvm/trunk/engines/sci/gfx/resource/sci_pic_0.cpp
scummvm/trunk/engines/sci/gfx/resource/sci_picfill.cpp
scummvm/trunk/engines/sci/gfx/resource/sci_picfill_aux.cpp
scummvm/trunk/engines/sci/gfx/resource/sci_resmgr.cpp
scummvm/trunk/engines/sci/gfx/resource/sci_view_0.cpp
scummvm/trunk/engines/sci/gfx/resource/sci_view_1.cpp
scummvm/trunk/engines/sci/gfx/sbtree.cpp
scummvm/trunk/engines/sci/gfx/sci_widgets.cpp
scummvm/trunk/engines/sci/gfx/widgets.cpp
Modified: scummvm/trunk/engines/sci/gfx/alpha_mvi_crossblit.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/alpha_mvi_crossblit.cpp 2009-02-15 22:33:18 UTC (rev 38320)
+++ scummvm/trunk/engines/sci/gfx/alpha_mvi_crossblit.cpp 2009-02-15 22:33:36 UTC (rev 38321)
@@ -41,13 +41,12 @@
void
FUNCT_NAME(byte *dest, byte *src, int bytes_per_dest_line, int bytes_per_src_line,
- int xl, int yl, byte *alpha, int bytes_per_alpha_line, int bytes_per_alpha_pixel,
- unsigned int alpha_test_mask, int alpha_shift
+ int xl, int yl, byte *alpha, int bytes_per_alpha_line, int bytes_per_alpha_pixel,
+ unsigned int alpha_test_mask, int alpha_shift
#ifdef PRIORITY
- ,byte *priority_pos ,int bytes_per_priority_line, int bytes_per_priority_pixel, int priority
+ , byte *priority_pos , int bytes_per_priority_line, int bytes_per_priority_pixel, int priority
#endif
- )
-{
+ ) {
#ifdef USE_C_CODE
#ifdef PRIORITY
int left_mask = (255 << (((unsigned long) dest) & 7)) & 255;
@@ -68,8 +67,8 @@
#ifdef PRIORITY
byte *pri_next = priority_pos + bytes_per_priority_line;
#endif
- asm ("ldl $31, 0($31)\n\t"
- "ldl $31, 0($31)\n\t"); /* Prefetch memory for next line */
+ asm("ldl $31, 0($31)\n\t"
+ "ldl $31, 0($31)\n\t"); /* Prefetch memory for next line */
if (((unsigned long)src) & 4)
data = *((unsigned int *) src);
@@ -133,227 +132,227 @@
#ifdef PRIORITY
assert(!(bytes_per_alpha_line & 7));
assert(bytes_per_alpha_pixel < 2);
- real_alpha_shift |= (unsigned long) (priority << 16) | ((unsigned long) bytes_per_priority_pixel << 32);
+ real_alpha_shift |= (unsigned long)(priority << 16) | ((unsigned long) bytes_per_priority_pixel << 32);
/* Work around gcc design bug allowing only 10 asm parameters */
#endif
- __asm__ __volatile__ (
+ __asm__ __volatile__(
#ifdef PRIORITY
- /*
- ** dest: $16
- ** src: $17
- ** bytes_per_dest_line: $18
- ** bytes_per_src_line: $19
- ** xl : $20
- ** yl : $21
- ** alpha_test_mask: $24
- ** alpha_shift: $25
- ** 255: $8
- **
- ** bytes_per_priority_line: $9
- ** priority_pos: $10
- ** priority extended to 8 bytes: $7
- ** bytes_per_priority_pixel: $6
- **
- ** temp_priority_collection: $11
- ** priority_pos backup: $12
- ** left border mask: $13
- ** right border mask: $28
- ** priority test bit: $15
- ** ldq4priority result: $26
- */
+ /*
+ ** dest: $16
+ ** src: $17
+ ** bytes_per_dest_line: $18
+ ** bytes_per_src_line: $19
+ ** xl : $20
+ ** yl : $21
+ ** alpha_test_mask: $24
+ ** alpha_shift: $25
+ ** 255: $8
+ **
+ ** bytes_per_priority_line: $9
+ ** priority_pos: $10
+ ** priority extended to 8 bytes: $7
+ ** bytes_per_priority_pixel: $6
+ **
+ ** temp_priority_collection: $11
+ ** priority_pos backup: $12
+ ** left border mask: $13
+ ** right border mask: $28
+ ** priority test bit: $15
+ ** ldq4priority result: $26
+ */
- "lda $30, -88($30) \n\t"
- "stq $9, 0($30) \n\t"
- "stq $10, 8($30) \n\t"
- "stq $11, 16($30) \n\t"
- "stq $12, 24($30) \n\t"
- "stq $13, 32($30) \n\t"
- "stq $15, 40($30) \n\t"
- "stq $26, 48($30) \n\t"
- "stq %8, 56($30) \n\t"
- "stq %9, 64($30) \n\t"
- "stq $7, 72($30) \n\t"
- "stq $6, 80($30) \n\t"
+ "lda $30, -88($30) \n\t"
+ "stq $9, 0($30) \n\t"
+ "stq $10, 8($30) \n\t"
+ "stq $11, 16($30) \n\t"
+ "stq $12, 24($30) \n\t"
+ "stq $13, 32($30) \n\t"
+ "stq $15, 40($30) \n\t"
+ "stq $26, 48($30) \n\t"
+ "stq %8, 56($30) \n\t"
+ "stq %9, 64($30) \n\t"
+ "stq $7, 72($30) \n\t"
+ "stq $6, 80($30) \n\t"
- "mov %8, $9 \n\t"
- "mov %9, $10 \n\t"
+ "mov %8, $9 \n\t"
+ "mov %9, $10 \n\t"
#endif
- "mov %6, $24 \n\t"
- "mov %7, $25 \n\t"
- "mov 255, $8 \n\t"
- "subl $21, 1, $21 \n\t"
+ "mov %6, $24 \n\t"
+ "mov %7, $25 \n\t"
+ "mov 255, $8 \n\t"
+ "subl $21, 1, $21 \n\t"
#ifdef PRIORITY
- /* Defrobnicate real_alpha_shift data */
- "srl $25, 32, $6 \n\t"
- "srl $25, 16, $7 \n\t"
- "and $7, $8, $7 \n\t"
+ /* Defrobnicate real_alpha_shift data */
+ "srl $25, 32, $6 \n\t"
+ "srl $25, 16, $7 \n\t"
+ "and $7, $8, $7 \n\t"
- /* Load first priority data quad */
- "andnot $10, 7, $0 \n\t"
- "ldq $26, 0($0) \n\t" /* Load priority */
- "and $10, 7, $13 \n\t"
- "sll $13, 3, $0 \n\t"
+ /* Load first priority data quad */
+ "andnot $10, 7, $0 \n\t"
+ "ldq $26, 0($0) \n\t" /* Load priority */
+ "and $10, 7, $13 \n\t"
+ "sll $13, 3, $0 \n\t"
- /* Calculate right border mask */
- "addl $13, $20, $28\n\t"
- "and $28, 7, $28 \n\t"
- "beq $28, 7f \n\t"
- "mov 8, $0 \n\t"
- "subl $0, $28, $28 \n"
- "7:\n\t"
- "srl $8, $28, $28 \n\t"
- /* Left border mask */
- "sll $8, $13, $13 \n\t"
- "and $13, $8, $13 \n\t"
+ /* Calculate right border mask */
+ "addl $13, $20, $28\n\t"
+ "and $28, 7, $28 \n\t"
+ "beq $28, 7f \n\t"
+ "mov 8, $0 \n\t"
+ "subl $0, $28, $28 \n"
+ "7:\n\t"
+ "srl $8, $28, $28 \n\t"
+ /* Left border mask */
+ "sll $8, $13, $13 \n\t"
+ "and $13, $8, $13 \n\t"
- "mov $10, $12 \n\t"
+ "mov $10, $12 \n\t"
- "sll $7, 8, $0 \n\t"
- "or $7, $0, $7 \n\t"
- "sll $7, 16, $0 \n\t"
- "or $7, $0, $7 \n\t"
- "sll $7, 32, $0 \n\t"
- "or $7, $0, $7 \n\t"
- "cmpbge $7, $26, $3 \n\t"
+ "sll $7, 8, $0 \n\t"
+ "or $7, $0, $7 \n\t"
+ "sll $7, 16, $0 \n\t"
+ "or $7, $0, $7 \n\t"
+ "sll $7, 32, $0 \n\t"
+ "or $7, $0, $7 \n\t"
+ "cmpbge $7, $26, $3 \n\t"
- "and $10, 7, $0 \n\t" /* Init priority bitptr */
- "mov 1, $15 \n\t" /* .. */
- "sll $15, $0, $15 \n\t" /* .. */
+ "and $10, 7, $0 \n\t" /* Init priority bitptr */
+ "mov 1, $15 \n\t" /* .. */
+ "sll $15, $0, $15 \n\t" /* .. */
- /* -> Priority buffer */
- "and $3, $13, $11 \n\t"
- "cmplt $20, 8, $0 \n\t"
- "beq $0, 6f \n\t"
- "and $11, $28, $11 \n\t"
- "6:\n\t"
+ /* -> Priority buffer */
+ "and $3, $13, $11 \n\t"
+ "cmplt $20, 8, $0 \n\t"
+ "beq $0, 6f \n\t"
+ "and $11, $28, $11 \n\t"
+ "6:\n\t"
#endif
- "and $25, $8, $25 \n\t"
+ "and $25, $8, $25 \n\t"
- /***/
- /*** Variable settings apply NOW ***/
- /***/
+ /***/
+ /*** Variable settings apply NOW ***/
+ /***/
- "mov $20, $1 \n\t"
- "mov $16, $2 \n\t"
- "mov $17, $3 \n"
- "8:\n\t"
- "addq $2, $18, $2 \n\t"
- "ldl $31, 0($2) \n\t" /* Prefetch dest */
- "addq $3, $19, $3 \n\t"
- "ldl $31, 0($3) \n" /* Prefetch src */
- "1:\n\t"
- "addq $17, 4, $17 \n\t"
- "beq $20, 3f \n\t"
- "subl $20, 1, $20 \n\t"
+ "mov $20, $1 \n\t"
+ "mov $16, $2 \n\t"
+ "mov $17, $3 \n"
+ "8:\n\t"
+ "addq $2, $18, $2 \n\t"
+ "ldl $31, 0($2) \n\t" /* Prefetch dest */
+ "addq $3, $19, $3 \n\t"
+ "ldl $31, 0($3) \n" /* Prefetch src */
+ "1:\n\t"
+ "addq $17, 4, $17 \n\t"
+ "beq $20, 3f \n\t"
+ "subl $20, 1, $20 \n\t"
#ifdef PRIORITY
- "5:\n\t"
- "addq $10, 1, $10 \n\t"
- "and $11, $15, $0 \n\t" /* Other priority beat our priority? */
- "beq $0, 2f \n\t"
-#endif
- "ldl $0, -4($17) \n\t"
- "unpkbw $0, $5 \n\t"
- "and $0, $24, $0 \n\t"
+ "5:\n\t"
+ "addq $10, 1, $10 \n\t"
+ "and $11, $15, $0 \n\t" /* Other priority beat our priority? */
+ "beq $0, 2f \n\t"
+#endif
+ "ldl $0, -4($17) \n\t"
+ "unpkbw $0, $5 \n\t"
+ "and $0, $24, $0 \n\t"
- "xor $0, $24, $4 \n\t"
- "beq $4, 2f \n\t"
+ "xor $0, $24, $4 \n\t"
+ "beq $4, 2f \n\t"
- "ldl $4, 0($16) \n\t"
- "unpkbw $4, $4 \n\t"
- "srl $0, $25, $0 \n\t"
- "mulq $4, $0, $4 \n\t"
- "subl $8, $0, $0 \n\t"
- "mulq $5, $0, $5 \n\t"
- "addq $4, $5, $4 \n\t"
- "srl $4, 8, $4 \n\t"
- "pkwb $4, $0 \n\t"
- "stl $0, 0($16) \n\t"
- "br 9f \n\t"
- "2:\n"
- "andnot $11, $15, $11 \n\t" /* Don't draw priority if we're fully transparent */
- "9:\n\t"
- "addq $16, 4, $16 \n\t"
+ "ldl $4, 0($16) \n\t"
+ "unpkbw $4, $4 \n\t"
+ "srl $0, $25, $0 \n\t"
+ "mulq $4, $0, $4 \n\t"
+ "subl $8, $0, $0 \n\t"
+ "mulq $5, $0, $5 \n\t"
+ "addq $4, $5, $4 \n\t"
+ "srl $4, 8, $4 \n\t"
+ "pkwb $4, $0 \n\t"
+ "stl $0, 0($16) \n\t"
+ "br 9f \n\t"
+ "2:\n"
+ "andnot $11, $15, $11 \n\t" /* Don't draw priority if we're fully transparent */
+ "9:\n\t"
+ "addq $16, 4, $16 \n\t"
#ifdef PRIORITY
- "sll $15, 1, $15 \n\t"
+ "sll $15, 1, $15 \n\t"
- "and $10, 7, $0 \n\t" /* Do we need to re-load priority mask? */
-/**/ "bne $0, 1b \n\t"
+ "and $10, 7, $0 \n\t" /* Do we need to re-load priority mask? */
+ /**/ "bne $0, 1b \n\t"
- /* Write back to priority buffer */
- "zap $26, $11, $26 \n\t"
- "zapnot $7, $11, $0 \n\t"
- "or $0, $26, $0 \n\t"
- "stq $0, -8($10) \n\t"
+ /* Write back to priority buffer */
+ "zap $26, $11, $26 \n\t"
+ "zapnot $7, $11, $0 \n\t"
+ "or $0, $26, $0 \n\t"
+ "stq $0, -8($10) \n\t"
- "ldq $26, 0($10) \n\t" /* Load priority */
- "cmpbge $7, $26, $11\n\t"
+ "ldq $26, 0($10) \n\t" /* Load priority */
+ "cmpbge $7, $26, $11\n\t"
- "mov 1, $15 \n\t" /* Init bitcmpmask */
+ "mov 1, $15 \n\t" /* Init bitcmpmask */
- "cmplt $20, 8, $0 \n\t"
-/**/ "beq $0, 1b \n\t"
- "and $11, $28, $11 \n\t"
+ "cmplt $20, 8, $0 \n\t"
+ /**/ "beq $0, 1b \n\t"
+ "and $11, $28, $11 \n\t"
#endif
- "br 1b \n"
- "3:\n\t"
+ "br 1b \n"
+ "3:\n\t"
#ifdef PRIORITY
- "and $10, 7, $16 \n\t"
- "beq $16, 7f \n\t"
- "and $11, $28, $11 \n\t"
- "zap $26, $11, $26 \n\t"
- "zapnot $7, $11, $0 \n\t"
- "or $0, $26, $0 \n\t"
- "andnot $10, 7, $16 \n\t"
- "stq $0, 0($16) \n" /* Write back */
- "7:\n\t"
+ "and $10, 7, $16 \n\t"
+ "beq $16, 7f \n\t"
+ "and $11, $28, $11 \n\t"
+ "zap $26, $11, $26 \n\t"
+ "zapnot $7, $11, $0 \n\t"
+ "or $0, $26, $0 \n\t"
+ "andnot $10, 7, $16 \n\t"
+ "stq $0, 0($16) \n" /* Write back */
+ "7:\n\t"
- "addq $9, $12, $12 \n\t"
- "mov $12, $10 \n\t"
- "andnot $10, 7, $0 \n\t"
- "ldq $26, 0($0) \n\t"
+ "addq $9, $12, $12 \n\t"
+ "mov $12, $10 \n\t"
+ "andnot $10, 7, $0 \n\t"
+ "ldq $26, 0($0) \n\t"
- "and $10, 7, $0 \n\t"
- "mov 1, $15 \n\t"
- "sll $15, $0, $15 \n\t" /* Store priority-induced write-enable mask */
+ "and $10, 7, $0 \n\t"
+ "mov 1, $15 \n\t"
+ "sll $15, $0, $15 \n\t" /* Store priority-induced write-enable mask */
- "cmpbge $7, $26, $16 \n\t"
- /* -> Priority buffer */
- "and $16, $13, $11 \n\t"
+ "cmpbge $7, $26, $16 \n\t"
+ /* -> Priority buffer */
+ "and $16, $13, $11 \n\t"
#endif
- "beq $21, 4f \n\t"
- "subl $21, 1, $21 \n\t"
- "mov $1, $20 \n\t"
- "mov $2, $16 \n\t" /* Set line numbers for next line */
- "mov $3, $17 \n\t"
- "br 8b \n"
- "4:\n\t"
+ "beq $21, 4f \n\t"
+ "subl $21, 1, $21 \n\t"
+ "mov $1, $20 \n\t"
+ "mov $2, $16 \n\t" /* Set line numbers for next line */
+ "mov $3, $17 \n\t"
+ "br 8b \n"
+ "4:\n\t"
#ifdef PRIORITY
- "ldq $9, 0($30) \n\t"
- "ldq $10, 8($30) \n\t"
- "ldq $11, 16($30) \n\t"
- "ldq $12, 24($30) \n\t"
- "ldq $13, 32($30) \n\t"
- "ldq $15, 40($30) \n\t"
- "ldq $26, 48($30) \n\t"
- "ldq %8, 56($30) \n\t"
- "ldq %9, 64($30) \n\t"
- "ldq $7, 72($30) \n\t"
- "ldq $6, 80($30) \n\t"
- "lda $30, 88($30) \n\t"
+ "ldq $9, 0($30) \n\t"
+ "ldq $10, 8($30) \n\t"
+ "ldq $11, 16($30) \n\t"
+ "ldq $12, 24($30) \n\t"
+ "ldq $13, 32($30) \n\t"
+ "ldq $15, 40($30) \n\t"
+ "ldq $26, 48($30) \n\t"
+ "ldq %8, 56($30) \n\t"
+ "ldq %9, 64($30) \n\t"
+ "ldq $7, 72($30) \n\t"
+ "ldq $6, 80($30) \n\t"
+ "lda $30, 88($30) \n\t"
#endif
- :
- :
- "r"(dest), "r"(src), "r"(bytes_per_dest_line),
- /*3*/ "r"(bytes_per_src_line), "r"(xl), "r"(yl),
- /*6*/ "r"((unsigned long) alpha_test_mask), "r"(real_alpha_shift)
+ :
+ :
+ "r"(dest), "r"(src), "r"(bytes_per_dest_line),
+ /*3*/ "r"(bytes_per_src_line), "r"(xl), "r"(yl),
+ /*6*/ "r"((unsigned long) alpha_test_mask), "r"(real_alpha_shift)
#ifdef PRIORITY
- , "r"(bytes_per_priority_line), "r"(priority_pos)
+ , "r"(bytes_per_priority_line), "r"(priority_pos)
#endif
- : "%0", "%1", "%2", "%3", "%4", "%5", "%6",
- "%7", "$16", "$17", "$18", "$19", "$20", "$21", "$24", "$25",
- "$8", "memory"
- );
+ : "%0", "%1", "%2", "%3", "%4", "%5", "%6",
+ "%7", "$16", "$17", "$18", "$19", "$20", "$21", "$24", "$25",
+ "$8", "memory"
+ );
#endif
}
Modified: scummvm/trunk/engines/sci/gfx/antialias.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/antialias.cpp 2009-02-15 22:33:18 UTC (rev 38320)
+++ scummvm/trunk/engines/sci/gfx/antialias.cpp 2009-02-15 22:33:36 UTC (rev 38321)
@@ -31,8 +31,7 @@
#include "sci/include/gfx_tools.h"
static void
-antialiase_simple(gfx_pixmap_t *pixmap, int mask[], int shift_const, gfx_mode_t *mode)
-{
+antialiase_simple(gfx_pixmap_t *pixmap, int mask[], int shift_const, gfx_mode_t *mode) {
int x, y, c;
int bytespp = mode->bytespp;
int line_size = bytespp * pixmap->xl;
@@ -44,7 +43,7 @@
lastline[1] = (char*)sci_malloc(line_size);
for (y = 0; y < pixmap->yl; y++) {
- int visimode = (y > 0 && y+1 < pixmap->yl)? 1 : 0;
+ int visimode = (y > 0 && y + 1 < pixmap->yl) ? 1 : 0;
unsigned long last_pixel;
memcpy(lastline[y & 1], data_p, line_size);
@@ -55,7 +54,7 @@
if (x == 1)
visimode++;
- else if (x+1 == pixmap->xl)
+ else if (x + 1 == pixmap->xl)
visimode--;
for (c = 0; c < 3; c++) {
@@ -69,9 +68,9 @@
*/
for (y_mode = 0; y_mode < 2; y_mode++)
if ((y_mode == 0 && y > 0)
- || (y_mode == 1 && y+1 < pixmap->yl)) {
+ || (y_mode == 1 && y + 1 < pixmap->yl)) {
- char *src = (y_mode)? data_p + line_size : lastline_p;
+ char *src = (y_mode) ? data_p + line_size : lastline_p;
if (x > 0) {
memcpy(&reader, src - bytespp, bytespp);
@@ -81,7 +80,7 @@
memcpy(&reader, src, bytespp);
accum += ((reader >> shift_const) & mask[c]) << 1;
- if (x+1 < pixmap->xl) {
+ if (x + 1 < pixmap->xl) {
memcpy(&reader, src + bytespp, bytespp);
accum += ((reader >> shift_const) & mask[c]) << 0;
}
@@ -95,23 +94,27 @@
last_pixel = reader;
accum += ((reader >> shift_const) & mask[c]) << 2;
- if (x+1 < pixmap->xl) {
+ if (x + 1 < pixmap->xl) {
memcpy(&reader, data_p + bytespp, bytespp);
accum += ((reader >> shift_const) & mask[c]) << 1;
}
switch (visimode) {
- case 0: accum /= 9; /* Only happens twelve times */
+ case 0:
+ accum /= 9; /* Only happens twelve times */
break;
- case 1: accum = (accum >> 6) + (accum >> 4); /* 15/16 intensity */
+ case 1:
+ accum = (accum >> 6) + (accum >> 4); /* 15/16 intensity */
break;
- case 2: accum >>= 4;
+ case 2:
+ accum >>= 4;
break;
- default: accum = (c == 0)? 0xffffffff : 0; /* Error: mark as red */
+ default:
+ accum = (c == 0) ? 0xffffffff : 0; /* Error: mark as red */
}
result |= (accum & mask[c]);
@@ -130,8 +133,7 @@
}
void
-gfxr_antialiase(gfx_pixmap_t *pixmap, gfx_mode_t *mode, gfxr_antialiasing_t type)
-{
+gfxr_antialiase(gfx_pixmap_t *pixmap, gfx_mode_t *mode, gfxr_antialiasing_t type) {
int masks[3];
int shift_const = 0;
Modified: scummvm/trunk/engines/sci/gfx/font.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/font.cpp 2009-02-15 22:33:18 UTC (rev 38320)
+++ scummvm/trunk/engines/sci/gfx/font.cpp 2009-02-15 22:33:36 UTC (rev 38321)
@@ -33,8 +33,7 @@
int font_counter = 0;
void
-gfxr_free_font(gfx_bitmap_font_t *font)
-{
+gfxr_free_font(gfx_bitmap_font_t *font) {
if (font->widths)
free(font->widths);
@@ -49,8 +48,7 @@
void
-scale_char(byte *dest, byte *src, int width, int height, int newwidth, int xfact, int yfact)
-{
+scale_char(byte *dest, byte *src, int width, int height, int newwidth, int xfact, int yfact) {
int x, y;
for (y = 0; y < height; y++) {
@@ -90,8 +88,7 @@
}
gfx_bitmap_font_t *
-gfxr_scale_font_unfiltered(gfx_bitmap_font_t *orig_font, gfx_mode_t *mode)
-{
+gfxr_scale_font_unfiltered(gfx_bitmap_font_t *orig_font, gfx_mode_t *mode) {
gfx_bitmap_font_t *font = (gfx_bitmap_font_t*)sci_malloc(sizeof(gfx_bitmap_font_t));
int height = orig_font->height * mode->yfact;
int width = 0;
@@ -121,18 +118,17 @@
for (i = 0; i < font->chars_nr; i++) {
font->widths[i] = orig_font->widths[i] * mode->xfact;
scale_char(font->data + font->char_size * i,
- orig_font->data + orig_font->char_size * i,
- orig_font->row_size, orig_font->height,
- font->row_size,
- mode->xfact, mode->yfact);
+ orig_font->data + orig_font->char_size * i,
+ orig_font->row_size, orig_font->height,
+ font->row_size,
+ mode->xfact, mode->yfact);
}
return font;
}
gfx_bitmap_font_t *
-gfxr_scale_font(gfx_bitmap_font_t *orig_font, gfx_mode_t *mode, gfxr_font_scale_filter_t filter)
-{
+gfxr_scale_font(gfx_bitmap_font_t *orig_font, gfx_mode_t *mode, gfxr_font_scale_filter_t filter) {
GFXWARN("This function hasn't been tested yet!\n");
switch (filter) {
@@ -151,10 +147,9 @@
text_fragment_t *
gfxr_font_calculate_size(gfx_bitmap_font_t *font, int max_width, const char *text,
- int *width, int *height,
- int *lines, int *line_height_p, int *last_offset_p,
- int flags)
-{
+ int *width, int *height,
+ int *lines, int *line_height_p, int *last_offset_p,
+ int flags) {
int est_char_width = font->widths[(font->chars_nr > 'M')? 'M' : font->chars_nr - 1];
/* 'M' is typically among the widest chars */
int fragments_nr;
@@ -172,7 +167,8 @@
if (line_height_p)
*line_height_p = lineheight;
- if (max_width>1) fragments_nr = 3 + (strlen(text) * est_char_width)*3 / (max_width << 1); else fragments_nr = 1;
+ if (max_width > 1) fragments_nr = 3 + (strlen(text) * est_char_width) * 3 / (max_width << 1);
+ else fragments_nr = 1;
fragments = (text_fragment_t*)sci_calloc(sizeof(text_fragment_t), fragments_nr);
@@ -183,7 +179,7 @@
if (foo >= font->chars_nr) {
GFXWARN("Invalid char 0x%02x (max. 0x%02x) encountered in text string '%s', font %04x\n",
- foo, font->chars_nr, text, font->ID);
+ foo, font->chars_nr, text, font->ID);
if (font->chars_nr > ' ')
foo = ' ';
else {
@@ -193,7 +189,7 @@
}
if (((foo == '\n') || (foo == 0x0d))
- && !(flags & GFXR_FONT_FLAG_NO_NEWLINES)) {
+ && !(flags & GFXR_FONT_FLAG_NO_NEWLINES)) {
fragments[current_fragment-1].length = text - 1 - fragments[current_fragment-1].offset;
@@ -233,7 +229,7 @@
if (last_breakpoint == 0) {
GFXWARN("Warning: maxsize %d too small for '%s'\n",
- max_allowed_width, text);
+ max_allowed_width, text);
}
if (last_breakpoint > maxwidth)
@@ -251,10 +247,10 @@
last_breakpoint = localmaxwidth = 0;
} else if (*text == ' ') {
- last_breakpoint = localmaxwidth;
- last_break_width = font->widths[foo];
- breakpoint_ptr = text;
- }
+ last_breakpoint = localmaxwidth;
+ last_break_width = font->widths[foo];
+ breakpoint_ptr = text;
+ }
}
}
@@ -279,8 +275,7 @@
static inline void
-render_char(byte *dest, byte *src, int width, int line_width, int lines, int bytes_per_src_line, int fg0, int fg1, int bg)
-{
+render_char(byte *dest, byte *src, int width, int line_width, int lines, int bytes_per_src_line, int fg0, int fg1, int bg) {
int x, y;
for (y = 0; y < lines; y++) {
@@ -297,7 +292,7 @@
xc--;
if (dat & 0x80)
- *vdest++ = ((xc ^ y) & 1)? fg0 : fg1; /* dither */
+ *vdest++ = ((xc ^ y) & 1) ? fg0 : fg1; /* dither */
else
*vdest++ = bg;
@@ -310,8 +305,7 @@
gfx_pixmap_t *
gfxr_draw_font(gfx_bitmap_font_t *font, const char *stext, int characters,
- gfx_pixmap_color_t *fg0, gfx_pixmap_color_t *fg1, gfx_pixmap_color_t *bg)
-{
+ gfx_pixmap_color_t *fg0, gfx_pixmap_color_t *fg1, gfx_pixmap_color_t *bg) {
unsigned char *text = (unsigned char *) stext;
int height = font->height;
int width = 0;
@@ -336,13 +330,12 @@
pxm = gfx_pixmap_alloc_index_data(gfx_new_pixmap(width, height, GFX_RESID_NONE, 0, 0));
pxm->colors_nr = !!fg0 + !!fg1 + !!bg;
- if (pxm->colors_nr == 0)
- {
- GFXWARN("Pixmap would have zero colors, resetting!\n");
- pxm->colors_nr = 3;
- hack = 1;
- fg0 = fg1 = bg = &dummy;
- }
+ if (pxm->colors_nr == 0) {
+ GFXWARN("Pixmap would have zero colors, resetting!\n");
+ pxm->colors_nr = 3;
+ hack = 1;
+ fg0 = fg1 = bg = &dummy;
+ }
pxm->colors = (gfx_pixmap_color_t*)sci_malloc(sizeof(gfx_pixmap_color_t) * pxm->colors_nr);
#ifdef SATISFY_PURIFY
memset(pxm->colors, 0, sizeof(gfx_pixmap_color_t) * pxm->colors_nr);
@@ -374,8 +367,8 @@
width = font->widths[ch];
render_char(offset, font->data + (ch * font->char_size), width,
- pxm->index_xl, pxm->index_yl, font->row_size,
- fore_0, fore_1, back);
+ pxm->index_xl, pxm->index_yl, font->row_size,
+ fore_0, fore_1, back);
offset += width;
}
Modified: scummvm/trunk/engines/sci/gfx/gfx_crossblit.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_crossblit.cpp 2009-02-15 22:33:18 UTC (rev 38320)
+++ scummvm/trunk/engines/sci/gfx/gfx_crossblit.cpp 2009-02-15 22:33:36 UTC (rev 38321)
@@ -52,13 +52,12 @@
#endif
static void FUNCTION_NAME(byte *dest, byte *src, int bytes_per_dest_line, int bytes_per_src_line,
- int xl, int yl, byte *alpha, int bytes_per_alpha_line, int bytes_per_alpha_pixel,
- unsigned int alpha_test_mask, unsigned int alpha_min
+ int xl, int yl, byte *alpha, int bytes_per_alpha_line, int bytes_per_alpha_pixel,
+ unsigned int alpha_test_mask, unsigned int alpha_min
#ifdef USE_PRIORITY
- , byte *priority_buffer, int bytes_per_priority_line, int bytes_per_priority_pixel, int priority
+ , byte *priority_buffer, int bytes_per_priority_line, int bytes_per_priority_pixel, int priority
#endif /* USE_PRIORITY */
- )
-{
+ ) {
int x, y;
int alpha_end = xl * bytes_per_alpha_pixel;
@@ -72,11 +71,11 @@
for (x = 0; x < alpha_end; x += bytes_per_alpha_pixel) {
if ((alpha_test_mask & alpha[x])
#ifdef REVERSE_ALPHA
- >=
+ >=
#else
- <
+ <
#endif
- alpha_min)
+ alpha_min)
#ifdef USE_PRIORITY
if (priority_buffer[priority_offset] <= priority) {
priority_buffer[priority_offset] = priority;
Modified: scummvm/trunk/engines/sci/gfx/gfx_driver.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_driver.cpp 2009-02-15 22:33:18 UTC (rev 38320)
+++ scummvm/trunk/engines/sci/gfx/gfx_driver.cpp 2009-02-15 22:33:36 UTC (rev 38321)
@@ -18,8 +18,7 @@
#define S ((struct _scummvm_driver_state *)(drv->state))
static int
-scummvm_init_specific(struct _gfx_driver *drv, int xfact, int yfact, int bytespp)
-{
+scummvm_init_specific(struct _gfx_driver *drv, int xfact, int yfact, int bytespp) {
int i;
if (!drv->state) // = S
@@ -38,7 +37,7 @@
S->priority[i] = gfx_pixmap_alloc_index_data(gfx_new_pixmap(S->xsize, S->ysize, GFX_RESID_NONE, -i, -777));
if (!S->priority[i]) {
printf("Out of memory: Could not allocate priority maps! (%dx%d)\n",
- S->xsize, S->ysize);
+ S->xsize, S->ysize);
return GFX_FATAL;
}
}
@@ -48,28 +47,26 @@
S->visual[i] = new byte[S->xsize * S->ysize];
if (!S->visual[i]) {
printf("Out of memory: Could not allocate visual buffers! (%dx%d)\n",
- S->xsize, S->ysize);
+ S->xsize, S->ysize);
return GFX_FATAL;
}
memset(S->visual[i], 0, S->xsize * S->ysize);
}
drv->mode = gfx_new_mode(xfact, yfact, bytespp,
- 0, 0, 0, 0,
- 0, 0, 0, 0, 256, 0);
+ 0, 0, 0, 0,
+ 0, 0, 0, 0, 256, 0);
return GFX_OK;
}
static int
-scummvm_init(struct _gfx_driver *drv)
-{
+scummvm_init(struct _gfx_driver *drv) {
return scummvm_init_specific(drv, 1, 1, GFX_COLOR_MODE_INDEX);
}
static void
-scummvm_exit(struct _gfx_driver *drv)
-{
+scummvm_exit(struct _gfx_driver *drv) {
int i;
if (S) {
for (i = 0; i < 2; i++) {
@@ -97,12 +94,11 @@
/* This code shamelessly lifted from the SDL_gfxPrimitives package */
static void
-lineColor2(byte *dst, int16 x1, int16 y1, int16 x2, int16 y2, uint32 color)
-{
+lineColor2(byte *dst, int16 x1, int16 y1, int16 x2, int16 y2, uint32 color) {
int pixx, pixy;
- int x,y;
- int dx,dy;
- int sx,sy;
+ int x, y;
+ int dx, dy;
+ int sx, sy;
int swaptmp;
uint8 *pixel;
@@ -119,27 +115,31 @@
pixx *= sx;
pixy *= sy;
if (dx < dy) {
- swaptmp = dx; dx = dy; dy = swaptmp;
- swaptmp = pixx; pixx = pixy; pixy = swaptmp;
+ swaptmp = dx;
+ dx = dy;
+ dy = swaptmp;
+ swaptmp = pixx;
+ pixx = pixy;
+ pixy = swaptmp;
}
/* Draw */
- x=0;
- y=0;
- for(; x < dx; x++, pixel += pixx) {
+ x = 0;
+ y = 0;
+ for (; x < dx; x++, pixel += pixx) {
*pixel = color;
y += dy;
if (y >= dx) {
- y -= dx; pixel += pixy;
+ y -= dx;
+ pixel += pixy;
}
}
}
static int
scummvm_draw_line(struct _gfx_driver *drv, point_t start, point_t end,
- gfx_color_t color,
- gfx_line_mode_t line_mode, gfx_line_style_t line_style)
-{
+ gfx_color_t color,
+ gfx_line_mode_t line_mode, gfx_line_style_t line_style) {
uint32 scolor = color.visual.global_index;
int xsize = S->xsize;
int ysize = S->ysize;
@@ -163,18 +163,18 @@
if (nstart.x > xsize)
nstart.x = xsize;
if (nend.x >= xsize)
- nend.x = xsize -1;
+ nend.x = xsize - 1;
if (nstart.y > ysize)
nstart.y = ysize;
if (nend.y >= ysize)
- nend.y = ysize -1;
+ nend.y = ysize - 1;
lineColor2(S->visual[1], (int16)nstart.x, (int16)nstart.y,
- (int16)nend.x, (int16)nend.y, scolor);
+ (int16)nend.x, (int16)nend.y, scolor);
if (color.mask & GFX_MASK_PRIORITY) {
gfx_draw_line_pixmap_i(S->priority[0], nstart, nend,
- color.priority);
+ color.priority);
}
}
@@ -183,9 +183,8 @@
static int
scummvm_draw_filled_rect(struct _gfx_driver *drv, rect_t rect,
- gfx_color_t color1, gfx_color_t color2,
- gfx_rectangle_fill_t shade_mode)
-{
+ gfx_color_t color1, gfx_color_t color2,
+ gfx_rectangle_fill_t shade_mode) {
if (color1.mask & GFX_MASK_VISUAL) {
for (int i = rect.y; i < rect.y + rect.yl; i++) {
memset(S->visual[1] + i * S->xsize + rect.x, color1.visual.global_index, rect.xl);
@@ -203,29 +202,27 @@
static int
scummvm_draw_pixmap(struct _gfx_driver *drv, gfx_pixmap_t *pxm, int priority,
- rect_t src, rect_t dest, gfx_buffer_t buffer)
-{
- int bufnr = (buffer == GFX_BUFFER_STATIC)? 2:1;
- int pribufnr = bufnr -1;
+ rect_t src, rect_t dest, gfx_buffer_t buffer) {
+ int bufnr = (buffer == GFX_BUFFER_STATIC) ? 2 : 1;
+ int pribufnr = bufnr - 1;
if (dest.xl != src.xl || dest.yl != src.yl) {
printf("Attempt to scale pixmap (%dx%d)->(%dx%d): Not supported\n",
- src.xl, src.yl, dest.xl, dest.yl);
+ src.xl, src.yl, dest.xl, dest.yl);
return GFX_ERROR;
}
gfx_crossblit_pixmap(drv->mode, pxm, priority, src, dest,
- S->visual[bufnr], S->xsize,
- S->priority[pribufnr]->index_data,
- S->priority[pribufnr]->index_xl, 1, 0);
+ S->visual[bufnr], S->xsize,
+ S->priority[pribufnr]->index_data,
+ S->priority[pribufnr]->index_xl, 1, 0);
return GFX_OK;
}
static int
scummvm_grab_pixmap(struct _gfx_driver *drv, rect_t src, gfx_pixmap_t *pxm,
- gfx_map_mask_t map)
-{
+ gfx_map_mask_t map) {
if (src.x < 0 || src.y < 0) {
printf("Attempt to grab pixmap from invalid coordinates (%d,%d)\n", src.x, src.y);
return GFX_ERROR;
@@ -262,10 +259,9 @@
// Buffer operations
static int
-scummvm_update(struct _gfx_driver *drv, rect_t src, point_t dest, gfx_buffer_t buffer)
-{
+scummvm_update(struct _gfx_driver *drv, rect_t src, point_t dest, gfx_buffer_t buffer) {
//TODO
- int data_source = (buffer == GFX_BUFFER_BACK)? 2 : 1;
+ int data_source = (buffer == GFX_BUFFER_BACK) ? 2 : 1;
int data_dest = data_source - 1;
/*
@@ -283,7 +279,7 @@
// S->xsize * S->ysize);
for (int i = 0; i < src.yl; i++) {
memcpy(S->visual[data_dest] + (dest.y + i) * S->xsize + dest.x,
- S->visual[data_source] + (src.y + i) * S->xsize + src.x, src.xl);
+ S->visual[data_source] + (src.y + i) * S->xsize + src.x, src.xl);
}
if ((src.x == dest.x) && (src.y == dest.y))
@@ -291,10 +287,10 @@
break;
case GFX_BUFFER_FRONT:
memcpy(S->visual[data_dest], S->visual[data_source],
- S->xsize * S->ysize);
+ S->xsize * S->ysize);
g_system->copyRectToScreen(S->visual[data_dest] + src.x + src.y * S->xsize,
- S->xsize, dest.x, dest.y, src.xl, src.yl);
+ S->xsize, dest.x, dest.y, src.xl, src.yl);
/*
g_system->copyRectToScreen(S->visual[data_dest],
S->xsize, 0, 0, S->xsize, S->ysize);
@@ -311,8 +307,7 @@
}
static int
-scummvm_set_static_buffer(struct _gfx_driver *drv, gfx_pixmap_t *pic, gfx_pixmap_t *priority)
-{
+scummvm_set_static_buffer(struct _gfx_driver *drv, gfx_pixmap_t *pic, gfx_pixmap_t *priority) {
memcpy(S->visual[2], pic->data, S->xsize * S->ysize);
/*gfx_crossblit_pixmap(drv->mode, pic, 0, rect, rect,
S->visual[2], S->xsize,
@@ -328,8 +323,7 @@
// Mouse pointer operations
static int
-scummvm_set_pointer(struct _gfx_driver *drv, gfx_pixmap_t *pointer)
-{
+scummvm_set_pointer(struct _gfx_driver *drv, gfx_pixmap_t *pointer) {
if (pointer == NULL) {
g_system->showMouse(false);
} else {
@@ -346,8 +340,7 @@
// Palette operations
static int
-scummvm_set_palette(struct _gfx_driver *drv, int index, byte red, byte green, byte blue)
-{
+scummvm_set_palette(struct _gfx_driver *drv, int index, byte red, byte green, byte blue) {
byte color[] = {red, green, blue, 255};
g_system->setPalette(color, index, 1);
return GFX_OK;
@@ -357,8 +350,7 @@
// Event management
static sci_event_t
-scummvm_get_event(struct _gfx_driver *drv)
-{
+scummvm_get_event(struct _gfx_driver *drv) {
sci_event_t input;
input.type = SCI_EVT_NONE;
@@ -394,13 +386,13 @@
modifiers = em->getModifierState();
input.buckybits =
- ((modifiers & Common::KBD_ALT) ? SCI_EVM_ALT : 0) |
- ((modifiers & Common::KBD_CTRL) ? SCI_EVM_CTRL : 0) |
- ((modifiers & Common::KBD_SHIFT) ? SCI_EVM_LSHIFT | SCI_EVM_RSHIFT : 0);
- //TODO: SCI_EVM_SCRLOCK SCI_EVM_NUMLOCK SCI_EVM_CAPSLOCK SCI_EVM_INSERT
+ ((modifiers & Common::KBD_ALT) ? SCI_EVM_ALT : 0) |
+ ((modifiers & Common::KBD_CTRL) ? SCI_EVM_CTRL : 0) |
+ ((modifiers & Common::KBD_SHIFT) ? SCI_EVM_LSHIFT | SCI_EVM_RSHIFT : 0);
+ //TODO: SCI_EVM_SCRLOCK SCI_EVM_NUMLOCK SCI_EVM_CAPSLOCK SCI_EVM_INSERT
switch (ev.type) {
- // Keyboard events
+ // Keyboard events
case Common::EVENT_KEYDOWN:
input.data = ev.kbd.keycode;
input.character = ev.kbd.ascii;
@@ -414,7 +406,7 @@
input.data = SCI_K_TAB;
if (input.buckybits & (SCI_EVM_LSHIFT | SCI_EVM_RSHIFT))
input.character = SCI_K_SHIFT_TAB;
- else
+ else
input.character = SCI_K_TAB;
}
} else if ((input.data >= Common::KEYCODE_F1) && input.data <= Common::KEYCODE_F10) {
@@ -425,7 +417,7 @@
input.data = (input.data - Common::KEYCODE_F1 + SCI_K_F1) << 8;
if (input.buckybits & (SCI_EVM_LSHIFT | SCI_EVM_RSHIFT))
input.character = input.data + ((SCI_K_SHIFT_F1 - SCI_K_F1) << 8);
- else
+ else
input.character = input.data;
} else {
// Special keys that need conversion
@@ -461,7 +453,7 @@
case Common::KEYCODE_DELETE:
input.data = SCI_K_DELETE;
break;
- //TODO: SCI_K_CENTER
+ //TODO: SCI_K_CENTER
default:
input.type = SCI_EVT_NONE;
break;
@@ -470,7 +462,7 @@
}
break;
- // Mouse events
+ // Mouse events
case Common::EVENT_LBUTTONDOWN:
input.type = SCI_EVT_MOUSE_PRESS;
input.data = 1;
@@ -496,7 +488,7 @@
drv->pointer_y = p.y;
break;
- // Misc events
+ // Misc events
case Common::EVENT_QUIT:
input.type = SCI_EVT_QUIT;
break;
@@ -510,9 +502,8 @@
}
static int
-scummvm_usec_sleep(struct _gfx_driver *drv, long usecs)
-{
- g_system->delayMillis(usecs/1000);
+scummvm_usec_sleep(struct _gfx_driver *drv, long usecs) {
+ g_system->delayMillis(usecs / 1000);
return GFX_OK;
}
Modified: scummvm/trunk/engines/sci/gfx/gfx_line.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_line.cpp 2009-02-15 22:33:18 UTC (rev 38320)
+++ scummvm/trunk/engines/sci/gfx/gfx_line.cpp 2009-02-15 22:33:36 UTC (rev 38321)
@@ -45,8 +45,7 @@
static inline
-void DRAWLINE_FUNC(byte *buffer, int linewidth, point_t start, point_t end, unsigned int color)
-{
+void DRAWLINE_FUNC(byte *buffer, int linewidth, point_t start, point_t end, unsigned int color) {
int dx, dy, incrE, incrNE, d, finalx, finaly;
int x = start.x;
int y = start.y;
@@ -55,7 +54,7 @@
finalx = end.x;
finaly = end.y;
#ifdef WORDS_BIGENDIAN
- color = GUINT32_SWAP_LE_BE_CONSTANT(color);
+ color = GUINT32_SWAP_LE_BE_CONSTANT(color);
#endif
dx = abs(dx);
dy = abs(dy);
Modified: scummvm/trunk/engines/sci/gfx/gfx_pixmap_scale.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_pixmap_scale.cpp 2009-02-15 22:33:18 UTC (rev 38320)
+++ scummvm/trunk/engines/sci/gfx/gfx_pixmap_scale.cpp 2009-02-15 22:33:36 UTC (rev 38321)
@@ -24,20 +24,19 @@
#define PALETTE_MODE mode->palette
void
-FUNCNAME(gfx_mode_t *mode, gfx_pixmap_t *pxm, int scale)
-{
+FUNCNAME(gfx_mode_t *mode, gfx_pixmap_t *pxm, int scale) {
SIZETYPE result_colors[GFX_PIC_COLORS];
SIZETYPE alpha_color = 0xffffffff & mode->alpha_mask;
SIZETYPE alpha_ormask = 0;
- int xfact = (scale)? mode->xfact: 1;
- int yfact = (scale)? mode->yfact: 1;
+ int xfact = (scale) ? mode->xfact : 1;
+ int yfact = (scale) ? mode->yfact : 1;
int widthc, heightc; /* Width duplication counter */
int line_width = xfact * pxm->index_xl;
int bytespp = mode->bytespp;
int x, y;
int i;
- byte byte_transparent = (mode->flags & GFX_MODE_FLAG_REVERSE_ALPHA)? 0 : 255;
- byte byte_opaque = (mode->flags & GFX_MODE_FLAG_REVERSE_ALPHA)? 255 : 0;
+ byte byte_transparent = (mode->flags & GFX_MODE_FLAG_REVERSE_ALPHA) ? 0 : 255;
+ byte byte_opaque = (mode->flags & GFX_MODE_FLAG_REVERSE_ALPHA) ? 255 : 0;
byte *src = pxm->index_data;
byte *dest = pxm->data;
byte *alpha_dest = pxm->alpha_map;
@@ -49,7 +48,7 @@
alpha_color = 0;
}
- assert(bytespp == COPY_BYTES);
+ assert(bytespp == COPY_BYTES);
if (separate_alpha_map && !alpha_dest)
alpha_dest = pxm->alpha_map = (byte*)sci_malloc(pxm->index_xl * xfact * pxm->index_yl * yfact);
@@ -91,7 +90,7 @@
}
if (separate_alpha_map) { /* Set separate alpha map */
- memset(alpha_dest, (isalpha)? byte_transparent : byte_opaque, xfact);
+ memset(alpha_dest, (isalpha) ? byte_transparent : byte_opaque, xfact);
alpha_dest += xfact;
}
}
@@ -182,12 +181,11 @@
void
-FUNCNAME_LINEAR(gfx_mode_t *mode, gfx_pixmap_t *pxm, int scale)
-{
+FUNCNAME_LINEAR(gfx_mode_t *mode, gfx_pixmap_t *pxm, int scale) {
int xfact = mode->xfact;
int yfact = mode->yfact;
- int line_step = (yfact < 2)? 0 : 256 / (yfact & ~1);
- int column_step = (xfact < 2)? 0 : 256 / (xfact & ~1);
+ int line_step = (yfact < 2) ? 0 : 256 / (yfact & ~1);
+ int column_step = (xfact < 2) ? 0 : 256 / (xfact & ~1);
int bytespp = mode->bytespp;
byte *src = pxm->index_data;
byte *dest = pxm->data;
@@ -195,7 +193,7 @@
int using_alpha = pxm->color_key != GFX_PIXMAP_COLOR_KEY_NONE;
int separate_alpha_map = (!mode->alpha_mask) && using_alpha;
unsigned int masks[4], shifts[4], zero[3];
- int x,y;
+ int x, y;
byte inverse_alpha = mode->flags & GFX_MODE_FLAG_REVERSE_ALPHA;
zero[0] = 255;
@@ -206,7 +204,7 @@
shifts[3] = 24;
}
- assert(bytespp == COPY_BYTES);
+ assert(bytespp == COPY_BYTES);
assert(!PALETTE_MODE);
masks[0] = mode->red_mask;
@@ -229,7 +227,7 @@
int otherline[4]; /* the above line or the line below */
int ctexel[4]; /* Current texel */
int subx, suby;
- int line_valuator = line_step? 128 - (line_step >> 1) : 256;
+ int line_valuator = line_step ? 128 - (line_step >> 1) : 256;
byte *wrpos, *alpha_wrpos;
byte *sublinepos = linepos;
byte *alpha_sublinepos = alpha_linepos;
@@ -261,7 +259,7 @@
/*-- Lower half --*/
line_valuator -= line_step;
- MAKE_PIXEL((y+1 == pxm->index_yl), otherline, ctexel, src[pxm->index_xl]);
+ MAKE_PIXEL((y + 1 == pxm->index_yl), otherline, ctexel, src[pxm->index_xl]);
WRITE_YPART(1, Y_CALC_INTENSITY_NORMAL);
src++;
@@ -284,9 +282,8 @@
#ifndef GFX_GET_PIXEL_DELTA
#define GFX_GET_PIXEL_DELTA
static inline void
-gfx_get_pixel_delta(unsigned int *color, int *delta, unsigned int *pixel0, unsigned int *pixel1)
-{
- int j;
+gfx_get_pixel_delta(unsigned int *color, int *delta, unsigned int *pixel0, unsigned int *pixel1) {
+ int j;
int transp0 = pixel0[3] == 0xffffff;
int transp1 = pixel1[3] == 0xffffff;
@@ -311,11 +308,10 @@
static inline void
-gfx_apply_delta(unsigned int *color, int *delta, int factor)
-{
- int i;
+gfx_apply_delta(unsigned int *color, int *delta, int factor) {
+ int i;
for (i = 0; i < 4; i++)
- color[i] += delta[i] * factor;
+ color[i] += delta[i] * factor;
}
#endif
@@ -335,12 +331,11 @@
#define REVERSE_ALPHA(foo) ((inverse_alpha)? ~(foo) : (foo))
void
-FUNCNAME_TRILINEAR(gfx_mode_t *mode, gfx_pixmap_t *pxm, int scale)
-{
+FUNCNAME_TRILINEAR(gfx_mode_t *mode, gfx_pixmap_t *pxm, int scale) {
int xfact = mode->xfact;
int yfact = mode->yfact;
- int line_step = (yfact < 2)? 0 : 256 / yfact;
- int column_step = (xfact < 2)? 0 : 256 / xfact;
+ int line_step = (yfact < 2) ? 0 : 256 / yfact;
+ int column_step = (xfact < 2) ? 0 : 256 / xfact;
int bytespp = mode->bytespp;
byte *src = pxm->index_data;
byte *dest = pxm->data;
@@ -351,7 +346,7 @@
unsigned int pixels[4][4];
/* 0 1
** 2 3 */
- int x,y;
+ int x, y;
byte inverse_alpha = mode->flags & GFX_MODE_FLAG_REVERSE_ALPHA;
if (separate_alpha_map) {
@@ -359,7 +354,7 @@
shifts[3] = 24;
}
- assert(bytespp == COPY_BYTES);
+ assert(bytespp == COPY_BYTES);
assert(!PALETTE_MODE);
masks[0] = mode->red_mask;
@@ -382,7 +377,7 @@
for (y = 0; y <= pxm->index_yl; y++) {
byte *y_dest_backup = dest;
byte *y_alpha_dest_backup = alpha_dest;
- int y_valuator = (y > 0)? 0 : 128;
+ int y_valuator = (y > 0) ? 0 : 128;
int yc_count;
@@ -399,7 +394,7 @@
for (x = 0; x <= pxm->index_xl; x++) {
byte *x_dest_backup = dest;
byte *x_alpha_dest_backup = alpha_dest;
- int x_valuator = (x > 0)? 0 : 128;
+ int x_valuator = (x > 0) ? 0 : 128;
int xc_count;
unsigned int leftcolor[4], rightcolor[4];
int leftdelta[4], rightdelta[4];
@@ -419,7 +414,7 @@
MAKE_PIXEL_TRILINEAR((y && (x < pxm->index_xl)), pixels[1], src[1]);
MAKE_PIXEL_TRILINEAR(((y < pxm->index_yl) && x), pixels[2], src[pxm->index_xl]);
MAKE_PIXEL_TRILINEAR(((y < pxm->index_yl) && (x < pxm->index_xl)),
- pixels[3], src[pxm->index_xl + 1]);
+ pixels[3], src[pxm->index_xl + 1]);
/* OptimizeMe */
@@ -429,7 +424,7 @@
gfx_apply_delta(rightcolor, rightdelta, y_valuator);
for (yc = 0; yc < yc_count; yc++) {
- unsigned int color[4];
+ unsigned int color[4];
int delta[4];
byte *yc_dest_backup = dest;
byte *yc_alpha_dest_backup = alpha_dest;
@@ -468,7 +463,7 @@
alpha_dest = x_alpha_dest_backup + xc_count;
if (x < pxm->index_xl)
- src++;
+ src++;
}
dest = y_dest_backup + pxm->index_xl * xfact * yc_count * COPY_BYTES;
alpha_dest = y_alpha_dest_backup + pxm->index_xl * xfact * yc_count;
Modified: scummvm/trunk/engines/sci/gfx/gfx_res_options.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_res_options.cpp 2009-02-15 22:33:18 UTC (rev 38320)
+++ scummvm/trunk/engines/sci/gfx/gfx_res_options.cpp 2009-02-15 22:33:36 UTC (rev 38321)
@@ -42,8 +42,7 @@
/*#define DEBUG*/
static gfx_res_pattern_list_t*
-pattern_list_insert(gfx_res_pattern_list_t *list, int min, int max)
-{
+pattern_list_insert(gfx_res_pattern_list_t *list, int min, int max) {
gfx_res_pattern_list_t *retval = (gfx_res_pattern_list_t*)sci_malloc(sizeof(gfx_res_pattern_list_t));
retval->pattern.min = min;
retval->pattern.max = max;
@@ -53,8 +52,7 @@
}
static int
-pattern_list_len(gfx_res_pattern_list_t *list)
-{
+pattern_list_len(gfx_res_pattern_list_t *list) {
int v = 0;
while (list) {
++v;
@@ -65,8 +63,7 @@
}
static void
-pattern_list_flatten(gfx_res_pattern_t *dest, gfx_res_pattern_list_t *list)
-{
+pattern_list_flatten(gfx_res_pattern_t *dest, gfx_res_pattern_list_t *list) {
while (list) {
*dest++ = list->pattern;
list = list->next;
@@ -74,8 +71,7 @@
}
static inline void
-pattern_list_free(gfx_res_pattern_list_t *list)
-{
+pattern_list_free(gfx_res_pattern_list_t *list) {
if (list)
pattern_list_free(list->next);
@@ -85,8 +81,7 @@
static inline int
extract_pattern(gfx_res_pattern_list_t **destp,
- char *src, int offset)
-{
+ char *src, int offset) {
char *src_orig = src - offset;
int final = 0;
int wildcard = 0;
@@ -102,7 +97,7 @@
++src;
if (*src == '*'
- || *src == '_') {
+ || *src == '_') {
wildcard = 1;
++src;
} else if (*src == '.' || isdigit(*src)) {
@@ -110,7 +105,7 @@
int start = strtol(src, &endp, 0);
if (*src == '.'
- && src[1] == '.') {
+ && src[1] == '.') {
start = GFX_RES_PATTERN_MIN;
endp = src;
}
@@ -123,7 +118,7 @@
if (*src) {
int stop;
if (*src == '.'
- && src[1] == '.') {
+ && src[1] == '.') {
src += 2;
while (*src && isblank(*src))
@@ -141,7 +136,7 @@
src = endp;
*destp = pattern_list_insert(*destp,
- start, stop);
+ start, stop);
} else { /* No ellipsis */
if (end)
@@ -150,7 +145,7 @@
}
} else /* End of sub-pattern */
*destp = pattern_list_insert(*destp,
- start, start);
+ start, start);
while (*src && isblank(*src))
++src;
@@ -165,10 +160,10 @@
if (end)
*end = ',';
sciprintf("[gfx-conf] Unexpected character '%c'\n",
- *src);
+ *src);
goto lexical_error_label;
}
-
+
if (!final) {
*end = ',';
src = end + 1;
@@ -182,15 +177,14 @@
return 0;
- lexical_error_label:
+lexical_error_label:
sciprintf("[gfx-conf] Lexical error in pattern at offset %d\n",
- src - src_orig);
+ src - src_orig);
return 1;
}
static int
-extract_mod_rule(char *src, gfx_res_mod_t *rule)
-{
+extract_mod_rule(char *src, gfx_res_mod_t *rule) {
char *orig_src = src;
char *endp;
float f[3];
@@ -212,7 +206,7 @@
++src;
if (!*src || !(isdigit(*src) || *src == '.')) {
sciprintf("[gfx-conf] Unexpected character '%c'\n",
- *src);
+ *src);
goto mod_error_label;
}
f[i++] = strtod(src, &endp);
@@ -225,9 +219,9 @@
if ((i == 3) && *src != ')') {
sciprintf("[gfx-conf] Error: Expected ')' at end of modification rule\n");
goto mod_error_label;
- } else if (i<3 && !isdigit(*src) && *src != '.' && *src != ',') {
+ } else if (i < 3 && !isdigit(*src) && *src != '.' && *src != ',') {
sciprintf("[gfx-conf] Error: Expected ',' as separator in modification rule, not '%c'\n",
- *src);
+ *src);
goto mod_error_label;
}
++src;
@@ -247,9 +241,9 @@
}
return 0;
- mod_error_label:
+mod_error_label:
sciprintf("[gfx-conf] Ill-formed modification rule '%s'\n",
- orig_src);
+ orig_src);
return 1;
}
@@ -258,8 +252,7 @@
#define PREDEFINED_PALETTES_NR 4
static int
-extract_assign_rule(char *src, gfx_res_assign_t *rule)
-{
+extract_assign_rule(char *src, gfx_res_assign_t *rule) {
/*char *orig_src = src;*/
struct {
const char *name;
@@ -278,16 +271,16 @@
for (i = 0; i < PREDEFINED_PALETTES_NR; i++)
if (!strcmp(src, predefined_palettes[i].name)) {
rule->assign.palette.colors_nr =
- predefined_palettes[i].colors_nr;
+ predefined_palettes[i].colors_nr;
rule->assign.palette.colors =
- predefined_palettes[i].colors;
+ predefined_palettes[i].colors;
return 0;
}
sciprintf("[gfx-conf] Unknown palette '%s'\n", src);
return 1;
/*
- assign_error_label:
+ assign_error_label:
sciprintf("[gfx-conf] Ill-formed assignment rule '%s'\n",
orig_src);
return 1;
@@ -296,8 +289,7 @@
#define CLASSES_NR 3
int
-gfx_update_conf(gfx_options_t *options, char *str)
-{
+gfx_update_conf(gfx_options_t *options, char *str) {
int total_patterns;
int mod = 0; /* Modifier or assignment rule? */
char *orig_str = str;
@@ -356,7 +348,7 @@
goto unexpected_end;
if (*str == '='
- || *str == '*')
+ || *str == '*')
break;
if (*str == '(') {
@@ -364,21 +356,21 @@
if (fieldcnt >= fields_nr) {
sciprintf("[gfx-conf] Error: Patterns of class '%s' may only be"
- " constrained by %d arguments\n",
- pat_name_str, fields_nr);
+ " constrained by %d arguments\n",
+ pat_name_str, fields_nr);
goto failure_label;
}
if (!end) {
sciprintf("[gfx-conf] Unmatched parentheses at offset %d\n",
- str - orig_str);
+ str - orig_str);
goto failure_label;
}
*end = 0;
if (extract_pattern(fields[fieldcnt++],
- str + 1,
- str + 1 - orig_str))
+ str + 1,
+ str + 1 - orig_str))
goto failure_label;
*end = ')';
@@ -388,11 +380,11 @@
}
sciprintf("[gfx-conf] Lexical error in pattern at offset %d: Unexpected '%c'\n",
- str - orig_str, *str);
+ str - orig_str, *str);
goto failure_label;
} while (1);
-
+
/* Flatten patterns */
conf->patterns = NULL;
total_patterns = conf->patterns_nr = pattern_list_len(patterns);
@@ -432,7 +424,7 @@
}
do { *sem_end-- = 0; }
while (sem_end >= str
- && isblank(*sem_end));
+ && isblank(*sem_end));
if (mod) {
if (extract_mod_rule(str, &conf->conf.mod))
@@ -456,7 +448,7 @@
/* Error handling */
unexpected_end:
sciprintf("[gfx-conf] Unexpected end of pattern encountered\n");
- failure_label:
+failure_label:
sciprintf("[gfx-conf] Error occured in: '%s'\n", orig_str);
pattern_list_free(patterns);
pattern_list_free(loops);
@@ -468,12 +460,11 @@
}
static inline int
-matches_patternlist(gfx_res_pattern_t *patterns, int nr, int val)
-{
+matches_patternlist(gfx_res_pattern_t *patterns, int nr, int val) {
int i;
for (i = 0; i < nr; i++)
if (patterns[i].min <= val
- && patterns[i].max >= val)
+ && patterns[i].max >= val)
return 1;
return 0;
@@ -481,22 +472,20 @@
#ifdef DEBUG
static void
-print_pattern(gfx_res_pattern_t *pat)
-{
+print_pattern(gfx_res_pattern_t *pat) {
fprintf(stderr, "[%d..%d]",
- pat->min, pat->max);
+ pat->min, pat->max);
}
#endif
static inline int
resource_matches_patternlists(gfx_res_conf_t *conf,
- int type, int nr, int loop, int cel)
-{
+ int type, int nr, int loop, int cel) {
int loc;
#ifdef DEBUG
int i;
fprintf(stderr, "[DEBUG:gfx-res] Trying to match against %d/%d/%d choices\n",
- conf->patterns_nr, conf->loops_nr, conf->cels_nr);
+ conf->patterns_nr, conf->loops_nr, conf->cels_nr);
for (i = 0; i < conf->patterns_nr; i++) {
fprintf(stderr, "[DEBUG:gfx-res] Pat #%d: ", i);
print_pattern(conf->patterns + i);
@@ -516,9 +505,9 @@
}
#endif
if (conf->patterns_nr &&
- !matches_patternlist(conf->patterns,
- conf->patterns_nr,
- nr))
+ !matches_patternlist(conf->patterns,
+ conf->patterns_nr,
+ nr))
return 0;
if (type == GFX_RESOURCE_TYPE_CURSOR)
@@ -528,9 +517,9 @@
** and, for views, the cel as well */
loc = conf->patterns_nr;
if (conf->loops_nr &&
- !matches_patternlist(conf->patterns + loc,
- conf->loops_nr,
- loop))
+ !matches_patternlist(conf->patterns + loc,
+ conf->loops_nr,
+ loop))
return 0;
if (type != GFX_RESOURCE_TYPE_VIEW)
@@ -540,19 +529,18 @@
if (!conf->cels_nr)
return 1;
-
+
return matches_patternlist(conf->patterns + loc,
- conf->cels_nr,
- cel);
+ conf->cels_nr,
+ cel);
}
static inline gfx_res_conf_t *
find_match(gfx_res_conf_t *conflist,
- int type, int nr, int loop, int cel)
-{
+ int type, int nr, int loop, int cel) {
while (conflist) {
if (resource_matches_patternlists(conflist,
- type, nr, loop, cel)) {
+ type, nr, loop, cel)) {
#ifdef DEBUG
fprintf(stderr, "[DEBUG:gfx-res] Found match!\n");
#endif
@@ -565,8 +553,7 @@
}
void
-apply_assign(gfx_res_assign_t *conf, gfx_pixmap_t *pxm)
-{
+apply_assign(gfx_res_assign_t *conf, gfx_pixmap_t *pxm) {
/* Has a dynamically allocated palette? Must clean up */
if (!(pxm->flags & GFX_PIXMAP_FLAG_EXTERNAL_PALETTE)) {
if (pxm->colors)
@@ -579,8 +566,7 @@
}
void
-apply_mod(gfx_res_mod_t *mod, gfx_pixmap_t *pxm)
-{
+apply_mod(gfx_res_mod_t *mod, gfx_pixmap_t *pxm) {
gfx_pixmap_color_t *pal = pxm->colors;
int i, pal_size = pxm->colors_nr;
@@ -601,10 +587,10 @@
int v;
#define UPDATE_COL(nm, idx) \
- v = pal[i].nm; \
- v *= mod->mod.factor[idx]; \
- v >>= 4; \
- pal[i].nm = (v > 255)? 255 : v;
+ v = pal[i].nm; \
+ v *= mod->mod.factor[idx]; \
+ v >>= 4; \
+ pal[i].nm = (v > 255)? 255 : v;
UPDATE_COL(r, 0);
UPDATE_COL(g, 1);
@@ -620,8 +606,7 @@
}
int
-gfx_get_res_config(gfx_options_t *options, gfx_pixmap_t *pxm)
-{
+gfx_get_res_config(gfx_options_t *options, gfx_pixmap_t *pxm) {
int restype = GFXR_RES_TYPE(pxm->ID);
int nr = GFXR_RES_NR(pxm->ID);
int loop = pxm->loop;
@@ -631,14 +616,14 @@
#ifdef DEBUG
fprintf(stderr, "[DEBUG:gfx-res] Trying to conf %d/%d/%d/%d (ID=%d)\n",
- restype, nr, loop, cel, pxm->ID);
+ restype, nr, loop, cel, pxm->ID);
#endif
if (pxm->ID < 0 || restype < 0 || restype >= GFX_RESOURCE_TYPES_NR)
return 1; /* Not appropriate */
conf = find_match(options->res_conf.assign[restype],
- restype, nr, loop, cel);
+ restype, nr, loop, cel);
if (conf)
apply_assign(&(conf->conf.assign), pxm);
@@ -646,7 +631,7 @@
conf = options->res_conf.mod[restype];
while (conf) {
conf = find_match(conf,
- restype, nr, loop, cel);
+ restype, nr, loop, cel);
if (conf) {
apply_mod(&(conf->conf.mod), pxm);
conf = conf->next;
Modified: scummvm/trunk/engines/sci/gfx/gfx_resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_resource.cpp 2009-02-15 22:33:18 UTC (rev 38320)
+++ scummvm/trunk/engines/sci/gfx/gfx_resource.cpp 2009-02-15 22:33:36 UTC (rev 38321)
@@ -41,8 +41,7 @@
static void
-gfxr_free_loop(gfx_driver_t *driver, gfxr_loop_t *loop)
-{
+gfxr_free_loop(gfx_driver_t *driver, gfxr_loop_t *loop) {
int i;
if (loop->cels) {
@@ -55,8 +54,7 @@
}
void
-gfxr_free_view(gfx_driver_t *driver, gfxr_view_t *view)
-{
+gfxr_free_view(gfx_driver_t *driver, gfxr_view_t *view) {
int i;
if (view->colors && !(view->flags & GFX_PIXMAP_FLAG_EXTERNAL_PALETTE))
@@ -73,147 +71,145 @@
static void
-pixmap_endianness_reverse_2_simple(byte *data, int area)
-{
- int c;
- for (c = 0; c < area; c++) {
- byte val = *data;
- *data = data[1];
- data[1] = val;
+pixmap_endianness_reverse_2_simple(byte *data, int area) {
+ int c;
+ for (c = 0; c < area; c++) {
+ byte val = *data;
+ *data = data[1];
+ data[1] = val;
- data += 2;
- }
+ data += 2;
+ }
}
static void
-pixmap_endianness_reverse_2(byte *data, int area)
-{
- int c;
- int sl = sizeof(unsigned long);
+pixmap_endianness_reverse_2(byte *data, int area) {
+ int c;
+ int sl = sizeof(unsigned long);
- for (c = 0; c < (area & ~(sl-1)); c += (sl>>1)) {
- unsigned long temp;
+ for (c = 0; c < (area & ~(sl - 1)); c += (sl >> 1)) {
+ unsigned long temp;
- memcpy(&temp, data, sl);
+ memcpy(&temp, data, sl);
- /* The next line will give warnings on 32 bit archs, but
- ** that's OK. */
+ /* The next line will give warnings on 32 bit archs, but
+ ** that's OK. */
#if SIZEOF_LONG < 8
- temp = 0;
+ temp = 0;
#else
- temp = ((temp & 0xff00ff00ff00ff00l) >> 8)
- | ((temp & 0x00ff00ff00ff00ffl) << 8);
+ temp = ((temp & 0xff00ff00ff00ff00l) >> 8)
+ | ((temp & 0x00ff00ff00ff00ffl) << 8);
#endif /* SIZEOF_INT < 8 */
- memcpy(data, &temp, sl);
+ memcpy(data, &temp, sl);
- data += sl;
- }
+ data += sl;
+ }
- pixmap_endianness_reverse_2_simple(data, area & (sl-1));
+ pixmap_endianness_reverse_2_simple(data, area & (sl - 1));
}
static void
-pixmap_endianness_reverse_3_simple(byte *data, int area)
-{
- int c;
- for (c = 0; c < area; c++) {
- byte val0 = data[0];
+pixmap_endianness_reverse_3_simple(byte *data, int area) {
+ int c;
+ for (c = 0; c < area; c++) {
+ byte val0 = data[0];
- data[0] = data[2];
- data[2] = val0;
+ data[0] = data[2];
+ data[2] = val0;
- data += 3;
- }
+ data += 3;
+ }
}
static void
-pixmap_endianness_reverse_4_simple(byte *data, int area)
-{
- int c;
- for (c = 0; c < area; c++) {
- byte val0 = data[0];
- byte val1 = data[1];
+pixmap_endianness_reverse_4_simple(byte *data, int area) {
+ int c;
+ for (c = 0; c < area; c++) {
+ byte val0 = data[0];
+ byte val1 = data[1];
- data[0] = data[3];
- data[3] = val0;
+ data[0] = data[3];
+ data[3] = val0;
- data[1] = data[2];
- data[2] = val1;
+ data[1] = data[2];
+ data[2] = val1;
- data += 4;
- }
+ data += 4;
+ }
}
static void
-pixmap_endianness_reverse_4(byte *data, int area)
-{
- int c;
- int sl = sizeof(unsigned long);
+pixmap_endianness_reverse_4(byte *data, int area) {
+ int c;
+ int sl = sizeof(unsigned long);
- for (c = 0; c < (area & ~(sl-1)); c += (sl>>2)) {
- unsigned long temp;
+ for (c = 0; c < (area & ~(sl - 1)); c += (sl >> 2)) {
+ unsigned long temp;
- memcpy(&temp, data, sl);
+ memcpy(&temp, data, sl);
- /* The next lines will give warnings on 32 bit archs, but
- ** that's OK. */
+ /* The next lines will give warnings on 32 bit archs, but
+ ** that's OK. */
#if SIZEOF_LONG < 8
- temp = 0l;
+ temp = 0l;
#else
- temp = ((temp & 0xffff0000ffff0000l) >> 16)
- | ((temp & 0x0000ffff0000ffffl) << 16);
- temp = ((temp & 0xff00ff00ff00ff00l) >> 8)
- | ((temp & 0x00ff00ff00ff00ffl) << 8);
+ temp = ((temp & 0xffff0000ffff0000l) >> 16)
+ | ((temp & 0x0000ffff0000ffffl) << 16);
+ temp = ((temp & 0xff00ff00ff00ff00l) >> 8)
+ | ((temp & 0x00ff00ff00ff00ffl) << 8);
#endif /* SIZEOF_LONG < 8 */
- memcpy(data, &temp, sl);
+ memcpy(data, &temp, sl);
- data += sl;
- }
+ data += sl;
+ }
- pixmap_endianness_reverse_4_simple(data, area & (sl-1));
+ pixmap_endianness_reverse_4_simple(data, area & (sl - 1));
}
gfx_pixmap_t *
-gfxr_endianness_adjust(gfx_pixmap_t *pixmap, gfx_mode_t *mode)
-{
- int bytespp;
- byte *data;
+gfxr_endianness_adjust(gfx_pixmap_t *pixmap, gfx_mode_t *mode) {
+ int bytespp;
+ byte *data;
- if (!pixmap || !pixmap->data || !mode) {
- GFXERROR("gfxr_endianness_adjust(): Invoked with invalid values\n");
+ if (!pixmap || !pixmap->data || !mode) {
+ GFXERROR("gfxr_endianness_adjust(): Invoked with invalid values\n");
BREAKPOINT();
- return NULL;
- }
+ return NULL;
+ }
- if (!(mode->flags & GFX_MODE_FLAG_REVERSE_ENDIAN))
- return pixmap;
+ if (!(mode->flags & GFX_MODE_FLAG_REVERSE_ENDIAN))
+ return pixmap;
- bytespp = mode->bytespp;
+ bytespp = mode->bytespp;
- data = pixmap->data;
+ data = pixmap->data;
- switch (bytespp) {
- case 1:
- break;
+ switch (bytespp) {
+ case 1:
+ break;
- case 2: pixmap_endianness_reverse_2(data, pixmap->xl
- * pixmap->yl);
- break;
+ case 2:
+ pixmap_endianness_reverse_2(data, pixmap->xl
+ * pixmap->yl);
+ break;
- case 3: pixmap_endianness_reverse_3_simple(data, pixmap->xl
- * pixmap->yl);
- break;
+ case 3:
+ pixmap_endianness_reverse_3_simple(data, pixmap->xl
+ * pixmap->yl);
+ break;
- case 4: pixmap_endianness_reverse_4(data, pixmap->xl * pixmap->yl);
- break;
+ case 4:
+ pixmap_endianness_reverse_4(data, pixmap->xl * pixmap->yl);
+ break;
- default: fprintf(stderr,"gfxr_endianness_adjust(): Cannot adjust endianness for %d bytespp!\n", bytespp);
- return NULL;
- }
+ default:
+ fprintf(stderr, "gfxr_endianness_adjust(): Cannot adjust endianness for %d bytespp!\n", bytespp);
+ return NULL;
+ }
- return pixmap;
+ return pixmap;
}
@@ -262,20 +258,23 @@
#undef SIZETYPE
static inline void
-_gfx_xlate_pixmap_unfiltered(gfx_mode_t *mode, gfx_pixmap_t *pxm, int scale)
-{
+_gfx_xlate_pixmap_unfiltered(gfx_mode_t *mode, gfx_pixmap_t *pxm, int scale) {
switch (mode->bytespp) {
- case 1:_gfx_xlate_pixmap_unfiltered_1(mode, pxm, scale);
+ case 1:
+ _gfx_xlate_pixmap_unfiltered_1(mode, pxm, scale);
break;
- case 2:_gfx_xlate_pixmap_unfiltered_2(mode, pxm, scale);
+ case 2:
+ _gfx_xlate_pixmap_unfiltered_2(mode, pxm, scale);
break;
- case 3:_gfx_xlate_pixmap_unfiltered_3(mode, pxm, scale);
+ case 3:
+ _gfx_xlate_pixmap_unfiltered_3(mode, pxm, scale);
break;
- case 4:_gfx_xlate_pixmap_unfiltered_4(mode, pxm, scale);
+ case 4:
+ _gfx_xlate_pixmap_unfiltered_4(mode, pxm, scale);
break;
default:
@@ -293,8 +292,7 @@
}
static inline void
-_gfx_xlate_pixmap_linear(gfx_mode_t *mode, gfx_pixmap_t *pxm, int scale)
-{
+_gfx_xlate_pixmap_linear(gfx_mode_t *mode, gfx_pixmap_t *pxm, int scale) {
if (mode->palette || !scale) { /* fall back to unfiltered */
_gfx_xlate_pixmap_unfiltered(mode, pxm, scale);
return;
@@ -305,16 +303,20 @@
switch (mode->bytespp) {
- case 1:_gfx_xlate_pixmap_linear_1(mode, pxm, scale);
+ case 1:
+ _gfx_xlate_pixmap_linear_1(mode, pxm, scale);
break;
- case 2:_gfx_xlate_pixmap_linear_2(mode, pxm, scale);
+ case 2:
+ _gfx_xlate_pixmap_linear_2(mode, pxm, scale);
break;
- case 3:_gfx_xlate_pixmap_linear_3(mode, pxm, scale);
+ case 3:
+ _gfx_xlate_pixmap_linear_3(mode, pxm, scale);
break;
- case 4:_gfx_xlate_pixmap_linear_4(mode, pxm, scale);
+ case 4:
+ _gfx_xlate_pixmap_linear_4(mode, pxm, scale);
break;
default:
@@ -325,8 +327,7 @@
}
static inline void
-_gfx_xlate_pixmap_trilinear(gfx_mode_t *mode, gfx_pixmap_t *pxm, int scale)
-{
+_gfx_xlate_pixmap_trilinear(gfx_mode_t *mode, gfx_pixmap_t *pxm, int scale) {
if (mode->palette || !scale) { /* fall back to unfiltered */
_gfx_xlate_pixmap_unfiltered(mode, pxm, scale);
return;
@@ -337,16 +338,20 @@
switch (mode->bytespp) {
- case 1:_gfx_xlate_pixmap_trilinear_1(mode, pxm, scale);
+ case 1:
+ _gfx_xlate_pixmap_trilinear_1(mode, pxm, scale);
break;
- case 2:_gfx_xlate_pixmap_trilinear_2(mode, pxm, scale);
+ case 2:
+ _gfx_xlate_pixmap_trilinear_2(mode, pxm, scale);
break;
- case 3:_gfx_xlate_pixmap_trilinear_3(mode, pxm, scale);
+ case 3:
+ _gfx_xlate_pixmap_trilinear_3(mode, pxm, scale);
break;
- case 4:_gfx_xlate_pixmap_trilinear_4(mode, pxm, scale);
+ case 4:
+ _gfx_xlate_pixmap_trilinear_4(mode, pxm, scale);
break;
default:
@@ -357,18 +362,17 @@
}
void
-gfx_xlate_pixmap(gfx_pixmap_t *pxm, gfx_mode_t *mode, gfx_xlate_filter_t filter)
-{
+gfx_xlate_pixmap(gfx_pixmap_t *pxm, gfx_mode_t *mode, gfx_xlate_filter_t filter) {
int was_allocated = 0;
if (mode->palette
- && !(pxm->flags & GFX_PIXMAP_FLAG_PALETTE_ALLOCATED)) {
+ && !(pxm->flags & GFX_PIXMAP_FLAG_PALETTE_ALLOCATED)) {
int i;
for (i = 0; i < pxm->colors_nr; i++) {
if (gfx_alloc_color(mode->palette, pxm->colors + i) < 0) {
GFXWARN("Failed to allocate color %d/%d in pixmap (color %02x/%02x/%02x)!\n",
- i, pxm->colors_nr, pxm->colors[i].r, pxm->colors[i].g, pxm->colors[i].b);
+ i, pxm->colors_nr, pxm->colors[i].r, pxm->colors[i].g, pxm->colors[i].b);
pxm->colors[i].global_index = 0;
}
/*
@@ -393,13 +397,16 @@
switch (filter) {
- case GFX_XLATE_FILTER_NONE: _gfx_xlate_pixmap_unfiltered(mode, pxm, !(pxm->flags & GFX_PIXMAP_FLAG_SCALED_INDEX));
+ case GFX_XLATE_FILTER_NONE:
+ _gfx_xlate_pixmap_unfiltered(mode, pxm, !(pxm->flags & GFX_PIXMAP_FLAG_SCALED_INDEX));
break;
- case GFX_XLATE_FILTER_LINEAR: _gfx_xlate_pixmap_linear(mode, pxm, !(pxm->flags & GFX_PIXMAP_FLAG_SCALED_INDEX));
+ case GFX_XLATE_FILTER_LINEAR:
+ _gfx_xlate_pixmap_linear(mode, pxm, !(pxm->flags & GFX_PIXMAP_FLAG_SCALED_INDEX));
break;
- case GFX_XLATE_FILTER_TRILINEAR: _gfx_xlate_pixmap_trilinear(mode, pxm, !(pxm->flags & GFX_PIXMAP_FLAG_SCALED_INDEX));
+ case GFX_XLATE_FILTER_TRILINEAR:
+ _gfx_xlate_pixmap_trilinear(mode, pxm, !(pxm->flags & GFX_PIXMAP_FLAG_SCALED_INDEX));
break;
default:
@@ -415,8 +422,7 @@
void
-gfxr_free_pic(gfx_driver_t *driver, gfxr_pic_t *pic)
-{
+gfxr_free_pic(gfx_driver_t *driver, gfxr_pic_t *pic) {
gfx_free_pixmap(driver, pic->visual_map);
gfx_free_pixmap(driver, pic->priority_map);
gfx_free_pixmap(driver, pic->control_map);
Modified: scummvm/trunk/engines/sci/gfx/gfx_support.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_support.cpp 2009-02-15 22:33:18 UTC (rev 38320)
+++ scummvm/trunk/engines/sci/gfx/gfx_support.cpp 2009-02-15 22:33:36 UTC (rev 38321)
@@ -62,8 +62,7 @@
#undef DRAWLINE_FUNC
inline void
-gfx_draw_line_buffer(byte *buffer, int linewidth, int pixelwidth, point_t start, point_t end, unsigned int color)
-{
+gfx_draw_line_buffer(byte *buffer, int linewidth, int pixelwidth, point_t start, point_t end, unsigned int color) {
switch (pixelwidth) {
case 1:
@@ -93,8 +92,7 @@
void
-gfx_draw_line_pixmap_i(gfx_pixmap_t *pxm, point_t start, point_t end, int color)
-{
+gfx_draw_line_pixmap_i(gfx_pixmap_t *pxm, point_t start, point_t end, int color) {
gfx_draw_line_buffer(pxm->index_data, pxm->index_xl, 1, start, end, color);
}
@@ -102,27 +100,25 @@
void
-gfx_draw_box_buffer(byte *buffer, int linewidth, rect_t zone, int color)
-{
- byte *dest = buffer + zone.x + (linewidth * zone.y);
- int i;
+gfx_draw_box_buffer(byte *buffer, int linewidth, rect_t zone, int color) {
+ byte *dest = buffer + zone.x + (linewidth * zone.y);
+ int i;
- if (zone.xl <= 0 || zone.yl <= 0)
- return;
+ if (zone.xl <= 0 || zone.yl <= 0)
+ return;
- for (i = 0; i < zone.yl; i++) {
- memset(dest, color, zone.xl);
- dest += linewidth;
- }
+ for (i = 0; i < zone.yl; i++) {
+ memset(dest, color, zone.xl);
+ dest += linewidth;
+ }
}
void
-gfx_draw_box_pixmap_i(gfx_pixmap_t *pxm, rect_t box, int color)
-{
- gfx_clip_box_basic(&box, pxm->index_xl - 1, pxm->index_yl - 1);
+gfx_draw_box_pixmap_i(gfx_pixmap_t *pxm, rect_t box, int color) {
+ gfx_clip_box_basic(&box, pxm->index_xl - 1, pxm->index_yl - 1);
- gfx_draw_box_buffer(pxm->index_data, pxm->index_xl, box, color);
+ gfx_draw_box_buffer(pxm->index_data, pxm->index_xl, box, color);
}
@@ -243,39 +239,38 @@
#undef BYTESPP
#undef REVERSE_ALPHA
-static void (*crossblit_fns[5])(byte *, byte *, int, int, int, int, byte *, int, int, unsigned int, unsigned int) =
-{ NULL,
- _gfx_crossblit_8,
- _gfx_crossblit_16,
- _gfx_crossblit_24,
- _gfx_crossblit_32 };
+static void (*crossblit_fns[5])(byte *, byte *, int, int, int, int, byte *, int, int, unsigned int, unsigned int) = { NULL,
+ _gfx_crossblit_8,
+ _gfx_crossblit_16,
+ _gfx_crossblit_24,
+ _gfx_crossblit_32
+ };
-static void (*crossblit_fns_P[5])(byte *, byte *, int, int, int, int, byte *, int, int, unsigned int, unsigned int, byte *, int, int, int) =
-{ NULL,
- _gfx_crossblit_8_P,
- _gfx_crossblit_16_P,
- _gfx_crossblit_24_P,
- _gfx_crossblit_32_P };
+static void (*crossblit_fns_P[5])(byte *, byte *, int, int, int, int, byte *, int, int, unsigned int, unsigned int, byte *, int, int, int) = { NULL,
+ _gfx_crossblit_8_P,
+ _gfx_crossblit_16_P,
+ _gfx_crossblit_24_P,
+ _gfx_crossblit_32_P
+ };
-static void (*crossblit_fns_RA[5])(byte *, byte *, int, int, int, int, byte *, int, int, unsigned int, unsigned int) =
-{ NULL,
- _gfx_crossblit_8_RA,
- _gfx_crossblit_16_RA,
- _gfx_crossblit_24_RA,
- _gfx_crossblit_32_RA };
+static void (*crossblit_fns_RA[5])(byte *, byte *, int, int, int, int, byte *, int, int, unsigned int, unsigned int) = { NULL,
+ _gfx_crossblit_8_RA,
+ _gfx_crossblit_16_RA,
+ _gfx_crossblit_24_RA,
+ _gfx_crossblit_32_RA
+ };
-static void (*crossblit_fns_P_RA[5])(byte *, byte *, int, int, int, int, byte *, int, int, unsigned int, unsigned int, byte *, int, int, int) =
-{ NULL,
- _gfx_crossblit_8_P_RA,
- _gfx_crossblit_16_P_RA,
- _gfx_crossblit_24_P_RA,
- _gfx_crossblit_32_P_RA };
-
+static void (*crossblit_fns_P_RA[5])(byte *, byte *, int, int, int, int, byte *, int, int, unsigned int, unsigned int, byte *, int, int, int) = { NULL,
+ _gfx_crossblit_8_P_RA,
+ _gfx_crossblit_16_P_RA,
+ _gfx_crossblit_24_P_RA,
+ _gfx_crossblit_32_P_RA
+ };
+
void
-_gfx_crossblit_simple(byte *dest, byte *src, int dest_line_width, int src_line_width,
- int xl, int yl, int bpp)
-{
+_gfx_crossblit_simple(byte *dest, byte *src, int dest_line_width, int src_line_width,
+ int xl, int yl, int bpp) {
int line_width = xl * bpp;
int i;
@@ -288,23 +283,22 @@
int
gfx_crossblit_pixmap(gfx_mode_t *mode, gfx_pixmap_t *pxm, int priority,
- rect_t src_coords,
- rect_t dest_coords, byte *dest, int dest_line_width,
- byte *priority_dest, int priority_line_width,
- int priority_skip, int flags)
-{
+ rect_t src_coords,
+ rect_t dest_coords, byte *dest, int dest_line_width,
+ byte *priority_dest, int priority_line_width,
+ int priority_skip, int flags) {
int maxx = 320 * mode->xfact;
int maxy = 200 * mode->yfact;
byte *src = pxm->data;
- byte *alpha = pxm->alpha_map? pxm->alpha_map : pxm->data;
+ byte *alpha = pxm->alpha_map ? pxm->alpha_map : pxm->data;
byte *priority_pos = priority_dest;
unsigned int alpha_mask, alpha_min;
int bpp = mode->bytespp;
- int bytes_per_alpha_pixel = pxm->alpha_map? 1 : bpp;
+ int bytes_per_alpha_pixel = pxm->alpha_map ? 1 : bpp;
int bytes_per_alpha_line = bytes_per_alpha_pixel * pxm->xl;
int xl = pxm->xl, yl = pxm->yl;
- int xoffset = (dest_coords.x < 0)? - dest_coords.x : 0;
- int yoffset = (dest_coords.y < 0)? - dest_coords.y : 0;
+ int xoffset = (dest_coords.x < 0) ? - dest_coords.x : 0;
+ int yoffset = (dest_coords.y < 0) ? - dest_coords.y : 0;
int revalpha = mode->flags & GFX_MODE_FLAG_REVERSE_ALPHA;
if (src_coords.x + src_coords.xl > xl)
@@ -313,12 +307,12 @@
if (src_coords.y + src_coords.yl > yl)
src_coords.yl = yl - src_coords.y;
-/** --???-- **/
+ /** --???-- **/
if (src_coords.y > yl)
return GFX_OK;
if (src_coords.x > xl)
return GFX_OK;
-/** --???-- **/
+ /** --???-- **/
if (dest_coords.x + xl >= maxx)
xl = maxx - dest_coords.x;
@@ -337,26 +331,26 @@
/* Set destination offsets */
/* Set x offsets */
- if (!(flags & GFX_CROSSBLIT_FLAG_DATA_IS_HOMED))
- dest += dest_coords.x * bpp;
+ if (!(flags & GFX_CROSSBLIT_FLAG_DATA_IS_HOMED))
+ dest += dest_coords.x * bpp;
priority_pos += dest_coords.x * priority_skip;
/* Set y offsets */
- if (!(flags & GFX_CROSSBLIT_FLAG_DATA_IS_HOMED))
- dest += dest_coords.y * dest_line_width;
+ if (!(flags & GFX_CROSSBLIT_FLAG_DATA_IS_HOMED))
+ dest += dest_coords.y * dest_line_width;
priority_pos += dest_coords.y * priority_line_width;
/* Set source offsets */
if (xoffset += src_coords.x) {
dest_coords.x = 0;
- src += xoffset * bpp;
+ src += xoffset * bpp;
alpha += xoffset * bytes_per_alpha_pixel;
}
if (yoffset += src_coords.y) {
dest_coords.y = 0;
- src += yoffset * bpp * pxm->xl;
+ src += yoffset * bpp * pxm->xl;
alpha += yoffset * bytes_per_alpha_line;
}
@@ -397,11 +391,11 @@
if (mode->alpha_mask && axp_have_mvi && bpp == 4) {
if (priority == GFX_NO_PRIORITY)
alpha_mvi_crossblit_32(dest, src, dest_line_width, pxm->xl * bpp,
- xl, yl, NULL, 0, 0, mode->alpha_mask, 24 - mode->alpha_shift);
+ xl, yl, NULL, 0, 0, mode->alpha_mask, 24 - mode->alpha_shift);
else
alpha_mvi_crossblit_32_P(dest, src, dest_line_width, pxm->xl * bpp,
- xl, yl, NULL, 0, 0, mode->alpha_mask, 24 - mode->alpha_shift,
- priority_pos, priority_line_width, priority_skip, priority);
+ xl, yl, NULL, 0, 0, mode->alpha_mask, 24 - mode->alpha_shift,
+ priority_pos, priority_line_width, priority_skip, priority);
} else {
#endif
@@ -412,32 +406,32 @@
if (revalpha)
alpha_min = 255 - alpha_min; /* Since we use it for the reverse effect */
-
+
if (!alpha_mask)
- _gfx_crossblit_simple(dest, src, dest_line_width, pxm->xl * bpp,
- xl, yl, bpp);
+ _gfx_crossblit_simple(dest, src, dest_line_width, pxm->xl * bpp,
+ xl, yl, bpp);
else
- if (priority == GFX_NO_PRIORITY) {
- if (bpp > 0 && bpp < 5)
- ((revalpha) ? crossblit_fns_RA : crossblit_fns)[bpp](dest, src, dest_line_width, pxm->xl * bpp,
- xl, yl, alpha, bytes_per_alpha_line, bytes_per_alpha_pixel,
- alpha_mask, alpha_min);
- else {
- GFXERROR("Invalid mode->bytespp: %d\n", mode->bytespp);
- return GFX_ERROR;
+ if (priority == GFX_NO_PRIORITY) {
+ if (bpp > 0 && bpp < 5)
+ ((revalpha) ? crossblit_fns_RA : crossblit_fns)[bpp](dest, src, dest_line_width, pxm->xl * bpp,
+ xl, yl, alpha, bytes_per_alpha_line, bytes_per_alpha_pixel,
+ alpha_mask, alpha_min);
+ else {
+ GFXERROR("Invalid mode->bytespp: %d\n", mode->bytespp);
+ return GFX_ERROR;
+ }
+ } else { /* priority */
+ if (bpp > 0 && bpp < 5)
+ ((revalpha) ? crossblit_fns_P_RA : crossblit_fns_P)[bpp](dest, src, dest_line_width, pxm->xl * bpp,
+ xl, yl, alpha, bytes_per_alpha_line, bytes_per_alpha_pixel,
+ alpha_mask, alpha_min, priority_pos,
+ priority_line_width, priority_skip, priority);
+ else {
+ GFXERROR("Invalid mode->bytespp: %d\n", mode->bytespp);
+ return GFX_ERROR;
+ }
}
- } else { /* priority */
- if (bpp > 0 && bpp < 5)
- ((revalpha) ? crossblit_fns_P_RA : crossblit_fns_P)[bpp](dest, src, dest_line_width, pxm->xl * bpp,
- xl, yl, alpha, bytes_per_alpha_line, bytes_per_alpha_pixel,
- alpha_mask, alpha_min, priority_pos,
- priority_line_width, priority_skip, priority);
- else {
- GFXERROR("Invalid mode->bytespp: %d\n", mode->bytespp);
- return GFX_ERROR;
- }
- }
#ifdef HAVE_ALPHA_EV6_SUPPORT
}
#endif
Modified: scummvm/trunk/engines/sci/gfx/gfx_test.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_test.cpp 2009-02-15 22:33:18 UTC (rev 38320)
+++ scummvm/trunk/engines/sci/gfx/gfx_test.cpp 2009-02-15 22:33:36 UTC (rev 38321)
@@ -50,14 +50,12 @@
gfx_pixmap_color_t gfx_sci0_image_colors[1][16];
gfx_pixmap_color_t *
-gfxr_interpreter_get_static_palette(gfx_resstate_t *state, int version, int *colors_nr, void *internal)
-{
+gfxr_interpreter_get_static_palette(gfx_resstate_t *state, int version, int *colors_nr, void *internal) {
return NULL;
}
int
-sciprintf(const char *fmt, ...)
-{
+sciprintf(const char *fmt, ...) {
va_list argp;
va_start(argp, fmt);
vprintf(fmt, argp);
@@ -67,8 +65,7 @@
void *
-memdup(void *mem, size_t size)
-{
+memdup(void *mem, size_t size) {
void *r = malloc(size);
if (r)
memcpy(r, mem, size);
@@ -80,17 +77,16 @@
#endif
void
-sci_gettime(long *seconds, long *useconds)
-{
- struct timeval tv;
+sci_gettime(long *seconds, long *useconds) {
+ struct timeval tv;
#ifdef WIN32
timeBeginPeriod(0);
#endif
- assert(!gettimeofday(&tv, NULL));
- *seconds = time(NULL);
- *useconds = tv.tv_usec;
+ assert(!gettimeofday(&tv, NULL));
+ *seconds = time(NULL);
+ *useconds = tv.tv_usec;
#ifdef WIN32
timeEndPeriod(0);
@@ -135,8 +131,7 @@
};
int
-init_driver(gfx_driver_t *drv)
-{
+init_driver(gfx_driver_t *drv) {
int i;
state->driver = drv;
@@ -182,15 +177,13 @@
int test_cursors[TEST_CURSORS_NR] = {0, 1};
int
-gfxr_interpreter_options_hash(gfx_resource_type_t type, int version, gfx_options_t *options, void *internal, int palette)
-{
+gfxr_interpreter_options_hash(gfx_resource_type_t type, int version, gfx_options_t *options, void *internal, int palette) {
return 0;
}
int *
-arrdup(int *src, int count)
-{
+arrdup(int *src, int count) {
int *retval = sci_malloc(sizeof(int) * count);
memcpy(retval, src, sizeof(int) * count);
return retval;
@@ -198,8 +191,7 @@
int *
gfxr_interpreter_get_resources(gfx_resstate_t *resstate, gfx_resource_type_t type,
- int version, int *entries_nr, void *internal)
-{
+ int version, int *entries_nr, void *internal) {
switch (type) {
case GFX_RESOURCE_TYPE_VIEW:
@@ -219,7 +211,7 @@
return arrdup(test_cursors, TEST_CURSORS_NR);
default:
- fprintf(stderr,"Attept to get resource list for invalid resource type %d\n", type);
+ fprintf(stderr, "Attept to get resource list for invalid resource type %d\n", type);
return NULL;
}
}
@@ -262,8 +254,7 @@
};
gfxr_pic_t *
-gfxr_interpreter_init_pic(int version, gfx_mode_t *mode, int ID, void *internal)
-{
+gfxr_interpreter_init_pic(int version, gfx_mode_t *mode, int ID, void *internal) {
gfxr_pic_t *pic = sci_malloc(sizeof(gfxr_pic_t));
pic->mode = mode;
@@ -272,7 +263,7 @@
pic->control_map = gfx_pixmap_alloc_index_data(gfx_new_pixmap(320, 200, ID, 2, 0));
pic->priority_map = gfx_pixmap_alloc_index_data(gfx_new_pixmap(320 * mode->xfact,
- 200 * mode->yfact, ID, 1, 0));
+ 200 * mode->yfact, ID, 1, 0));
pic->visual_map = gfx_pixmap_alloc_index_data(gfx_new_pixmap(320, 200, ID, 0, 0));
pic->visual_map->colors = pic_colors;
@@ -293,8 +284,7 @@
void
-gfxr_interpreter_clear_pic(int version, gfxr_pic_t *pic, void *internal)
-{
+gfxr_interpreter_clear_pic(int version, gfxr_pic_t *pic, void *internal) {
memset(pic->visual_map->index_data, 0x00, 320 * 200);
memset(pic->priority_map->index_data, 0, 320 * pic->mode->xfact * 200 * pic->mode->yfact);
memset(pic->control_map->index_data, 0, GFXR_AUX_MAP_SIZE);
@@ -304,8 +294,7 @@
int
gfxr_interpreter_calculate_pic(gfx_resstate_t *state, gfxr_pic_t *scaled_pic, gfxr_pic_t *unscaled_pic,
- int flags, int default_palette, int nr, void *internal)
-{
+ int flags, int default_palette, int nr, void *internal) {
gfxr_pic_t *pic = scaled_pic;
int i, x, y, pos;
int xfact = pic->mode->xfact;
@@ -342,13 +331,13 @@
memset(pic->visual_map->index_data + i*320 + 140, 15, 80);
for (j = 0; j < pic->mode->yfact; j++)
- memset(pic->priority_map->index_data + (i*yfact+j)*320*xfact
- + 140*xfact , 20, 80*xfact);
+ memset(pic->priority_map->index_data + (i*yfact + j)*320*xfact
+ + 140*xfact , 20, 80*xfact);
}
break;
default:
- fprintf(stderr,"Attempt to reference invalid pic #%d\n", nr);
+ fprintf(stderr, "Attempt to reference invalid pic #%d\n", nr);
}
printf(">> resource manager retrieved pic #%d\n", nr);
@@ -378,8 +367,7 @@
};
gfxr_view_t *
-gfxr_interpreter_get_view(gfx_resstate_t *state, int nr, void *internal, int palette)
-{
+gfxr_interpreter_get_view(gfx_resstate_t *state, int nr, void *internal, int palette) {
gfxr_view_t *view;
gfxr_loop_t *loop;
int i;
@@ -402,7 +390,7 @@
for (i = 0; i < 3; i++) {
gfx_pixmap_t *pxm = gfx_pixmap_alloc_index_data(gfx_new_pixmap(16, 16, 2048 | nr, 0, i));
- int offset = (i == 1)? 8 : 0;
+ int offset = (i == 1) ? 8 : 0;
int x, y;
pxm->colors_nr = VIEW_COLORS_NR;
@@ -413,18 +401,18 @@
for (y = 0; y < 16; y++)
for (x = 0; x < 16; x++) {
- int dx = (8-x);
- int dy = (8-y);
- int dist = dx*dx + dy*dy;
+ int dx = (8 - x);
+ int dy = (8 - y);
+ int dist = dx * dx + dy * dy;
int index = (dist * 8) / 64;
- int pos = x + y*16;
+ int pos = x + y * 16;
if (i == 2) {
- offset = (!dx || !dy)? 8 : 0;
+ offset = (!dx || !dy) ? 8 : 0;
if (offset == 8) index <<= 1;
}
- index = 7-index;
+ index = 7 - index;
if (index < 0)
pxm->index_data[pos] = 0xff;
else
@@ -446,8 +434,7 @@
extern byte builtin_font[];
gfx_bitmap_font_t *
-gfxr_interpreter_get_font(gfx_resstate_t *state, int nr, void *internal)
-{
+gfxr_interpreter_get_font(gfx_resstate_t *state, int nr, void *internal) {
gfx_bitmap_font_t *font;
int i;
if (nr < 0 || nr > TEST_FONTS_NR)
@@ -476,8 +463,7 @@
};
gfx_pixmap_t *
-gfxr_interpreter_get_cursor(gfx_resstate_t *state, int nr, void *internal)
-{
+gfxr_interpreter_get_cursor(gfx_resstate_t *state, int nr, void *internal) {
gfx_pixmap_t *cursor;
int xl, yl, x, y;
@@ -500,32 +486,32 @@
switch (nr) {
case 0:
- cursor->colors_nr = multicolored_pointers? 3 : 2;
+ cursor->colors_nr = multicolored_pointers ? 3 : 2;
cursor->xoffset = 16;
cursor->yoffset = 16;
for (x = 0; x < 31; x++) if (x != 16) {
- cursor->index_data[31*x + 16] = 1;
- cursor->index_data[31*16 + x] = 1;
+ cursor->index_data[31*x + 16] = 1;
+ cursor->index_data[31*16 + x] = 1;
- if (multicolored_pointers && ((x < 8) || (x > 23))) {
- cursor->index_data[31*x + 14] = 0;
- cursor->index_data[31*x + 15] = 2;
- cursor->index_data[31*x + 17] = 2;
- cursor->index_data[31*x + 18] = 0;
+ if (multicolored_pointers && ((x < 8) || (x > 23))) {
+ cursor->index_data[31*x + 14] = 0;
+ cursor->index_data[31*x + 15] = 2;
+ cursor->index_data[31*x + 17] = 2;
+ cursor->index_data[31*x + 18] = 0;
- cursor->index_data[31*14 + x] = 0;
- cursor->index_data[31*15 + x] = 2;
- cursor->index_data[31*17 + x] = 2;
- cursor->index_data[31*18 + x] = 0;
- } else {
- cursor->index_data[31*x + 15] = 0;
- cursor->index_data[31*x + 17] = 0;
+ cursor->index_data[31*14 + x] = 0;
+ cursor->index_data[31*15 + x] = 2;
+ cursor->index_data[31*17 + x] = 2;
+ cursor->index_data[31*18 + x] = 0;
+ } else {
+ cursor->index_data[31*x + 15] = 0;
+ cursor->index_data[31*x + 17] = 0;
- cursor->index_data[31*15 + x] = 0;
- cursor->index_data[31*17 + x] = 0;
+ cursor->index_data[31*15 + x] = 0;
+ cursor->index_data[31*17 + x] = 0;
+ }
}
- }
break;
case 1:
@@ -538,7 +524,7 @@
break;
default:
- fprintf(stderr,"Attempt to load invalid pointer %d\n", nr);
+ fprintf(stderr, "Attempt to load invalid pointer %d\n", nr);
gfx_free_pixmap(state->driver, cursor);
return NULL;
}
@@ -549,22 +535,19 @@
}
gfx_pixmap_color_t *
-gfxr_interpreter_get_palette(gfx_resstate_t *state, int version, int *colors_nr, void *internal, int nr)
-{
+gfxr_interpreter_get_palette(gfx_resstate_t *state, int version, int *colors_nr, void *internal, int nr) {
return NULL;
}
int
-gfxr_interpreter_needs_multicolored_pointers(int version, void *internal)
-{
+gfxr_interpreter_needs_multicolored_pointers(int version, void *internal) {
return multicolored_pointers;
}
gfx_color_t red, green, blue, dblue, white, white8, white16, white24, black, transparent;
void
-init_colors()
-{
+init_colors() {
gfxop_set_color(state, &red, 0xff, 0x00, 0x00, 0x00, -1, -1);
gfxop_set_color(state, &green, 0x00, 0xff, 0x00, 0x00, -1, -1);
gfxop_set_color(state, &blue, 0x00, 0x00, 0xff, 0x00, -1, -1);
@@ -586,8 +569,7 @@
int
-waitkey(void)
-{
+waitkey(void) {
int count = 100000;
sci_event_t event;
@@ -603,8 +585,7 @@
}
int
-wait_specific_key(int key)
-{
+wait_specific_key(int key) {
int count = 20000;
sci_event_t event;
@@ -612,7 +593,7 @@
event = gfxop_get_event(state, SCI_EVT_ANY);
if (event.type == SCI_EVT_KEYBOARD
- && event.data == key)
+ && event.data == key)
return 0;
gfxop_usleep(state, 1000);
@@ -622,14 +603,13 @@
int
-message(char *msg)
-{
+message(char *msg) {
gfx_text_handle_t *handle;
rect_t text_rect = gfx_rect(0, 150, 320, 50);
handle = gfxop_new_text(state, 0, msg, 320, ALIGN_CENTER, ALIGN_TOP,
- white, white, black, 0);
+ white, white, black, 0);
if (!handle) return 1;
@@ -643,37 +623,32 @@
}
void
-update(void)
-{
+update(void) {
/* gfxop_update_box(state, gfx_rect(0, 0, 320, 150)); */
gfxop_update(state);
}
void
-explicit_clear_buffer(void)
-{
+explicit_clear_buffer(void) {
gfxop_clear_box(state, gfx_rect(0, 0, 320, 150));
gfxop_update(state);
}
void
-clear_buffer(void)
-{
+clear_buffer(void) {
gfxop_disable_dirty_frames(state);
gfxop_clear_box(state, gfx_rect(0, 0, 320, 150));
gfxop_enable_dirty_frames(state);
}
void
-clear(void)
-{
+clear(void) {
gfxop_fill_box(state, gfx_rect(0, 0, 320, 150), black);
}
void
-identify_event(sci_event_t event)
-{
- switch(event.type) {
+identify_event(sci_event_t event) {
+ switch (event.type) {
case SCI_EVT_NONE:
MESSAGE("No event");
@@ -681,12 +656,12 @@
case SCI_EVT_MOUSE_PRESS:
MESSAGE4("Mouse press at (%d,%d)\ndata/modifiers (%d/%d)",
- state->pointer_pos.x, state->pointer_pos.y, event.data, event.buckybits);
+ state->pointer_pos.x, state->pointer_pos.y, event.data, event.buckybits);
break;
case SCI_EVT_MOUSE_RELEASE:
MESSAGE4("Mouse release at (%d,%d)\ndata/modifiers (%d/%d)",
- state->pointer_pos.x, state->pointer_pos.y, event.data, event.buckybits);
+ state->pointer_pos.x, state->pointer_pos.y, event.data, event.buckybits);
break;
case SCI_EVT_KEYBOARD:
@@ -704,16 +679,16 @@
MESSAGE("Error event");
break;
- default: MESSAGE1("Unknown event type %d!\n", event.type);
+ default:
+ MESSAGE1("Unknown event type %d!\n", event.type);
}
}
int
-test_a(void)
-{
+test_a(void) {
if (message("-- Test A --\nText display and basic input\nPlease press 'space' within 20 seconds"))
- return 1;
+ return 1;
return (wait_specific_key(' '));
}
@@ -750,8 +725,7 @@
};
void
-test_b(void)
-{
+test_b(void) {
int i;
MESSAGE("-- Test B --\nLines");
@@ -802,8 +776,7 @@
void
-test_c(void)
-{
+test_c(void) {
int i;
clear();
update();
@@ -825,7 +798,7 @@
for (i = 0; i <= 40; i++) {
gfxop_update_box(state, gfx_rect(i*4, 0 , 4, 150));
- gfxop_update_box(state, gfx_rect(317-i*4, 0 , 4, 150));
+ gfxop_update_box(state, gfx_rect(317 - i*4, 0 , 4, 150));
gfxop_usleep(state, 4000);
}
@@ -835,11 +808,11 @@
gfxop_enable_dirty_frames(state);
MESSAGE("C.2: Single line propagation\nPress a key to propagate a red box.\nNote that dirty frame\naccounting must be dis-\n"
- "abled for manual updates\nto work like this.");
+ "abled for manual updates\nto work like this.");
waitkey();
for (i = 159; i >= 0; i--) {
gfxop_update_box(state, gfx_rect(i, 0 , 1, 150));
- gfxop_update_box(state, gfx_rect(319-i, 0 , 1, 150));
+ gfxop_update_box(state, gfx_rect(319 - i, 0 , 1, 150));
gfxop_usleep(state, 1000);
}
@@ -858,8 +831,7 @@
void
-test_d(void)
-{
+test_d(void) {
rect_t line;
int pressed = 0;
sci_event_t event;
@@ -932,8 +904,7 @@
void
-test_e(void)
-{
+test_e(void) {
int x;
gfxop_set_pointer_cursor(state, 1);
@@ -996,8 +967,8 @@
MESSAGE("E.5: Animation with partial updates\nIf you're running high-res,\nthis should be considerably\nfaster.");
waitkey();
for (x = -20; x < 340; x++) {
- gfxop_clear_box(state, gfx_rect(x-9, 40-8, 17, 16));
- gfxop_clear_box(state, gfx_rect(x-9, 70-8, 17, 16));
+ gfxop_clear_box(state, gfx_rect(x - 9, 40 - 8, 17, 16));
+ gfxop_clear_box(state, gfx_rect(x - 9, 70 - 8, 17, 16));
gfxop_draw_cel(state, 0, 0, 2, gfx_point(x, 40), white16, 0);
gfxop_draw_cel(state, 0, 0, 2, gfx_point(x, 70), white16, 0);
gfxop_update(state);
@@ -1009,12 +980,11 @@
}
void
-test_wrap(int width, char *text)
-{
+test_wrap(int width, char *text) {
rect_t rect = gfx_rect(0, 0, width, 120);
gfx_text_handle_t *handle = gfxop_new_text(state, 0,
- text,
- width, ALIGN_LEFT, ALIGN_TOP, white, white, transparent, 0);
+ text,
+ width, ALIGN_LEFT, ALIGN_TOP, white, white, transparent, 0);
gfxop_fill_box(state, rect, dblue);
gfxop_draw_rectangle(state, rect, blue, GFX_LINE_MODE_FAST, GFX_LINE_STYLE_NORMAL);
@@ -1023,8 +993,7 @@
}
void
-test_f(void)
-{
+test_f(void) {
int i;
int x, y;
gfx_text_handle_t *handle;
@@ -1032,13 +1001,13 @@
waitkey();
handle = gfxop_new_text(state, 0, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890",
- 320, ALIGN_LEFT, ALIGN_TOP, white, white, transparent, 0);
+ 320, ALIGN_LEFT, ALIGN_TOP, white, white, transparent, 0);
gfxop_draw_text(state, handle, gfx_rect(0, 0, 320, 150));
gfxop_free_text(state, handle);
update();
MESSAGE("F.0: Font wrap\nYou should now see the alphabet\n(capitals, then small letters),\nand the numbers from 1 to 0"
- "\nwrapped with a maxwidth of\n320 (screen width)");
+ "\nwrapped with a maxwidth of\n320 (screen width)");
waitkey();
MESSAGE("F.1: Font wrap:\nMisc. wrap widths\nAll text should be /within/ the\nblue box (it may touch\nthe border, though)");
@@ -1052,7 +1021,7 @@
}
handle = gfxop_new_text(state, 0, "And now for something completely different.",
- 320, ALIGN_LEFT, ALIGN_TOP, red, green, black, 0);
+ 320, ALIGN_LEFT, ALIGN_TOP, red, green, black, 0);
gfxop_draw_text(state, handle, gfx_rect(0, 0, 320, 150));
gfxop_free_text(state, handle);
update();
@@ -1061,12 +1030,13 @@
clear_buffer();
handle = gfxop_new_text(state, 0, "foo!",
- 320, ALIGN_CENTER, ALIGN_CENTER, blue, blue, transparent, 0);
- x = 10; y = 10;
+ 320, ALIGN_CENTER, ALIGN_CENTER, blue, blue, transparent, 0);
+ x = 10;
+ y = 10;
for (i = 0; i < 1000; i++) {
- x = (x+(70 + (i / y) + y*y*x / (i+1)));
- y = (y+(30 + (i / x) + x*x*y / (i+1)));
+ x = (x + (70 + (i / y) + y * y * x / (i + 1)));
+ y = (y + (30 + (i / x) + x * x * y / (i + 1)));
gfxop_draw_text(state, handle, gfx_rect(x % 320, y % 140, 0, 0));
}
@@ -1077,8 +1047,7 @@
}
void
-do_tests(char *conf)
-{
+do_tests(char *conf) {
init_colors();
@@ -1103,15 +1072,13 @@
}
int
-c_quit(void *S)
-{
- exit(0);
- return 0; /* hahaha */
+c_quit(void *S) {
+ exit(0);
+ return 0; /* hahaha */
}
int
-main(int argc, char **argv)
-{
+main(int argc, char **argv) {
gfx_driver_t *drv = NULL;
char c;
@@ -1134,22 +1101,25 @@
"-n: Immediately stop after displaying (for performance tests)\n"
"-g: Select any of the graphics drivers shown with -l\n"
"-t: Select the tests to run:\n"
- "\ta: Text display and basic input\n"
- "\tb: Lines\n"
- "\tc: Boxes and updates\n"
- "\td: Pointers and input\n"
- "\te: Pics and Views\n"
- " -- for example, use \"-t abc\" to run tests A, B, and C\n"
- );
+ "\ta: Text display and basic input\n"
+ "\tb: Lines\n"
+ "\tc: Boxes and updates\n"
+ "\td: Pointers and input\n"
+ "\te: Pics and Views\n"
+ " -- for example, use \"-t abc\" to run tests A, B, and C\n"
+ );
return 0;
- case 'n': nowait = 1;
+ case 'n':
+ nowait = 1;
break;
- case 's': skip_intro = 1;
+ case 's':
+ skip_intro = 1;
break;
- case 'g': if (driver) sci_free(driver);
+ case 'g':
+ if (driver) sci_free(driver);
driver = sci_strdup(optarg);
break;
@@ -1165,7 +1135,8 @@
printf("%s", gfx_get_driver_name(i++));
}
printf("\n");
- } break;
+ }
+ break;
case 't':
strcpy(tests, optarg);
@@ -1174,7 +1145,7 @@
case 'x':
set_mode = xres = atoi(optarg);
if (xres < 1) {
- fprintf(stderr,"Invalid x scale factor!\n");
+ fprintf(stderr, "Invalid x scale factor!\n");
return 1;
}
break;
@@ -1182,7 +1153,7 @@
case 'y':
set_mode = yres = atoi(optarg);
if (yres < 1) {
- fprintf(stderr,"Invalid y scale factor!\n");
+ fprintf(stderr, "Invalid y scale factor!\n");
return 1;
}
break;
@@ -1190,13 +1161,13 @@
case 'c':
set_mode = color_mode = atoi(optarg);
if (color_mode < 1 || color_mode > 4) {
- fprintf(stderr,"Invalid number of bytes per pixel!\n");
+ fprintf(stderr, "Invalid number of bytes per pixel!\n");
return 1;
}
break;
default:
- fprintf(stderr,"Run 'gfx_test -h' for help\n");
+ fprintf(stderr, "Run 'gfx_test -h' for help\n");
return 1;
}
@@ -1221,17 +1192,17 @@
}
if (init_driver(drv)) {
- fprintf(stderr,"Initialization failed!\n");
+ fprintf(stderr, "Initialization failed!\n");
return 1;
}
do_tests(tests);
if (gfxop_exit(state)) {
- fprintf(stderr,"Something weird happened while exitting...\n");
+ fprintf(stderr, "Something weird happened while exitting...\n");
}
} else {
- fprintf(stderr,"No graphics driver found!\n");
+ fprintf(stderr, "No graphics driver found!\n");
return 1;
}
@@ -1241,262 +1212,262 @@
byte builtin_font[] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x7e, 0x81, 0xa5, 0x81, 0xbd, 0x99, 0x81, 0x7e,
- 0x7e, 0xff, 0xdb, 0xff, 0xc3, 0xe7, 0xff, 0x7e,
- 0x6c, 0xfe, 0xfe, 0xfe, 0x7c, 0x38, 0x10, 0x00,
- 0x10, 0x38, 0x7c, 0xfe, 0x7c, 0x38, 0x10, 0x00,
- 0x38, 0x7c, 0x38, 0xfe, 0xfe, 0xd6, 0x10, 0x38,
- 0x10, 0x38, 0x7c, 0xfe, 0xfe, 0x7c, 0x10, 0x38,
- 0x00, 0x00, 0x18, 0x3c, 0x3c, 0x18, 0x00, 0x00,
- 0xff, 0xff, 0xe7, 0xc3, 0xc3, 0xe7, 0xff, 0xff,
- 0x00, 0x3c, 0x66, 0x42, 0x42, 0x66, 0x3c, 0x00,
- 0xff, 0xc3, 0x99, 0xbd, 0xbd, 0x99, 0xc3, 0xff,
- 0x0f, 0x07, 0x0f, 0x7d, 0xcc, 0xcc, 0xcc, 0x78,
- 0x3c, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x7e, 0x18,
- 0x3f, 0x33, 0x3f, 0x30, 0x30, 0x70, 0xf0, 0xe0,
- 0x7f, 0x63, 0x7f, 0x63, 0x63, 0x67, 0xe6, 0xc0,
- 0x18, 0xdb, 0x3c, 0xe7, 0xe7, 0x3c, 0xdb, 0x18,
- 0x80, 0xe0, 0xf8, 0xfe, 0xf8, 0xe0, 0x80, 0x00,
- 0x02, 0x0e, 0x3e, 0xfe, 0x3e, 0x0e, 0x02, 0x00,
- 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x7e, 0x3c, 0x18,
- 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x66, 0x00,
- 0x7f, 0xdb, 0xdb, 0x7b, 0x1b, 0x1b, 0x1b, 0x00,
- 0x3e, 0x61, 0x3c, 0x66, 0x66, 0x3c, 0x86, 0x7c,
- 0x00, 0x00, 0x00, 0x00, 0x7e, 0x7e, 0x7e, 0x00,
- 0x18, 0x3c, 0x7e, 0x18, 0x7e, 0x3c, 0x18, 0xff,
- 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x00,
- 0x18, 0x18, 0x18, 0x18, 0x7e, 0x3c, 0x18, 0x00,
- 0x00, 0x18, 0x0c, 0xfe, 0x0c, 0x18, 0x00, 0x00,
- 0x00, 0x30, 0x60, 0xfe, 0x60, 0x30, 0x00, 0x00,
- 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xfe, 0x00, 0x00,
- 0x00, 0x24, 0x66, 0xff, 0x66, 0x24, 0x00, 0x00,
- 0x00, 0x18, 0x3c, 0x7e, 0xff, 0xff, 0x00, 0x00,
- 0x00, 0xff, 0xff, 0x7e, 0x3c, 0x18, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x18, 0x3c, 0x3c, 0x18, 0x18, 0x00, 0x18, 0x00,
- 0x66, 0x66, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x6c, 0x6c, 0xfe, 0x6c, 0xfe, 0x6c, 0x6c, 0x00,
- 0x18, 0x3e, 0x60, 0x3c, 0x06, 0x7c, 0x18, 0x00,
- 0x00, 0xc6, 0xcc, 0x18, 0x30, 0x66, 0xc6, 0x00,
- 0x38, 0x6c, 0x38, 0x76, 0xdc, 0xcc, 0x76, 0x00,
- 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x0c, 0x18, 0x30, 0x30, 0x30, 0x18, 0x0c, 0x00,
- 0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x18, 0x30, 0x00,
- 0x00, 0x66, 0x3c, 0xff, 0x3c, 0x66, 0x00, 0x00,
- 0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30,
- 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00,
- 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0x80, 0x00,
- 0x38, 0x6c, 0xc6, 0xc6, 0xc6, 0x6c, 0x38, 0x00,
- 0x18, 0x38, 0x18, 0x18, 0x18, 0x18, 0x7e, 0x00,
- 0x7c, 0xc6, 0x06, 0x1c, 0x30, 0x66, 0xfe, 0x00,
- 0x7c, 0xc6, 0x06, 0x3c, 0x06, 0xc6, 0x7c, 0x00,
- 0x1c, 0x3c, 0x6c, 0xcc, 0xfe, 0x0c, 0x1e, 0x00,
- 0xfe, 0xc0, 0xc0, 0xfc, 0x06, 0xc6, 0x7c, 0x00,
- 0x38, 0x60, 0xc0, 0xfc, 0xc6, 0xc6, 0x7c, 0x00,
- 0xfe, 0xc6, 0x0c, 0x18, 0x30, 0x30, 0x30, 0x00,
- 0x7c, 0xc6, 0xc6, 0x7c, 0xc6, 0xc6, 0x7c, 0x00,
- 0x7c, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0x78, 0x00,
- 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x00,
- 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x30,
- 0x06, 0x0c, 0x18, 0x30, 0x18, 0x0c, 0x06, 0x00,
- 0x00, 0x00, 0x7e, 0x00, 0x00, 0x7e, 0x00, 0x00,
- 0x60, 0x30, 0x18, 0x0c, 0x18, 0x30, 0x60, 0x00,
- 0x7c, 0xc6, 0x0c, 0x18, 0x18, 0x00, 0x18, 0x00,
- 0x7c, 0xc6, 0xde, 0xde, 0xde, 0xc0, 0x78, 0x00,
- 0x38, 0x6c, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00,
- 0xfc, 0x66, 0x66, 0x7c, 0x66, 0x66, 0xfc, 0x00,
- 0x3c, 0x66, 0xc0, 0xc0, 0xc0, 0x66, 0x3c, 0x00,
- 0xf8, 0x6c, 0x66, 0x66, 0x66, 0x6c, 0xf8, 0x00,
- 0xfe, 0x62, 0x68, 0x78, 0x68, 0x62, 0xfe, 0x00,
- 0xfe, 0x62, 0x68, 0x78, 0x68, 0x60, 0xf0, 0x00,
- 0x3c, 0x66, 0xc0, 0xc0, 0xce, 0x66, 0x3a, 0x00,
- 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00,
- 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00,
- 0x1e, 0x0c, 0x0c, 0x0c, 0xcc, 0xcc, 0x78, 0x00,
- 0xe6, 0x66, 0x6c, 0x78, 0x6c, 0x66, 0xe6, 0x00,
- 0xf0, 0x60, 0x60, 0x60, 0x62, 0x66, 0xfe, 0x00,
- 0xc6, 0xee, 0xfe, 0xfe, 0xd6, 0xc6, 0xc6, 0x00,
- 0xc6, 0xe6, 0xf6, 0xde, 0xce, 0xc6, 0xc6, 0x00,
- 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00,
- 0xfc, 0x66, 0x66, 0x7c, 0x60, 0x60, 0xf0, 0x00,
- 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xce, 0x7c, 0x0e,
- 0xfc, 0x66, 0x66, 0x7c, 0x6c, 0x66, 0xe6, 0x00,
- 0x3c, 0x66, 0x30, 0x18, 0x0c, 0x66, 0x3c, 0x00,
- 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x3c, 0x00,
- 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00,
- 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x6c, 0x38, 0x00,
- 0xc6, 0xc6, 0xc6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00,
- 0xc6, 0xc6, 0x6c, 0x38, 0x6c, 0xc6, 0xc6, 0x00,
- 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x3c, 0x00,
- 0xfe, 0xc6, 0x8c, 0x18, 0x32, 0x66, 0xfe, 0x00,
- 0x3c, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3c, 0x00,
- 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x02, 0x00,
- 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x3c, 0x00,
- 0x10, 0x38, 0x6c, 0xc6, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
- 0x30, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0x76, 0x00,
- 0xe0, 0x60, 0x7c, 0x66, 0x66, 0x66, 0xdc, 0x00,
- 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc6, 0x7c, 0x00,
- 0x1c, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00,
- 0x00, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0x7c, 0x00,
- 0x3c, 0x66, 0x60, 0xf8, 0x60, 0x60, 0xf0, 0x00,
- 0x00, 0x00, 0x76, 0xcc, 0xcc, 0x7c, 0x0c, 0xf8,
- 0xe0, 0x60, 0x6c, 0x76, 0x66, 0x66, 0xe6, 0x00,
- 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x3c, 0x00,
- 0x06, 0x00, 0x06, 0x06, 0x06, 0x66, 0x66, 0x3c,
- 0xe0, 0x60, 0x66, 0x6c, 0x78, 0x6c, 0xe6, 0x00,
- 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00,
- 0x00, 0x00, 0xec, 0xfe, 0xd6, 0xd6, 0xd6, 0x00,
- 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x00,
- 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0x7c, 0x00,
- 0x00, 0x00, 0xdc, 0x66, 0x66, 0x7c, 0x60, 0xf0,
- 0x00, 0x00, 0x76, 0xcc, 0xcc, 0x7c, 0x0c, 0x1e,
- 0x00, 0x00, 0xdc, 0x76, 0x60, 0x60, 0xf0, 0x00,
- 0x00, 0x00, 0x7e, 0xc0, 0x7c, 0x06, 0xfc, 0x00,
- 0x30, 0x30, 0xfc, 0x30, 0x30, 0x36, 0x1c, 0x00,
- 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00,
- 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0x6c, 0x38, 0x00,
- 0x00, 0x00, 0xc6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00,
- 0x00, 0x00, 0xc6, 0x6c, 0x38, 0x6c, 0xc6, 0x00,
- 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0xfc,
- 0x00, 0x00, 0x7e, 0x4c, 0x18, 0x32, 0x7e, 0x00,
- 0x0e, 0x18, 0x18, 0x70, 0x18, 0x18, 0x0e, 0x00,
- 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00,
- 0x70, 0x18, 0x18, 0x0e, 0x18, 0x18, 0x70, 0x00,
- 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x18, 0x00, 0x18, 0x18, 0x3c, 0x3c, 0x18, 0x00,
- 0x18, 0x18, 0x7e, 0xc0, 0xc0, 0x7e, 0x18, 0x18,
- 0x38, 0x6c, 0x64, 0xf0, 0x60, 0x66, 0xfc, 0x00,
- 0x00, 0xc6, 0x7c, 0xc6, 0xc6, 0x7c, 0xc6, 0x00,
- 0x66, 0x66, 0x3c, 0x7e, 0x18, 0x7e, 0x18, 0x18,
- 0x18, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x18,
- 0x3e, 0x61, 0x3c, 0x66, 0x66, 0x3c, 0x86, 0x7c,
- 0x00, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x7e, 0x81, 0x9d, 0xa1, 0xa1, 0x9d, 0x81, 0x7e,
- 0x3c, 0x6c, 0x6c, 0x3e, 0x00, 0x7e, 0x00, 0x00,
- 0x00, 0x33, 0x66, 0xcc, 0x66, 0x33, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0xfe, 0x06, 0x06, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,
- 0x7e, 0x81, 0xb9, 0xa5, 0xb9, 0xa5, 0x81, 0x7e,
- 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x38, 0x6c, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00,
- 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x7e, 0x00,
- 0x78, 0x0c, 0x18, 0x30, 0x7c, 0x00, 0x00, 0x00,
- 0x78, 0x0c, 0x38, 0x0c, 0x78, 0x00, 0x00, 0x00,
- 0x0c, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x7c, 0xc0,
- 0x7f, 0xdb, 0xdb, 0x7b, 0x1b, 0x1b, 0x1b, 0x00,
- 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x0c, 0x38,
- 0x18, 0x38, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00,
- 0x38, 0x6c, 0x6c, 0x38, 0x00, 0x7c, 0x00, 0x00,
- 0x00, 0xcc, 0x66, 0x33, 0x66, 0xcc, 0x00, 0x00,
- 0x63, 0xe6, 0x6c, 0x7a, 0x36, 0x6a, 0xdf, 0x06,
- 0x63, 0xe6, 0x6c, 0x7e, 0x33, 0x66, 0xcc, 0x0f,
- 0xe1, 0x32, 0xe4, 0x3a, 0xf6, 0x2a, 0x5f, 0x86,
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list