X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=gfx.h;h=51ddc21d5c22f345b23f553dff0b4e44c1d57c23;hb=11f745d33a3a15f1db8109499f590a0f9bae9e7a;hp=97f1c1a3717c39b5bcc52725bd30de341e8170e4;hpb=3ddd6d5ea2811b783bf349c8947cf1bbaaf3c8b9;p=drnoksnes diff --git a/gfx.h b/gfx.h index 97f1c1a..51ddc21 100644 --- a/gfx.h +++ b/gfx.h @@ -69,7 +69,7 @@ struct SGFX{ uint8 Z1; uint8 Z2; uint32 FixedColour; - const char *InfoString; + char *InfoString; uint32 InfoStringTimeout; uint32 StartY; uint32 EndY; @@ -183,33 +183,33 @@ GFX.X2 [((((C1) & RGB_REMOVE_LOW_BITS_MASK) + \ #endif #define COLOR_ADD1_2(C1, C2) \ -(((((C1) & RGB_REMOVE_LOW_BITS_MASK) + \ - ((C2) & RGB_REMOVE_LOW_BITS_MASK)) >> 1) + \ - ((C1) & (C2) & RGB_LOW_BITS_MASK) | ALPHA_BITS_MASK) + ((((((C1) & RGB_REMOVE_LOW_BITS_MASK) + \ + ((C2) & RGB_REMOVE_LOW_BITS_MASK)) >> 1) + \ + ((C1) & (C2) & RGB_LOW_BITS_MASK)) | ALPHA_BITS_MASK) #if defined(OLD_COLOUR_BLENDING) #define COLOR_SUB(C1, C2) \ -GFX.ZERO_OR_X2 [(((C1) | RGB_HI_BITS_MASKx2) - \ + GFX.ZERO_OR_X2 [(((C1) | RGB_HI_BITS_MASKx2) - \ ((C2) & RGB_REMOVE_LOW_BITS_MASK)) >> 1] #else #define COLOR_SUB(C1, C2) \ -(GFX.ZERO_OR_X2 [(((C1) | RGB_HI_BITS_MASKx2) - \ + (GFX.ZERO_OR_X2 [(((C1) | RGB_HI_BITS_MASKx2) - \ ((C2) & RGB_REMOVE_LOW_BITS_MASK)) >> 1] + \ -((C1) & RGB_LOW_BITS_MASK) - ((C2) & RGB_LOW_BITS_MASK)) + ((C1) & RGB_LOW_BITS_MASK) - ((C2) & RGB_LOW_BITS_MASK)) #endif #define COLOR_SUB1_2(C1, C2) \ -GFX.ZERO [(((C1) | RGB_HI_BITS_MASKx2) - \ + GFX.ZERO [(((C1) | RGB_HI_BITS_MASKx2) - \ ((C2) & RGB_REMOVE_LOW_BITS_MASK)) >> 1] typedef void (*NormalTileRenderer) (uint32 Tile, uint32 Offset, - uint32 StartLine, uint32 LineCount, struct SGFX * gfx); + uint32 StartLine, uint32 LineCount); typedef void (*ClippedTileRenderer) (uint32 Tile, uint32 Offset, uint32 StartPixel, uint32 Width, - uint32 StartLine, uint32 LineCount, struct SGFX * gfx); + uint32 StartLine, uint32 LineCount); typedef void (*LargePixelRenderer) (uint32 Tile, uint32 Offset, uint32 StartPixel, uint32 Pixels, - uint32 StartLine, uint32 LineCount, struct SGFX * gfx); + uint32 StartLine, uint32 LineCount); START_EXTERN_C void S9xStartScreenRefresh ();