make DP compile with C++ again

[xonotic/darkplaces.git] / render.h

diff --git a/render.h b/render.h
index 5e004ef9d4fbddde45c1d882203a403889a56d9f..c39b4032901dd277c6a7e0518338a58a9e77b1d9 100644 (file)
--- a/render.h
+++ b/render.h
@@ -140,6 +140,7 @@ void R_SkinFrame_Purge(void);
 skinframe_t *R_SkinFrame_FindNextByName( skinframe_t *last, const char *name );
 skinframe_t *R_SkinFrame_Find(const char *name, int textureflags, int comparewidth, int compareheight, int comparecrc, qboolean add);
 skinframe_t *R_SkinFrame_LoadExternal(const char *name, int textureflags, qboolean complain);
+skinframe_t *R_SkinFrame_LoadExternal_CheckAlpha(const char *name, int textureflags, qboolean complain, qboolean *has_alpha);
 skinframe_t *R_SkinFrame_LoadInternalBGRA(const char *name, int textureflags, const unsigned char *skindata, int width, int height);
 skinframe_t *R_SkinFrame_LoadInternalQuake(const char *name, int textureflags, int loadpantsandshirt, int loadglowtexture, const unsigned char *skindata, int width, int height);
 skinframe_t *R_SkinFrame_LoadMissing(void);
@@ -253,7 +254,9 @@ typedef struct rsurfacestate_s
        int modeltexcoordlightmap2f_bufferobject;
        size_t modeltexcoordlightmap2f_bufferoffset;
        int *modelelement3i;
+       unsigned short *modelelement3s;
        int modelelement3i_bufferobject;
+       int modelelement3s_bufferobject;
        int *modellightmapoffsets;
        int modelnum_vertices;
        int modelnum_triangles;
@@ -314,7 +317,7 @@ typedef struct rsurfacestate_s
 
        // rtlight rendering
        // light currently being rendered
-       rtlight_t *rtlight;
+       const rtlight_t *rtlight;
        // current light's cull box (copied out of an rtlight or calculated by GetLightInfo)
        vec3_t rtlight_cullmins;
        vec3_t rtlight_cullmaxs;