removed .lmp suffix from a number of DrawQ_Pic calls, which should cure the gfx/net...

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 9b5933aab9e3f6cb6deaf99d12f440cf4ba26640..a21127d355b3d2f105703d7613a6654f203b2096 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -178,7 +178,7 @@ void SCR_DrawTurtle (void)
        if (count < 3)
                return;
 
        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;
 
        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;
 
        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 595227d7c550ab8ea27fd7309cb17a4c61c3503c..3c3b3969acbba21b9e50c30eb0a91c62570265e9 100644 (file)
--- 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
        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);
        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 e06e024f0016570d02b43cc743ea96ac37b4064d..1322245ebe736d78352ce6076fd361609580bd22 100644 (file)
--- a/sbar.c
+++ b/sbar.c
@@ -1146,7 +1146,7 @@ void Sbar_Draw (void)
        R_Draw2DCrosshair();
 
        if (cl_prydoncursor.integer)
        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;
 
        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 ();
 
        // scores
        Sbar_SortFrags ();


@@ -1252,8 +1252,8 @@ void Sbar_IntermissionOverlay (void)
        sbar_x = (vid.conwidth - 320) >> 1;
        sbar_y = (vid.conheight - 200) >> 1;
 
        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;
 
 // time
        dig = cl.completed_time/60;


@@ -1284,7 +1284,7 @@ void Sbar_FinaleOverlay (void)
 {
        cachepic_t      *pic;
 
 {
        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);

 }
 
 }