yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-10 07:12:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Behebe ein wenig Fallout vom letzten Commit

Browse source
This commit is contained in:
Yamagi Burmeister 2010-10-22 09:17:19 +00:00
parent 7563c221f4
commit cb49061a4c
4 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/refresh/files/md2.c
View file

@ -147,8 +147,7 @@ LoadMD2 ( model_t *mod, void *buffer )
for ( i = 0; i < pheader->num_skins; i++ ) for ( i = 0; i < pheader->num_skins; i++ )
{ {
mod->skins [ i ] = GL_FindImage( (char *) pheader + pheader->ofs_skins + i * MAX_SKINNAME, mod->skins [ i ] = R_FindImage( (char *) pheader + pheader->ofs_skins + i * MAX_SKINNAME, it_skin );
it_skin );
} }
mod->mins [ 0 ] = -32; mod->mins [ 0 ] = -32;

2
src/refresh/files/sp2.c
View file

@ -61,7 +61,7 @@ LoadSP2 ( model_t *mod, void *buffer )
sprout->frames [ i ].origin_x = LittleLong( sprin->frames [ i ].origin_x ); sprout->frames [ i ].origin_x = LittleLong( sprin->frames [ i ].origin_x );
sprout->frames [ i ].origin_y = LittleLong( sprin->frames [ i ].origin_y ); sprout->frames [ i ].origin_y = LittleLong( sprin->frames [ i ].origin_y );
memcpy( sprout->frames [ i ].name, sprin->frames [ i ].name, MAX_SKINNAME ); memcpy( sprout->frames [ i ].name, sprin->frames [ i ].name, MAX_SKINNAME );
mod->skins [ i ] = GL_FindImage( sprout->frames [ i ].name, mod->skins [ i ] = R_FindImage( sprout->frames [ i ].name,
it_sprite ); it_sprite );
} }

4
src/refresh/files/wal.c
View file

@ -11,7 +11,7 @@ LoadWal ( char *name )
if ( !mt ) if ( !mt )
{ {
ri.Con_Printf( PRINT_ALL, "GL_LoadWall: can't load %s\n", name ); ri.Con_Printf( PRINT_ALL, "LoadWall: can't load %s\n", name );
return ( r_notexture ); return ( r_notexture );
} }
@ -19,7 +19,7 @@ LoadWal ( char *name )
height = LittleLong( mt->height ); height = LittleLong( mt->height );
ofs = LittleLong( mt->offsets [ 0 ] ); ofs = LittleLong( mt->offsets [ 0 ] );
image = GL_LoadPic( name, (byte *) mt + ofs, width, height, it_wall, 8 ); image = R_LoadPic( name, (byte *) mt + ofs, width, height, it_wall, 8 );
ri.FS_FreeFile( (void *) mt ); ri.FS_FreeFile( (void *) mt );

8
src/refresh/gl_model.c
View file

@ -36,9 +36,9 @@ int mod_numknown;
int registration_sequence; int registration_sequence;
byte *mod_base; byte *mod_base;
void Mod_LoadSpriteModel ( model_t *mod, void *buffer ); void LoadSP2 ( model_t *mod, void *buffer );
void Mod_LoadBrushModel ( model_t *mod, void *buffer ); void Mod_LoadBrushModel ( model_t *mod, void *buffer );
void Mod_LoadAliasModel ( model_t *mod, void *buffer ); void LoadMD2 ( model_t *mod, void *buffer );
model_t *Mod_LoadModel ( model_t *mod, qboolean crash ); model_t *Mod_LoadModel ( model_t *mod, qboolean crash );
void GL_BuildPolygonFromSurface ( msurface_t *fa ); void GL_BuildPolygonFromSurface ( msurface_t *fa );
void GL_CreateSurfaceLightmap ( msurface_t *surf ); void GL_CreateSurfaceLightmap ( msurface_t *surf );
@ -256,12 +256,12 @@ Mod_ForName ( char *name, qboolean crash )
{ {
case IDALIASHEADER: case IDALIASHEADER:
loadmodel->extradata = Hunk_Begin( 0x200000 ); loadmodel->extradata = Hunk_Begin( 0x200000 );
Mod_LoadAliasModel( mod, buf ); LoadMD2( mod, buf );
break; break;
case IDSPRITEHEADER: case IDSPRITEHEADER:
loadmodel->extradata = Hunk_Begin( 0x10000 ); loadmodel->extradata = Hunk_Begin( 0x10000 );
Mod_LoadSpriteModel( mod, buf ); LoadSP2( mod, buf );
break; break;
case IDBSPHEADER: case IDBSPHEADER: