{
int i;
for(i = 0; i < CON_LINES_COUNT; ++i)
- CON_LINES(i).mask |= CON_MASK_HIDENOTIFY;
+ if(!(CON_LINES(i).mask & CON_MASK_CHAT))
+ CON_LINES(i).mask |= CON_MASK_HIDENOTIFY;
}
if(!con.text) // FIXME uses a non-abstracted property of con
return;
- if (con_mutex) Thread_LockMutex(con_mutex);
for(; *txt; ++txt)
{
if(cr_pending)
break;
}
}
- if (con_mutex) Thread_UnlockMutex(con_mutex);
}
/*! The translation table between the graphical font and plain ASCII --KB */
static void Con_Rcon_Redirect_Flush(void)
{
- rcon_redirect_buffer[rcon_redirect_bufferpos] = 0;
- if (rcon_redirect_proquakeprotocol)
+ if(rcon_redirect_sock)
{
- // update the length in the packet header
- StoreBigLong((unsigned char *)rcon_redirect_buffer, NETFLAG_CTL | (rcon_redirect_bufferpos & NETFLAG_LENGTH_MASK));
+ rcon_redirect_buffer[rcon_redirect_bufferpos] = 0;
+ if (rcon_redirect_proquakeprotocol)
+ {
+ // update the length in the packet header
+ StoreBigLong((unsigned char *)rcon_redirect_buffer, NETFLAG_CTL | (rcon_redirect_bufferpos & NETFLAG_LENGTH_MASK));
+ }
+ NetConn_Write(rcon_redirect_sock, rcon_redirect_buffer, rcon_redirect_bufferpos, rcon_redirect_dest);
}
- NetConn_Write(rcon_redirect_sock, rcon_redirect_buffer, rcon_redirect_bufferpos, rcon_redirect_dest);
memcpy(rcon_redirect_buffer, "\377\377\377\377n", 5); // QW rcon print
rcon_redirect_bufferpos = 5;
rcon_redirect_proquakeprotocol = false;
line[index++] = STRING_COLOR_DEFAULT + '0';
// special color codes for chat messages must always come first
// for Con_PrintToHistory to work properly
- if (*msg == 1 || *msg == 2)
+ if (*msg == 1 || *msg == 2 || *msg == 3)
{
// play talk wav
if (*msg == 1)
S_LocalSound ("sound/misc/talk.wav");
}
}
- mask = CON_MASK_CHAT;
}
+
+ // Send to chatbox for say/tell (1) and messages (3)
+ // 3 is just so that a message can be sent to the chatbox without a sound.
+ if (*msg == 1 || *msg == 3)
+ mask = CON_MASK_CHAT;
+
line[index++] = STRING_COLOR_TAG;
line[index++] = '3';
msg++;
while(*p)
{
int ch = u8_getchar(p, &q);
- if(ch >= 0xE000 && ch <= 0xE0FF)
+ if(ch >= 0xE000 && ch <= 0xE0FF && ((unsigned char) qfont_table[ch - 0xE000]) >= 0x20)
{
*p = qfont_table[ch - 0xE000];
if(q > p+1)
return DrawQ_TextWidth(w, *length, ti->fontsize, ti->fontsize, false, ti->font);
else
{
- printf("Con_WordWidthFunc: can't get here (maxWidth should never be %f)\n", maxWidth);
+ Sys_PrintfToTerminal("Con_WordWidthFunc: can't get here (maxWidth should never be %f)\n", maxWidth);
// Note: this is NOT a Con_Printf, as it could print recursively
return 0;
}
const char *data = NULL;
char keyname[64];
char entfilename[MAX_QPATH];
- strlcpy(message, "^1**ERROR**^7", sizeof(message));
+ char desc[64];
+ desc[0] = 0;
+ strlcpy(message, "^1ERROR: open failed^7", sizeof(message));
p = 0;
f = FS_OpenVirtualFile(t->filenames[i], true);
if(f)
{
+ strlcpy(message, "^1ERROR: not a known map format^7", sizeof(message));
memset(buf, 0, 1024);
FS_Read(f, buf, 1024);
if (!memcmp(buf, "IBSP", 4))
q3dheader_t *header = (q3dheader_t *)buf;
lumpofs = LittleLong(header->lumps[Q3LUMP_ENTITIES].fileofs);
lumplen = LittleLong(header->lumps[Q3LUMP_ENTITIES].filelen);
+ dpsnprintf(desc, sizeof(desc), "Q3BSP%i", p);
}
else if (p == Q2BSPVERSION)
{
q2dheader_t *header = (q2dheader_t *)buf;
lumpofs = LittleLong(header->lumps[Q2LUMP_ENTITIES].fileofs);
lumplen = LittleLong(header->lumps[Q2LUMP_ENTITIES].filelen);
+ dpsnprintf(desc, sizeof(desc), "Q2BSP%i", p);
}
+ else
+ dpsnprintf(desc, sizeof(desc), "IBSP%i", p);
+ }
+ else if (BuffLittleLong(buf) == BSPVERSION)
+ {
+ lumpofs = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES);
+ lumplen = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES + 4);
+ dpsnprintf(desc, sizeof(desc), "BSP29");
}
- else if((p = BuffLittleLong(buf)) == BSPVERSION || p == 30)
+ else if (BuffLittleLong(buf) == 30)
{
- dheader_t *header = (dheader_t *)buf;
- lumpofs = LittleLong(header->lumps[LUMP_ENTITIES].fileofs);
- lumplen = LittleLong(header->lumps[LUMP_ENTITIES].filelen);
+ lumpofs = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES);
+ lumplen = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES + 4);
+ dpsnprintf(desc, sizeof(desc), "BSPHL");
+ }
+ else if (!memcmp(buf, "BSP2", 4))
+ {
+ lumpofs = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES);
+ lumplen = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES + 4);
+ dpsnprintf(desc, sizeof(desc), "BSP2");
+ }
+ else if (!memcmp(buf, "2PSB", 4))
+ {
+ lumpofs = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES);
+ lumplen = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES + 4);
+ dpsnprintf(desc, sizeof(desc), "BSP2RMQe");
}
else
- p = 0;
+ {
+ dpsnprintf(desc, sizeof(desc), "unknown%i", BuffLittleLong(buf));
+ }
strlcpy(entfilename, t->filenames[i], sizeof(entfilename));
memcpy(entfilename + strlen(entfilename) - 4, ".ent", 5);
entities = (char *)FS_LoadFile(entfilename, tempmempool, true, NULL);
for (;;)
{
int l;
- if (!COM_ParseToken_Simple(&data, false, false))
+ if (!COM_ParseToken_Simple(&data, false, false, true))
break;
if (com_token[0] == '{')
continue;
for (l = 0;l < (int)sizeof(keyname) - 1 && com_token[k+l] && !ISWHITESPACE(com_token[k+l]);l++)
keyname[l] = com_token[k+l];
keyname[l] = 0;
- if (!COM_ParseToken_Simple(&data, false, false))
+ if (!COM_ParseToken_Simple(&data, false, false, true))
break;
if (developer_extra.integer)
Con_DPrintf("key: %s %s\n", keyname, com_token);
if(f)
FS_Close(f);
*(t->filenames[i]+len[i]+5) = 0;
- switch(p)
- {
- case Q3BSPVERSION: strlcpy((char *)buf, "Q3", sizeof(buf));break;
- case Q2BSPVERSION: strlcpy((char *)buf, "Q2", sizeof(buf));break;
- case BSPVERSION: strlcpy((char *)buf, "Q1", sizeof(buf));break;
- case 30: strlcpy((char *)buf, "HL", sizeof(buf));break;
- default: strlcpy((char *)buf, "??", sizeof(buf));break;
- }
- Con_Printf("%16s (%s) %s\n", t->filenames[i]+5, buf, message);
+ Con_Printf("%16s (%-8s) %s\n", t->filenames[i]+5, desc, message);
}
Con_Print("\n");
for(p=o;p<min;p++)
if(Nicks_strcleanlen(Nicks_sanlist[0]) < strlen(tempstr))
{
// if the clean sanitized one is longer than the current one, use it, it has crap chars which definitely are in there
- strlcpy(Nicks_sanlist[0], tempstr, sizeof(tempstr));
+ strlcpy(Nicks_sanlist[0], tempstr, sizeof(Nicks_sanlist[0]));
}
}
if(Nicks_strcleanlen(Nicks_sanlist[0]) < strlen(tempstr))
{
// if the clean sanitized one is longer than the current one, use it, it has crap chars which definitely are in there
- strlcpy(Nicks_sanlist[0], tempstr, sizeof(tempstr));
+ strlcpy(Nicks_sanlist[0], tempstr, sizeof(Nicks_sanlist[0]));
}
}
stringlistinit(&resultbuf);
stringlistinit(&dirbuf);
- while(COM_ParseToken_Simple(&patterns, false, false))
+ while(COM_ParseToken_Simple(&patterns, false, false, true))
{
fssearch_t *search;
if(strchr(com_token, '/'))
projects / xonotic / darkplaces.git / blobdiff