nzp-team
/
fteqw
mirror of https://github.com/nzp-team/fteqw.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

should fix the crash that happens after a while (actually about 1024 con prints). 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3376 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2009-10-04 22:03:16 +00:00
parent fbf5e5b627
commit f52ebd3f00
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
engine/client/console.c
View File

@ -37,6 +37,8 @@ console_t *con_current; // point to either con_main
#define Font_ScreenWidth() (conchar_font?glwidth:vid.width) #define Font_ScreenWidth() (conchar_font?glwidth:vid.width)
extern int glwidth; extern int glwidth;
#else #else
#define GLFont_BeginString(f, vx, vy, px, py) *px = vx; *py = vy;
#define GLFont_EndString(f)
#define Font_DrawChar(x,y,c) (Draw_ColouredCharacter(x, y, c),(x)+8) #define Font_DrawChar(x,y,c) (Draw_ColouredCharacter(x, y, c),(x)+8)
#define Font_CharWidth(c) 8 #define Font_CharWidth(c) 8
#define Font_CharHeight() 8 #define Font_CharHeight() 8
@ -529,6 +531,7 @@ void Con_PrintCon (console_t *con, char *txt)
{ {
conchar_t expanded[4096]; conchar_t expanded[4096];
conchar_t *c; conchar_t *c;
conline_t *oc;
static int cr; static int cr;
COM_ParseFunString(CON_WHITEMASK, txt, expanded, sizeof(expanded), false); COM_ParseFunString(CON_WHITEMASK, txt, expanded, sizeof(expanded), false);
@ -547,6 +550,20 @@ void Con_PrintCon (console_t *con, char *txt)
cr = true; cr = true;
break; break;
case '\n': case '\n':
{
conline_t *cl;
cl = con->oldest;
if (cl->older)
Sys_Error("older?\n");
while(cl->newer)
{
if (cl->newer->older != cl)
Sys_Error("bad backlink\n");
cl = cl->newer;
}
if (cl != con->current)
Sys_Error("not newest?\n");
}
cr = false; cr = false;
while (con->linecount >= con_maxlines.value) while (con->linecount >= con_maxlines.value)
{ {
@ -587,13 +604,13 @@ void Con_PrintCon (console_t *con, char *txt)
if (selendline == con->current) if (selendline == con->current)
selendline = NULL; selendline = NULL;
if (con->display == con->current) oc = con->current;
{ con->current = BZ_Realloc(con->current, sizeof(*con->current)+(con->current->length+1)*sizeof(conchar_t));
con->current = BZ_Realloc(con->current, sizeof(*con->current)+(con->current->length+1)*sizeof(conchar_t)); if (con->display == oc)
con->display = con->current; con->display = con->current;
} if (con->oldest == oc)
else con->oldest = con->current;
con->current = BZ_Realloc(con->current, sizeof(*con->current)+(con->current->length+1)*sizeof(conchar_t));
if (con->current->older) if (con->current->older)
con->current->older->newer = con->current; con->current->older->newer = con->current;
o = (conchar_t *)(con->current+1)+con->current->length; o = (conchar_t *)(con->current+1)+con->current->length;
@ -1082,7 +1099,7 @@ static int Con_DrawProgress(int left, int right, int y)
if (total == 0) if (total == 0)
{ {
//just show progress //just show progress
sprintf(progresspercenttext, " %02d%%", progresspercent); sprintf(progresspercenttext, " %02f%%", progresspercent);
} }
else else
{ {
@ -1426,6 +1443,8 @@ void Con_DrawConsole (int lines, qboolean noback)
break; break;
} }
GLFont_EndString(conchar_font);
// draw the input prompt, user text, and cursor if desired // draw the input prompt, user text, and cursor if desired
DrawCursor(); DrawCursor();
} }