yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-26 14:30:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Image: Check skin image before use

Browse source
This commit is contained in:
Denis Pauk 2022-10-16 16:28:30 +03:00
parent a22bbc8719
commit 49a1478d44
12 changed files with 51 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/client/refresh/files/pcx.c
View file

@ -327,7 +327,8 @@ GetPCXPalette (byte **colormap, unsigned *d_8to24table)
LoadPCX ("pics/colormap.pcx", colormap, &pal, NULL, NULL);
if (!*colormap || !pal)
{
ri.Sys_Error (ERR_FATAL, "Couldn't load pics/colormap.pcx");
ri.Sys_Error (ERR_FATAL, "%s: Couldn't load pics/colormap.pcx",
__func__);
}
for (i=0 ; i<256 ; i++)

3
src/client/refresh/gl1/gl1_draw.c
View file

@ -40,7 +40,8 @@ Draw_InitLocal(void)
draw_chars = FindPic("conchars", (findimage_t)R_FindImageUnsafe);
if (!draw_chars)
{
ri.Sys_Error(ERR_FATAL, "Couldn't load pics/conchars.pcx");
ri.Sys_Error(ERR_FATAL, "%s: Couldn't load pics/conchars.pcx",
__func__);
}
}

3
src/client/refresh/gl1/gl1_image.c
View file

@ -1206,7 +1206,8 @@ R_InitImages(void)
if (!gl_state.d_16to8table)
{
ri.Sys_Error(ERR_FATAL, "Couldn't load pics/16to8.pcx");
ri.Sys_Error(ERR_FATAL, "%s: Couldn't load pics/16to8.pcx",
__func__);
}
}

9
src/client/refresh/gl1/gl1_main.c
View file

@ -184,6 +184,7 @@ R_DrawSpriteModel(entity_t *currententity, const model_t *currentmodel)
dsprframe_t *frame;
float *up, *right;
dsprite_t *psprite;
image_t *skin;
/* don't even bother culling, because it's just
a single polygon without a surface cache */
@ -208,7 +209,13 @@ R_DrawSpriteModel(entity_t *currententity, const model_t *currentmodel)
glColor4f(1, 1, 1, alpha);
R_Bind(currentmodel->skins[currententity->frame]->texnum);
skin = currentmodel->skins[currententity->frame];
if (!skin)
{
skin = r_notexture; /* fallback... */
}
R_Bind(skin->texnum);
R_TexEnv(GL_MODULATE);

7
src/client/refresh/gl1/gl1_model.c
View file

