// show up the right size in the menu even if they were replaced with
// higher or lower resolution versions
dpsnprintf(lmpname, sizeof(lmpname), "%s.lmp", pic->name);
- if (!strncmp(pic->name, "gfx/", 4) && (lmpdata = FS_LoadFile(lmpname, tempmempool, false, &lmpsize)))
+ if ((!strncmp(pic->name, "gfx/", 4) || (gamemode == GAME_BLOODOMNICIDE && !strncmp(pic->name, "locale/", 6))) && (lmpdata = FS_LoadFile(lmpname, tempmempool, false, &lmpsize)))
{
if (developer_loading.integer)
Con_Printf("loading lump \"%s\"\n", pic->name);
else
width_of = fnt->width_of;
- for (i = 0;((bytes_left = *maxlen - (text - text_start)) > 0) && *text;)
+ i = 0;
+ while (((bytes_left = *maxlen - (text - text_start)) > 0) && *text)
{
size_t i0 = i;
nextch = ch = u8_getnchar(text, &text, bytes_left);
y += r_textshadow.value * vid.height / vid_conheight.value;
}
*/
- for (i = 0;((bytes_left = maxlen - (text - text_start)) > 0) && *text;)
+ while (((bytes_left = maxlen - (text - text_start)) > 0) && *text)
{
nextch = ch = u8_getnchar(text, &text, bytes_left);
i = text - text_start;
void DrawQ_LineLoop (drawqueuemesh_t *mesh, int flags)
{
- int num;
-
_DrawQ_SetupAndProcessDrawFlag(flags, NULL, 1);
if(!r_draw2d.integer && !r_draw2d_force)
return;
case RENDERPATH_GL13:
case RENDERPATH_GL20:
#ifndef USE_GLES2
- CHECKGLERROR
- qglBegin(GL_LINE_LOOP);
- for (num = 0;num < mesh->num_vertices;num++)
{
- if (mesh->data_color4f)
- GL_Color(mesh->data_color4f[num*4+0], mesh->data_color4f[num*4+1], mesh->data_color4f[num*4+2], mesh->data_color4f[num*4+3]);
- qglVertex2f(mesh->data_vertex3f[num*3+0], mesh->data_vertex3f[num*3+1]);
+ int num;
+ CHECKGLERROR
+ qglBegin(GL_LINE_LOOP);
+ for (num = 0;num < mesh->num_vertices;num++)
+ {
+ if (mesh->data_color4f)
+ GL_Color(mesh->data_color4f[num*4+0], mesh->data_color4f[num*4+1], mesh->data_color4f[num*4+2], mesh->data_color4f[num*4+3]);
+ qglVertex2f(mesh->data_vertex3f[num*3+0], mesh->data_vertex3f[num*3+1]);
+ }
+ qglEnd();
+ CHECKGLERROR
}
- qglEnd();
- CHECKGLERROR
#endif
break;
case RENDERPATH_D3D9:
}
}
-void DrawQ_Lines (float width, int numlines, const float *vertex3f, const float *color4f, int flags)
+void DrawQ_Lines (float width, int numlines, int flags, qboolean hasalpha)
{
- int i;
- qboolean hasalpha = false;
- for (i = 0;i < numlines*2;i++)
- if (color4f[i*4+3] < 1.0f)
- hasalpha = true;
-
_DrawQ_SetupAndProcessDrawFlag(flags, NULL, hasalpha ? 0.5f : 1.0f);
if(!r_draw2d.integer && !r_draw2d_force)
//qglLineWidth(width);CHECKGLERROR
CHECKGLERROR
- R_Mesh_PrepareVertices_Generic_Arrays(numlines*2, vertex3f, color4f, NULL);
qglDrawArrays(GL_LINES, 0, numlines*2);
CHECKGLERROR
break;