X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=conout.c;h=ff012c72067fbb6d7a4e34d97ee3aebc88690121;hb=c9e3c29a259eeb8e1684993a30d2a06a153f5265;hp=2c9962d4a50329cc588e4f14934150c6ed35eca6;hpb=b360245b45856d709213a255af225c840cb08882;p=xonotic%2Fgmqcc.git diff --git a/conout.c b/conout.c index 2c9962d..ff012c7 100644 --- a/conout.c +++ b/conout.c @@ -110,7 +110,6 @@ static void win_fputs(char *str, FILE *h) { int icolor; int state; - int place; /* attributes */ int intense = -1; @@ -219,7 +218,7 @@ static int con_write(FILE *handle, const char *fmt, va_list va) { data[ln] = 0; vsprintf(data, fmt, va); if (GMQCC_IS_DEFINE(handle)) - ln = win_fputs(data, handle); + win_fputs(data, handle); else ln = fputs(data, handle); free(data); @@ -406,7 +405,7 @@ bool GMQCC_WARN vcompile_warning(lex_ctx ctx, int warntype, const char *fmt, va_ else ++compile_warnings; - con_vprintmsg_c(lvl, ctx.file, ctx.line, (opts.werror ? "error" : "warning"), fmt, ap, warn_name); + con_vprintmsg_c(lvl, ctx.file, ctx.line, ((lvl == LVL_ERROR) ? "error" : "warning"), fmt, ap, warn_name); return OPTS_WERROR(warntype); }