Merge branch 'master' into qss-r7-ad

# Conflicts:
#	quakespasm/Quake/console.c
This commit is contained in:
Eric Wasylishen 2017-05-29 00:58:03 -06:00
commit 5cbabe428e

View file

@ -1253,7 +1253,7 @@ void Con_DrawConsole (int lines, qboolean drawinput)
//draw version number in bottom right //draw version number in bottom right
y += 8; y += 8;
sprintf (ver, "QuakeSpasm version " QUAKESPASM_VER_STRING); q_snprintf (ver, sizeof(ver), "QuakeSpasm version " QUAKESPASM_VER_STRING);
for (x = 0; x < (int)strlen(ver); x++) for (x = 0; x < (int)strlen(ver); x++)
Draw_Character ((con_linewidth - strlen(ver) + x + 2)<<3, y, ver[x] /*+ 128*/); Draw_Character ((con_linewidth - strlen(ver) + x + 2)<<3, y, ver[x] /*+ 128*/);
} }