diff --git a/src/vk/header/local.h b/src/vk/header/local.h index c7120ce..fe297a1 100644 --- a/src/vk/header/local.h +++ b/src/vk/header/local.h @@ -240,7 +240,6 @@ struct image_s *RE_RegisterSkin (char *name); image_t *Vk_LoadPic(const char *name, byte *pic, int width, int realwidth, int height, int realheight, size_t data_size, imagetype_t type, int bits); -image_t *Vk_FindImageUnsafe (const char *name, imagetype_t type); image_t *Vk_FindImage (const char *name, imagetype_t type); void Vk_TextureMode( char *string ); void Vk_LmapTextureMode( char *string ); diff --git a/src/vk/vk_draw.c b/src/vk/vk_draw.c index df07faf..c620e0e 100644 --- a/src/vk/vk_draw.c +++ b/src/vk/vk_draw.c @@ -31,7 +31,7 @@ Draw_InitLocal */ void Draw_InitLocal (void) { - draw_chars = FindPic ("conchars", (findimage_t)Vk_FindImageUnsafe); + draw_chars = FindPic ("conchars", (findimage_t)Vk_FindImage); if (!draw_chars) { ri.Sys_Error(ERR_FATAL, "%s: Couldn't load pics/conchars.pcx", @@ -86,7 +86,7 @@ RE_Draw_FindPic */ image_t *RE_Draw_FindPic (char *name) { - return FindPic(name, (findimage_t)Vk_FindImageUnsafe); + return FindPic(name, (findimage_t)Vk_FindImage); } /* @@ -98,7 +98,7 @@ void RE_Draw_GetPicSize (int *w, int *h, char *name) { image_t *image; - image = FindPic(name, (findimage_t)Vk_FindImageUnsafe); + image = FindPic(name, (findimage_t)Vk_FindImage); if (!image) { *w = *h = -1; @@ -121,7 +121,7 @@ void RE_Draw_StretchPic (int x, int y, int w, int h, char *name) if (!vk_frameStarted) return; - vk = FindPic(name, (findimage_t)Vk_FindImageUnsafe); + vk = FindPic(name, (findimage_t)Vk_FindImage); if (!vk) { R_Printf(PRINT_ALL, "%s(): Can't find pic: %s\n", __func__, name); @@ -144,7 +144,7 @@ void RE_Draw_PicScaled (int x, int y, char *name, float scale) { image_t *vk; - vk = FindPic(name, (findimage_t)Vk_FindImageUnsafe); + vk = FindPic(name, (findimage_t)Vk_FindImage); if (!vk) { R_Printf(PRINT_ALL, "%s(): Can't find pic: %s\n", __func__, name); @@ -169,7 +169,7 @@ void RE_Draw_TileClear (int x, int y, int w, int h, char *name) if (!vk_frameStarted) return; - image = FindPic(name, (findimage_t)Vk_FindImageUnsafe); + image = FindPic(name, (findimage_t)Vk_FindImage); if (!image) { R_Printf(PRINT_ALL, "%s(): Can't find pic: %s\n", __func__, name); diff --git a/src/vk/vk_image.c b/src/vk/vk_image.c index 41c10c8..748cbec 100644 --- a/src/vk/vk_image.c +++ b/src/vk/vk_image.c @@ -1220,13 +1220,13 @@ Vk_LoadPic(const char *name, byte *pic, int width, int realwidth, /* =============== -Vk_FindImageUnsafe +Vk_FindImage Finds or loads the given image or NULL =============== */ image_t * -Vk_FindImageUnsafe (const char *name, imagetype_t type) +Vk_FindImage (const char *name, imagetype_t type) { image_t *image; int i, len; @@ -1278,23 +1278,6 @@ Vk_FindImageUnsafe (const char *name, imagetype_t type) image = (image_t *)LoadImage(name, namewe, ext, type, r_retexturing->value, (loadimage_t)Vk_LoadPic); - return image; -} - -/* -=============== -Vk_FindImage - -Finds or loads the given image or no texture. -=============== -*/ -image_t * -Vk_FindImage (const char *name, imagetype_t type) -{ - image_t *image; - - image = Vk_FindImageUnsafe (name, type); - if (!image && r_validation->value > 0) { R_Printf(PRINT_ALL, "%s: can't load %s\n", __func__, name); diff --git a/src/vk/vk_model.c b/src/vk/vk_model.c index 204a58f..69d9a13 100644 --- a/src/vk/vk_model.c +++ b/src/vk/vk_model.c @@ -412,7 +412,7 @@ Mod_LoadTexinfo (model_t *loadmodel, const byte *mod_base, const lump_t *l) else out->next = NULL; - image = GetTexImage(in->texture, (findimage_t)Vk_FindImageUnsafe); + image = GetTexImage(in->texture, (findimage_t)Vk_FindImage); if (!image) { R_Printf(PRINT_ALL, "%s: Couldn't load %s\n", @@ -1101,7 +1101,7 @@ Mod_ForName (const char *name, model_t *parent_model, qboolean crash) { mod->extradata = Mod_LoadMD2(mod->name, buf, modfilelen, mod->mins, mod->maxs, - (struct image_s **)mod->skins, (findimage_t)Vk_FindImageUnsafe, + (struct image_s **)mod->skins, (findimage_t)Vk_FindImage, &(mod->type)); if (!mod->extradata) { @@ -1114,7 +1114,7 @@ Mod_ForName (const char *name, model_t *parent_model, qboolean crash) case IDSPRITEHEADER: { mod->extradata = Mod_LoadSP2(mod->name, buf, modfilelen, - (struct image_s **)mod->skins, (findimage_t)Vk_FindImageUnsafe, + (struct image_s **)mod->skins, (findimage_t)Vk_FindImage, &(mod->type)); if (!mod->extradata) { diff --git a/src/vk/vk_warp.c b/src/vk/vk_warp.c index f22859a..4863bac 100644 --- a/src/vk/vk_warp.c +++ b/src/vk/vk_warp.c @@ -703,7 +703,7 @@ void RE_SetSky_s (const char *name, float rotate, const vec3_t axis) image_t *image; image = (image_t *)GetSkyImage(skyname, suf[i], - r_palettedtexture->value, (findimage_t)Vk_FindImageUnsafe); + r_palettedtexture->value, (findimage_t)Vk_FindImage); if (!image) {