From: uis Date: Fri, 16 Aug 2024 20:08:44 +0000 (+0300) Subject: gl_textures: use correct type in gltexture_t X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=44101e4b791438a9efc2d8cb618d052ed072f3d7;p=xonotic%2Fdarkplaces.git gl_textures: use correct type in gltexture_t --- diff --git a/gl_textures.c b/gl_textures.c index 049240b6..3ec1ae59 100644 --- a/gl_textures.c +++ b/gl_textures.c @@ -216,7 +216,7 @@ typedef struct gltexture_s // pointer to one of the textype_ structs textypeinfo_t *textype; // one of the GLTEXTURETYPE_ values - int texturetype; + gltexturetype_t texturetype; // palette if the texture is TEXTYPE_PALETTE const unsigned int *palette; // actual stored texture size after gl_picmip and gl_max_size are applied @@ -1123,7 +1123,7 @@ static void R_UploadFullTexture(gltexture_t *glt, const unsigned char *data) } } -static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, int depth, int sides, int flags, int miplevel, textype_t textype, int texturetype, const unsigned char *data, const unsigned int *palette) +static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, int depth, int sides, int flags, int miplevel, textype_t textype, gltexturetype_t texturetype, const unsigned char *data, const unsigned int *palette) { int i, size; gltexture_t *glt;