X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fimage.h;h=c3c1e0d16a2ff3f287a28729910a9f6920996a10;hb=a7c06161253796a30a0237a7f5a044f459c8cf35;hp=879c96159dbb32e461419d3566791577697e4955;hpb=56814df201c2d86273cf54e0e94c0448ce9bdd0f;p=rocksndiamonds.git

diff --git a/src/libgame/image.h b/src/libgame/image.h
index 879c9615..c3c1e0d1 100644
--- a/src/libgame/image.h
+++ b/src/libgame/image.h
@@ -59,10 +59,10 @@ typedef struct
 #define IMAGETYPE_RGB		1	/* RGB image with colormap */
 #define IMAGETYPE_TRUECOLOR	2	/* true-color image        */
 
-#define TRUECOLOR_RED(pixel)	(((unsigned long)((pixel) & 0xff0000)) >> 16)
-#define TRUECOLOR_GREEN(pixel)	(((unsigned long)((pixel) & 0xff00)) >> 8)
-#define TRUECOLOR_BLUE(pixel)	( (unsigned long)((pixel) & 0xff))
-#define RGB_TO_TRUECOLOR(r,g,b)	((((unsigned long)((r) & 0xff00)) << 8) | ((g) & 0xff00) | (((unsigned short)(b)) >> 8))
+#define TRUECOLOR_RED(pixel)	(((unsigned int)((pixel) & 0xff0000)) >> 16)
+#define TRUECOLOR_GREEN(pixel)	(((unsigned int)((pixel) & 0xff00)) >> 8)
+#define TRUECOLOR_BLUE(pixel)	( (unsigned int)((pixel) & 0xff))
+#define RGB_TO_TRUECOLOR(r,g,b)	((((unsigned int)((r) & 0xff00)) << 8) | ((g) & 0xff00) | (((unsigned short)(b)) >> 8))
 
 Image *newImage(unsigned int, unsigned int, unsigned int);
 void freeImage(Image *);
@@ -89,7 +89,6 @@ struct PropertyMapping *getImageListPropertyMapping();
 void InitImageList(struct ConfigInfo *, int, struct ConfigTypeInfo *,
 		   char **, char **, char **, char **, char **);
 
-void LoadImageConfig();
 void ReloadCustomImages();
 void CreateImageWithSmallImages(int, int);
 void ScaleImage(int, int);