From: havoc Date: Wed, 4 May 2005 09:51:41 +0000 (+0000) Subject: removed .lmp suffix from a number of DrawQ_Pic calls, which should cure the gfx/net... X-Git-Tag: xonotic-v0.1.0preview~4959 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=34aa532f107b56b6cbc9be2bbe43a8e445529e75 removed .lmp suffix from a number of DrawQ_Pic calls, which should cure the gfx/net.lmp not found warnings git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5220 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/cl_screen.c b/cl_screen.c index 9b5933aa..a21127d3 100644 --- a/cl_screen.c +++ b/cl_screen.c @@ -178,7 +178,7 @@ void SCR_DrawTurtle (void) if (count < 3) return; - DrawQ_Pic (0, 0, "gfx/turtle.lmp", 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (0, 0, "gfx/turtle", 0, 0, 1, 1, 1, 1, 0); } /* @@ -195,7 +195,7 @@ void SCR_DrawNet (void) if (cls.demoplayback) return; - DrawQ_Pic (64, 0, "gfx/net.lmp", 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (64, 0, "gfx/net", 0, 0, 1, 1, 1, 1, 0); } /* @@ -216,8 +216,8 @@ void SCR_DrawPause (void) if (!cl.paused) return; - pic = Draw_CachePic ("gfx/pause.lmp", true); - DrawQ_Pic ((vid.conwidth - pic->width)/2, (vid.conheight - pic->height)/2, "gfx/pause.lmp", 0, 0, 1, 1, 1, 1, 0); + pic = Draw_CachePic ("gfx/pause", true); + DrawQ_Pic ((vid.conwidth - pic->width)/2, (vid.conheight - pic->height)/2, "gfx/pause", 0, 0, 1, 1, 1, 1, 0); } diff --git a/gl_backend.c b/gl_backend.c index 595227d7..3c3b3969 100644 --- a/gl_backend.c +++ b/gl_backend.c @@ -1799,7 +1799,7 @@ void SCR_UpdateLoadingScreen (void) R_Mesh_Start(); R_Mesh_Matrix(&r_identitymatrix); // draw the loading plaque - pic = Draw_CachePic("gfx/loading.lmp", false); + pic = Draw_CachePic("gfx/loading", false); x = (vid_conwidth.integer - pic->width)/2; y = (vid_conheight.integer - pic->height)/2; GL_Color(1,1,1,1); diff --git a/sbar.c b/sbar.c index e06e024f..1322245e 100644 --- a/sbar.c +++ b/sbar.c @@ -1146,7 +1146,7 @@ void Sbar_Draw (void) R_Draw2DCrosshair(); if (cl_prydoncursor.integer) - DrawQ_Pic((cl.cmd.cursor_screen[0] + 1) * 0.5 * vid.conwidth, (cl.cmd.cursor_screen[1] + 1) * 0.5 * vid.conheight, va("gfx/prydoncursor%03i.lmp", cl_prydoncursor.integer), 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic((cl.cmd.cursor_screen[0] + 1) * 0.5 * vid.conwidth, (cl.cmd.cursor_screen[1] + 1) * 0.5 * vid.conheight, va("gfx/prydoncursor%03i", cl_prydoncursor.integer), 0, 0, 1, 1, 1, 1, 0); } //============================================================================= @@ -1175,8 +1175,8 @@ void Sbar_DeathmatchOverlay (void) int i, x, y; cachepic_t *pic; - pic = Draw_CachePic ("gfx/ranking.lmp", true); - DrawQ_Pic ((vid.conwidth - pic->width)/2, 8, "gfx/ranking.lmp", 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0); + pic = Draw_CachePic ("gfx/ranking", true); + DrawQ_Pic ((vid.conwidth - pic->width)/2, 8, "gfx/ranking", 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0); // scores Sbar_SortFrags (); @@ -1252,8 +1252,8 @@ void Sbar_IntermissionOverlay (void) sbar_x = (vid.conwidth - 320) >> 1; sbar_y = (vid.conheight - 200) >> 1; - DrawQ_Pic (sbar_x + 64, sbar_y + 24, "gfx/complete.lmp", 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0); - DrawQ_Pic (sbar_x + 0, sbar_y + 56, "gfx/inter.lmp", 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0); + DrawQ_Pic (sbar_x + 64, sbar_y + 24, "gfx/complete", 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0); + DrawQ_Pic (sbar_x + 0, sbar_y + 56, "gfx/inter", 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0); // time dig = cl.completed_time/60; @@ -1284,7 +1284,7 @@ void Sbar_FinaleOverlay (void) { cachepic_t *pic; - pic = Draw_CachePic ("gfx/finale.lmp", true); - DrawQ_Pic((vid.conwidth - pic->width)/2, 16, "gfx/finale.lmp", 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0); + pic = Draw_CachePic ("gfx/finale", true); + DrawQ_Pic((vid.conwidth - pic->width)/2, 16, "gfx/finale", 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0); }