@ -250,7 +250,7 @@ Mod_ForName (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)R_FindImage,
(struct image_s **)mod->skins, (findimage_t)R_FindImageUnsafe,
&(mod->type));
if (!mod->extradata)
{
@ -263,7 +263,7 @@ Mod_ForName (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)R_FindImage,
(struct image_s **)mod->skins, (findimage_t)R_FindImageUnsafe,
&(mod->type));
if (!mod->extradata)
{
@ -490,7 +490,8 @@ Mod_LoadTexinfo(model_t *loadmodel, byte *mod_base, lump_t *l)
if (!image)
{
R_Printf(PRINT_ALL, "Couldn't load %s\n", in->texture);
R_Printf(PRINT_ALL, "%s: Couldn't load %s\n",
__func__, in->texture);
image = r_notexture;
}

3
src/client/refresh/gl3/gl3_draw.c
View file

@ -40,7 +40,8 @@ GL3_Draw_InitLocal(void)
draw_chars = FindPic("conchars", (findimage_t)GL3_FindImageUnsafe);
if (!draw_chars)
{
ri.Sys_Error(ERR_FATAL, "Couldn't load pics/conchars.pcx");
ri.Sys_Error(ERR_FATAL, "%s: Couldn't load pics/conchars.pcx",
__func__);
}
// set up attribute layout for 2D textured rendering

9
src/client/refresh/gl3/gl3_main.c
View file

@ -819,6 +819,7 @@ GL3_DrawSpriteModel(entity_t *e, gl3model_t *currentmodel)
dsprframe_t *frame;
float *up, *right;
dsprite_t *psprite;
gl3image_t *skin;
/* don't even bother culling, because it's just
a single polygon without a surface cache */
@ -842,7 +843,13 @@ GL3_DrawSpriteModel(entity_t *e, gl3model_t *currentmodel)
GL3_UpdateUBO3D();
}
GL3_Bind(currentmodel->skins[e->frame]->texnum);
skin = currentmodel->skins[e->frame];
if (!skin)
{
skin = gl3_notexture; /* fallback... */
}
GL3_Bind(skin->texnum);
if (alpha == 1.0)
{

7
src/client/refresh/gl3/gl3_model.c
View file

@ -357,7 +357,8 @@ Mod_LoadTexinfo(gl3model_t *loadmodel, byte *mod_base, lump_t *l)
image = GetTexImage(in->texture, (findimage_t)GL3_FindImageUnsafe);
if (!image)
{
R_Printf(PRINT_ALL, "Couldn't load %s\n", in->texture);
R_Printf(PRINT_ALL, "%s: Couldn't load %s\n",
__func__, in->texture);
image = gl3_notexture;
}
@ -1043,7 +1044,7 @@ Mod_ForName (char *name, gl3model_t *parent_model, qboolean crash)
{
mod->extradata = Mod_LoadMD2(mod->name, buf, modfilelen,
mod->mins, mod->maxs,
(struct image_s **)mod->skins, (findimage_t)GL3_FindImage,
(struct image_s **)mod->skins, (findimage_t)GL3_FindImageUnsafe,
&(mod->type));
if (!mod->extradata)
{
@ -1056,7 +1057,7 @@ Mod_ForName (char *name, gl3model_t *parent_model, qboolean crash)
case IDSPRITEHEADER:
{
mod->extradata = Mod_LoadSP2(mod->name, buf, modfilelen,
(struct image_s **)mod->skins, (findimage_t)GL3_FindImage,
(struct image_s **)mod->skins, (findimage_t)GL3_FindImageUnsafe,
&(mod->type));
if (!mod->extradata)
{

6
src/client/refresh/gl3/gl3_sdl.c
View file

@ -190,13 +190,15 @@ int GL3_PrepareForWindow(void)
{
if (libgl == NULL)
{
ri.Sys_Error(ERR_FATAL, "Couldn't load libGL: %s!", SDL_GetError());
ri.Sys_Error(ERR_FATAL, "%s: Couldn't load libGL: %s!",
__func__, SDL_GetError());
return -1;
}
else
{
R_Printf(PRINT_ALL, "Couldn't load libGL: %s!\n", SDL_GetError());
R_Printf(PRINT_ALL, "%s: Couldn't load libGL: %s!\n",
__func__, SDL_GetError());
R_Printf(PRINT_ALL, "Retrying with default...\n");
ri.Cvar_Set("gl3_libgl", "");

2
src/client/refresh/soft/sw_alias.c
View file

@ -504,7 +504,9 @@ R_AliasSetupSkin(const entity_t *currententity, const model_t *currentmodel)
image_t *pskindesc;
if (currententity->skin)
{
pskindesc = currententity->skin;
}
else
{
int skinnum;

7
src/client/refresh/soft/sw_model.c
View file

@ -200,7 +200,7 @@ Mod_ForName (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)R_FindImage,
(struct image_s **)mod->skins, (findimage_t)R_FindImageUnsafe,
&(mod->type));
if (!mod->extradata)
{
@ -213,7 +213,7 @@ Mod_ForName (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)R_FindImage,
(struct image_s **)mod->skins, (findimage_t)R_FindImageUnsafe,
&(mod->type));
if (!mod->extradata)
{
@ -534,9 +534,8 @@ Mod_LoadTexinfo (model_t *loadmodel, byte *mod_base, lump_t *l)
image = GetTexImage(in->texture, (findimage_t)R_FindImageUnsafe);
if (!image)
{
R_Printf(PRINT_ALL, "Couldn't load %s\n", in->texture);
R_Printf(PRINT_ALL, "%s: Couldn't load %s\n", __func__, in->texture);
image = r_notexture_mip;
out->flags = 0;
}
out->image = image;

14
src/client/refresh/soft/sw_sprite.c
View file

@ -39,16 +39,22 @@ R_DrawSprite(entity_t *currententity, const model_t *currentmodel)
vec3_t left, up, right, down;
dsprite_t *s_psprite;
dsprframe_t *s_psprframe;
image_t *skin;
s_psprite = (dsprite_t *)currentmodel->extradata;
currententity->frame %= s_psprite->numframes;
s_psprframe = &s_psprite->frames[currententity->frame];
r_polydesc.pixels = currentmodel->skins[currententity->frame]->pixels[0];
r_polydesc.pixel_width = s_psprframe->width;
r_polydesc.pixel_height = s_psprframe->height;
skin = currentmodel->skins[currententity->frame];
if (!skin)
{
skin = r_notexture_mip;
}
r_polydesc.pixels = skin->pixels[0];
r_polydesc.pixel_width = min(s_psprframe->width, skin->width);
r_polydesc.pixel_height = min(s_psprframe->height, skin->height);
r_polydesc.dist = 0;
// generate the sprite's axes, completely parallel to the viewplane.