mirror of
https://github.com/Shpoike/Quakespasm.git
synced 2025-02-10 01:31:14 +00:00
gl_model.c (Mod_LoadAliasModel, Mod_LoadSpriteModel): add some enum casts
to make things more compatible with C++. git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@299 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
parent
d9182f61a4
commit
66ec5d11dc
1 changed files with 4 additions and 4 deletions
|
@ -2076,7 +2076,7 @@ void Mod_LoadAliasModel (model_t *mod, void *buffer)
|
||||||
Sys_Error ("Mod_LoadAliasModel: Invalid # of frames: %d\n", numframes);
|
Sys_Error ("Mod_LoadAliasModel: Invalid # of frames: %d\n", numframes);
|
||||||
|
|
||||||
pheader->size = LittleFloat (pinmodel->size) * ALIAS_BASE_SIZE_RATIO;
|
pheader->size = LittleFloat (pinmodel->size) * ALIAS_BASE_SIZE_RATIO;
|
||||||
mod->synctype = LittleLong (pinmodel->synctype);
|
mod->synctype = (synctype_t) LittleLong (pinmodel->synctype);
|
||||||
mod->numframes = pheader->numframes;
|
mod->numframes = pheader->numframes;
|
||||||
|
|
||||||
for (i=0 ; i<3 ; i++)
|
for (i=0 ; i<3 ; i++)
|
||||||
|
@ -2130,7 +2130,7 @@ void Mod_LoadAliasModel (model_t *mod, void *buffer)
|
||||||
for (i=0 ; i<numframes ; i++)
|
for (i=0 ; i<numframes ; i++)
|
||||||
{
|
{
|
||||||
aliasframetype_t frametype;
|
aliasframetype_t frametype;
|
||||||
frametype = LittleLong (pframetype->type);
|
frametype = (aliasframetype_t) LittleLong (pframetype->type);
|
||||||
if (frametype == ALIAS_SINGLE)
|
if (frametype == ALIAS_SINGLE)
|
||||||
pframetype = (daliasframetype_t *) Mod_LoadAliasFrame (pframetype + 1, &pheader->frames[i]);
|
pframetype = (daliasframetype_t *) Mod_LoadAliasFrame (pframetype + 1, &pheader->frames[i]);
|
||||||
else
|
else
|
||||||
|
@ -2303,7 +2303,7 @@ void Mod_LoadSpriteModel (model_t *mod, void *buffer)
|
||||||
psprite->maxwidth = LittleLong (pin->width);
|
psprite->maxwidth = LittleLong (pin->width);
|
||||||
psprite->maxheight = LittleLong (pin->height);
|
psprite->maxheight = LittleLong (pin->height);
|
||||||
psprite->beamlength = LittleFloat (pin->beamlength);
|
psprite->beamlength = LittleFloat (pin->beamlength);
|
||||||
mod->synctype = LittleLong (pin->synctype);
|
mod->synctype = (synctype_t) LittleLong (pin->synctype);
|
||||||
psprite->numframes = numframes;
|
psprite->numframes = numframes;
|
||||||
|
|
||||||
mod->mins[0] = mod->mins[1] = -psprite->maxwidth/2;
|
mod->mins[0] = mod->mins[1] = -psprite->maxwidth/2;
|
||||||
|
@ -2325,7 +2325,7 @@ void Mod_LoadSpriteModel (model_t *mod, void *buffer)
|
||||||
{
|
{
|
||||||
spriteframetype_t frametype;
|
spriteframetype_t frametype;
|
||||||
|
|
||||||
frametype = LittleLong (pframetype->type);
|
frametype = (spriteframetype_t) LittleLong (pframetype->type);
|
||||||
psprite->frames[i].type = frametype;
|
psprite->frames[i].type = frametype;
|
||||||
|
|
||||||
if (frametype == SPR_SINGLE)
|
if (frametype == SPR_SINGLE)
|
||||||
|
|
Loading…
Reference in a new issue