Use quake style for types naming

This commit is contained in:
Denis Pauk 2022-10-12 21:54:55 +03:00
parent f6e4f17c0a
commit b2e8fbb086
5 changed files with 13 additions and 13 deletions

View file

@ -33,7 +33,7 @@ Mod_LoadAliasModel/Mod_LoadMD2
*/
void *
Mod_LoadMD2 (const char *mod_name, const void *buffer, int modfilelen,
vec3_t mins, vec3_t maxs, struct image_s **skins, findImage_t findImage,
vec3_t mins, vec3_t maxs, struct image_s **skins, findimage_t find_image,
modtype_t *type)
{
dmdl_t *pinmodel, *pheader;
@ -183,7 +183,7 @@ Mod_LoadMD2 (const char *mod_name, const void *buffer, int modfilelen,
pheader->num_skins*MAX_SKINNAME);
for (i=0 ; i<pheader->num_skins ; i++)
{
skins[i] = findImage((char *)pheader + pheader->ofs_skins + i*MAX_SKINNAME,
skins[i] = find_image((char *)pheader + pheader->ofs_skins + i*MAX_SKINNAME,
it_skin);
}
@ -216,7 +216,7 @@ support for .sp2 sprites
*/
void *
Mod_LoadSP2 (const char *mod_name, const void *buffer, int modfilelen,
struct image_s **skins, findImage_t findImage, modtype_t *type)
struct image_s **skins, findimage_t find_image, modtype_t *type)
{
dsprite_t *sprin, *sprout;
void *extradata;
@ -253,7 +253,7 @@ Mod_LoadSP2 (const char *mod_name, const void *buffer, int modfilelen,
sprout->frames[i].origin_y = LittleLong(sprin->frames[i].origin_y);
memcpy(sprout->frames[i].name, sprin->frames[i].name, MAX_SKINNAME);
skins[i] = findImage((char *)sprout->frames[i].name, it_sprite);
skins[i] = find_image((char *)sprout->frames[i].name, it_sprite);
}
*type = mod_sprite;

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_FindImage,
&(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_FindImage,
&(mod->type));
if (!mod->extradata)
{

View file

@ -1049,7 +1049,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_FindImage,
&(mod->type));
if (!mod->extradata)
{
@ -1062,7 +1062,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_FindImage,
&(mod->type));
if (!mod->extradata)
{

View file

@ -94,11 +94,11 @@ extern float Mod_RadiusFromBounds(const vec3_t mins, const vec3_t maxs);
extern const byte* Mod_DecompressVis(const byte *in, int row);
/* Shared models load */
typedef struct image_s* (*findImage_t)(char *name, imagetype_t type);
typedef struct image_s* (*findimage_t)(char *name, imagetype_t type);
void *Mod_LoadMD2 (const char *mod_name, const void *buffer, int modfilelen,
vec3_t mins, vec3_t maxs, struct image_s **skins,
findImage_t findImage, modtype_t *type);
findimage_t findImage, modtype_t *type);
void *Mod_LoadSP2 (const char *mod_name, const void *buffer, int modfilelen,
struct image_s **skins, findImage_t findImage, modtype_t *type);
struct image_s **skins, findimage_t findImage, modtype_t *type);
#endif /* SRC_CLIENT_REFRESH_REF_SHARED_H_ */

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_FindImage,
&(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_FindImage,
&(mod->type));
if (!mod->extradata)
{