Revert renamings from 591877ee0c64958303dcbb4f2af3d343a420cf6a

[xonotic/darkplaces.git] / gl_textures.c

diff --git a/gl_textures.c b/gl_textures.c
index 100989729b7742f82d7aef250ecc83493fdd49e5..049240b63bccb4d80c842c4c3f577c7345d19620 100644 (file)
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -928,19 +928,19 @@ static void GL_SetupTextureParameters(int flags, textype_t textype, int texturet
 static void R_UploadPartialTexture(gltexture_t *glt, const unsigned char *data, int fragx, int fragy, int fragz, int fragwidth, int fragheight, int fragdepth)
 {
        if (data == NULL)
-               Sys_Abort("R_UploadPartialTexture \"%s\": partial update with NULL pixels", glt->identifier);
+               Sys_Error("R_UploadPartialTexture \"%s\": partial update with NULL pixels", glt->identifier);
 
        if (glt->texturetype != GLTEXTURETYPE_2D)
-               Sys_Abort("R_UploadPartialTexture \"%s\": partial update of type other than 2D", glt->identifier);
+               Sys_Error("R_UploadPartialTexture \"%s\": partial update of type other than 2D", glt->identifier);
 
        if (glt->textype->textype == TEXTYPE_PALETTE)
-               Sys_Abort("R_UploadPartialTexture \"%s\": partial update of paletted texture", glt->identifier);
+               Sys_Error("R_UploadPartialTexture \"%s\": partial update of paletted texture", glt->identifier);
 
        if (glt->flags & (TEXF_MIPMAP | TEXF_PICMIP))
-               Sys_Abort("R_UploadPartialTexture \"%s\": partial update not supported with MIPMAP or PICMIP flags", glt->identifier);
+               Sys_Error("R_UploadPartialTexture \"%s\": partial update not supported with MIPMAP or PICMIP flags", glt->identifier);
 
        if (glt->inputwidth != glt->tilewidth || glt->inputheight != glt->tileheight || glt->tiledepth != 1)
-               Sys_Abort("R_UploadPartialTexture \"%s\": partial update not supported with stretched or special textures", glt->identifier);
+               Sys_Error("R_UploadPartialTexture \"%s\": partial update not supported with stretched or special textures", glt->identifier);
 
        // update a portion of the image
 
@@ -971,7 +971,7 @@ static void R_UploadFullTexture(gltexture_t *glt, const unsigned char *data)
 
        // error out if a stretch is needed on special texture types
        if (glt->texturetype != GLTEXTURETYPE_2D && (glt->tilewidth != glt->inputwidth || glt->tileheight != glt->inputheight || glt->tiledepth != glt->inputdepth))
-               Sys_Abort("R_UploadFullTexture \"%s\": stretch uploads allowed only on 2D textures\n", glt->identifier);
+               Sys_Error("R_UploadFullTexture \"%s\": stretch uploads allowed only on 2D textures\n", glt->identifier);
 
        // when picmip or maxsize is applied, we scale up to a power of 2 multiple
        // of the target size and then use the mipmap reduction function to get
@@ -1280,7 +1280,7 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden
                flags |= TEXF_ALPHA;
                break;
        default:
-               Sys_Abort("R_LoadTexture: unknown texture type");
+               Sys_Error("R_LoadTexture: unknown texture type");
        }
 
        texinfo2 = R_GetTexTypeInfo(textype, flags);