summaryrefslogtreecommitdiff
path: root/inc
diff options
context:
space:
mode:
authorAndrey Nazarov <skuller@skuller.net>2013-04-17 17:52:08 +0400
committerAndrey Nazarov <skuller@skuller.net>2013-04-17 18:02:18 +0400
commitb05d4a22f3b06820239d331cea8a15cef5f312da (patch)
treeba7623ad88e027e39920a36f3f238b920205ee01 /inc
parent38d1d10db01c2eae9b0763ff015feb674abce98d (diff)
Clean up and improve image management code.
Move 8-bit image inpacking and skin flood filling code into shared renderer code. Mark paletted PNG images with IF_PALETTED flag. Remove dependency on zlib.h. Remove duplicated ‘r_texture_formats’ entries. Print full path when R_RegisterImage fails with error. Fix negative PCX width/height. Don't search for alpha when image is known to be opaque.
Diffstat (limited to 'inc')
-rw-r--r--inc/refresh/images.h2
-rw-r--r--inc/refresh/refresh.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/inc/refresh/images.h b/inc/refresh/images.h
index da9c461..79321a4 100644
--- a/inc/refresh/images.h
+++ b/inc/refresh/images.h
@@ -114,7 +114,7 @@ void IMG_MipMap(byte *out, byte *in, int width, int height);
// these are implemented in src/refresh/[gl,sw]/images.c
void IMG_Unload(image_t *image);
-void IMG_Load(image_t *image, byte *pic, int width, int height);
+void IMG_Load(image_t *image, byte *pic);
byte *IMG_ReadPixels(qboolean reverse, int *width, int *height);
#endif // IMAGES_H
diff --git a/inc/refresh/refresh.h b/inc/refresh/refresh.h
index 4389799..a80329f 100644
--- a/inc/refresh/refresh.h
+++ b/inc/refresh/refresh.h
@@ -158,6 +158,7 @@ typedef enum {
IF_TURBULENT = (1 << 5),
IF_REPEAT = (1 << 6),
IF_NEAREST = (1 << 7),
+ IF_OPAQUE = (1 << 8),
} imageflags_t;
typedef enum {