Give R_RegisterPic2() more descriptive name.

skullernet · Oct 28, 2023 · 3538367 · 3538367
1 parent 98d51fd
commit 3538367
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/inc/refresh/refresh.h b/inc/refresh/refresh.h
@@ -200,7 +200,7 @@ void    R_SetSky(const char *name, float rotate, bool autorotate, const vec3_t a
 void    R_EndRegistration(void);
 
 #define R_RegisterPic(name)     R_RegisterImage(name, IT_PIC, IF_PERMANENT)
-#define R_RegisterPic2(name)    R_RegisterImage(name, IT_PIC, IF_NONE)
+#define R_RegisterTempPic(name) R_RegisterImage(name, IT_PIC, IF_NONE)
 #define R_RegisterFont(name)    R_RegisterImage(name, IT_FONT, IF_PERMANENT)
 #define R_RegisterSkin(name)    R_RegisterImage(name, IT_SKIN, IF_NONE)
 #define R_RegisterSprite(name)  R_RegisterImage(name, IT_SPRITE, IF_NONE)

diff --git a/src/client/cin.c b/src/client/cin.c
@@ -444,7 +444,7 @@ void SCR_ReloadCinematic(void)
     if (cin.pic) {
         R_UpdateRawPic(cin.width, cin.height, cin.pic);
     } else if (cl.mapname[0]) {
-        cin.static_pic = R_RegisterPic2(cl.mapname);
+        cin.static_pic = R_RegisterTempPic(cl.mapname);
         R_GetPicSize(&cin.width, &cin.height, cin.static_pic);
     }
 }
@@ -460,7 +460,7 @@ void SCR_PlayCinematic(const char *name)
     OGG_Stop();
 
     if (!COM_CompareExtension(name, ".pcx")) {
-        cin.static_pic = R_RegisterPic2(name);
+        cin.static_pic = R_RegisterTempPic(name);
         if (!cin.static_pic)
             goto finish;
         R_GetPicSize(&cin.width, &cin.height, cin.static_pic);

diff --git a/src/client/precache.c b/src/client/precache.c
@@ -169,7 +169,7 @@ void CL_LoadClientinfo(clientinfo_t *ci, const char *s)
     // icon file
     Q_concat(icon_filename, sizeof(icon_filename),
              "/players/", model_name, "/", skin_name, "_i.pcx");
-    ci->icon = R_RegisterPic2(icon_filename);
+    ci->icon = R_RegisterTempPic(icon_filename);
 
     strcpy(ci->model_name, model_name);
     strcpy(ci->skin_name, skin_name);
@@ -334,7 +334,7 @@ static qhandle_t CL_RegisterImage(const char *s)
             return R_RegisterSkin(s);
     }
 
-    return R_RegisterPic2(s);
+    return R_RegisterTempPic(s);
 }
 
 /*

diff --git a/src/client/screen.c b/src/client/screen.c
@@ -1716,7 +1716,7 @@ static void SCR_ExecuteLayoutString(const char *s)
         if (!strcmp(token, "picn")) {
             // draw a pic from a name
             token = COM_Parse(&s);
-            R_DrawPic(x, y, R_RegisterPic2(token));
+            R_DrawPic(x, y, R_RegisterTempPic(token));
             continue;
         }
 

diff --git a/src/common/tests.c b/src/common/tests.c
@@ -594,7 +594,7 @@ static void Com_TestImages_f(void)
             R_EndRegistration();
             R_BeginRegistration(NULL);
         }
-        if (!R_RegisterPic2(va("/%s", (char *)list[i]))) {
+        if (!R_RegisterTempPic(va("/%s", (char *)list[i]))) {
             errors++;
             continue;
         }