diff --git a/JGE/include/JTypes.h b/JGE/include/JTypes.h index 307ceb14c..42936da5c 100644 --- a/JGE/include/JTypes.h +++ b/JGE/include/JTypes.h @@ -165,14 +165,14 @@ typedef uint32_t u32; #if defined (ABGR8888) #ifndef ARGB -#define ARGB(a, r, g, b) ((a << 24) | (b << 16) | (g << 8) | r) // macro to assemble pixels in correct format +#define ARGB(a, r, g, b) ((u32)((a << 24) | (b << 16) | (g << 8) | r)) // macro to assemble pixels in correct format #endif #define MAKE_COLOR(a, c) (a << 24 | c) #define MASK_ALPHA 0xFF000000 // masks for accessing individual pixels #define MASK_BLUE 0x00FF0000 #define MASK_GREEN 0x0000FF00 #define MASK_RED 0x000000FF -#define PIXEL_TYPE u32 + #define PIXEL_SIZE 4 #define PIXEL_FORMAT PSP_DISPLAY_PIXEL_FORMAT_8888