From cb49061a4c32409a563abc9afa6faec577f9bb67 Mon Sep 17 00:00:00 2001 From: Yamagi Burmeister Date: Fri, 22 Oct 2010 09:17:19 +0000 Subject: [PATCH] Behebe ein wenig Fallout vom letzten Commit --- src/refresh/files/md2.c | 3 +-- src/refresh/files/sp2.c | 2 +- src/refresh/files/wal.c | 4 ++-- src/refresh/gl_model.c | 8 ++++---- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/refresh/files/md2.c b/src/refresh/files/md2.c index 6a3b8636..bcfa5282 100644 --- a/src/refresh/files/md2.c +++ b/src/refresh/files/md2.c @@ -147,8 +147,7 @@ LoadMD2 ( model_t *mod, void *buffer ) for ( i = 0; i < pheader->num_skins; i++ ) { - mod->skins [ i ] = GL_FindImage( (char *) pheader + pheader->ofs_skins + i * MAX_SKINNAME, - it_skin ); + mod->skins [ i ] = R_FindImage( (char *) pheader + pheader->ofs_skins + i * MAX_SKINNAME, it_skin ); } mod->mins [ 0 ] = -32; diff --git a/src/refresh/files/sp2.c b/src/refresh/files/sp2.c index 9b5fef34..d6f2fa42 100644 --- a/src/refresh/files/sp2.c +++ b/src/refresh/files/sp2.c @@ -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_y = LittleLong( sprin->frames [ i ].origin_y ); 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 ); } diff --git a/src/refresh/files/wal.c b/src/refresh/files/wal.c index d6ca4f1d..0db23893 100644 --- a/src/refresh/files/wal.c +++ b/src/refresh/files/wal.c @@ -11,7 +11,7 @@ LoadWal ( char *name ) 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 ); } @@ -19,7 +19,7 @@ LoadWal ( char *name ) height = LittleLong( mt->height ); 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 ); diff --git a/src/refresh/gl_model.c b/src/refresh/gl_model.c index 6cb2948b..dbd398da 100644 --- a/src/refresh/gl_model.c +++ b/src/refresh/gl_model.c @@ -36,9 +36,9 @@ int mod_numknown; int registration_sequence; 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_LoadAliasModel ( model_t *mod, void *buffer ); +void LoadMD2 ( model_t *mod, void *buffer ); model_t *Mod_LoadModel ( model_t *mod, qboolean crash ); void GL_BuildPolygonFromSurface ( msurface_t *fa ); void GL_CreateSurfaceLightmap ( msurface_t *surf ); @@ -256,12 +256,12 @@ Mod_ForName ( char *name, qboolean crash ) { case IDALIASHEADER: loadmodel->extradata = Hunk_Begin( 0x200000 ); - Mod_LoadAliasModel( mod, buf ); + LoadMD2( mod, buf ); break; case IDSPRITEHEADER: loadmodel->extradata = Hunk_Begin( 0x10000 ); - Mod_LoadSpriteModel( mod, buf ); + LoadSP2( mod, buf ); break; case IDBSPHEADER: