Remove a call to ResetProg from ShutdownServer, so after a crash you will be able...

[xonotic/darkplaces.git] / image.h

diff --git a/image.h b/image.h
index 6ff4b73548c4d9443a7d45fc953ef055bc0d9f83..71168916416c24f763e3b8238ef1bef289206b26 100644 (file)
--- a/image.h
+++ b/image.h
@@ -2,6 +2,10 @@
 #ifndef IMAGE_H
 #define IMAGE_H
 
+
+extern int image_width, image_height;
+
+
 // swizzle components (even converting number of components) and flip images
 // (warning: input must be different than output due to non-linear read/write)
 // (tip: component indices can contain values | 0x80000000 to tell it to
@@ -55,7 +59,7 @@ void Image_Resample (const void *indata, int inwidth, int inheight, int indepth,
 void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int *depth, int destwidth, int destheight, int destdepth, int bytesperpixel);
 
 // only used by menuplyr coloring
-qbyte *LoadLMPAs8Bit (qbyte *f, int matchwidth, int matchheight);
+qbyte *LoadLMP (const qbyte *f, int matchwidth, int matchheight, qboolean loadAs8Bit);
 
 void Image_HeightmapToNormalmap(const unsigned char *inpixels, unsigned char *outpixels, int width, int height, int clamp, float bumpscale);