i is not longer an unsigned short in Palette_Setup8to24

[xonotic/darkplaces.git] / gl_backend.h

diff --git a/gl_backend.h b/gl_backend.h
index 450409ee1998751efc9499eb8926d7fef756e969..ae14212956ff6837cfc9f9ce6b78b1e35e164791 100644 (file)
--- a/gl_backend.h
+++ b/gl_backend.h
@@ -21,7 +21,7 @@ typedef struct
        int tex[MAX_TEXTUREUNITS];
        float *texcoords[MAX_TEXTUREUNITS];
        int texcoordstep[MAX_TEXTUREUNITS];
-       float texrgbscale[MAX_TEXTUREUNITS]; // used only if COMBINE is present
+       int texrgbscale[MAX_TEXTUREUNITS]; // used only if COMBINE is present
 }
 rmeshinfo_t;
 
@@ -36,7 +36,7 @@ typedef struct
        int numtriangles;
        int numverts;
        int tex[MAX_TEXTUREUNITS];
-       float texrgbscale[MAX_TEXTUREUNITS]; // used only if COMBINE is present
+       int texrgbscale[MAX_TEXTUREUNITS]; // used only if COMBINE is present
 
        // output
        int *index;
@@ -87,7 +87,7 @@ void R_Mesh_Draw_NativeOnly(const rmeshinfo_t *m);
 int R_Mesh_Draw_GetBuffer(rmeshbufferinfo_t *m);
 
 // saves a section of the rendered frame to a .tga file
-void SCR_ScreenShot(char *filename, int x, int y, int width, int height);
+qboolean SCR_ScreenShot(char *filename, int x, int y, int width, int height);
 // used by R_Envmap_f and internally in backend, clears the frame
 void R_ClearScreen(void);
 // invoke refresh of frame