From 45a4de379452052e140d78ef9adc40eb4c080e68 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Mon, 2 Jun 2003 20:45:32 +0000 Subject: [PATCH] set console background, fix whitespace --- ChangeLog | 5 +++++ configure.ac | 14 +++++++------- main/console.c | 6 ++++-- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 22cd2793..9b203ddc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-06-02 Bradley Bell + + * configure.ac, main/console.c: set console background, fix + whitespace + 2003-06-01 Bradley Bell * Makefile.am, arch/sdl/event.c, configure.ac, diff --git a/configure.ac b/configure.ac index a4dd36ef..7373e646 100644 --- a/configure.ac +++ b/configure.ac @@ -154,15 +154,15 @@ if test x$enable_fastfileio != xno; then D2X_FEATURES="fastfileio ${D2X_FEATURES}" fi -dnl Build with CONSOLE? -AC_ARG_ENABLE(console, - [ --enable-console Enable console (experimental) ],,) -if test x$enable_console = xyes; then - AC_DEFINE(CONSOLE,,[Define to enable console]) +dnl Build with CONSOLE? +AC_ARG_ENABLE(console, + [ --enable-console Enable console (experimental) ],,) +if test x$enable_console = xyes; then + AC_DEFINE(CONSOLE,,[Define to enable console]) D2X_SUBDIRS=console -fi +fi AM_CONDITIONAL(CONSOLE, test x$enable_console = xyes) - + AC_ARG_WITH(sharepath, [[ --with-sharepath=DIR Use DIR for shared game data (unix only) [DATADIR/games/d2x]]], sharepath=$withval, sharepath="auto") diff --git a/main/console.c b/main/console.c index d2faa476..b9a9c27c 100644 --- a/main/console.c +++ b/main/console.c @@ -1,4 +1,4 @@ -/* $Id: console.c,v 1.12 2003-06-02 06:15:41 btb Exp $ */ +/* $Id: console.c,v 1.13 2003-06-02 20:45:32 btb Exp $ */ /* * * FIXME: put description here @@ -76,13 +76,15 @@ void real_con_init(void) SDL_Rect Con_rect; Con_rect.x = Con_rect.y = 0; - Con_rect.w = Con_rect.h = 300; + Con_rect.w = 320; + Con_rect.h = 200; Console = CON_Init("ConsoleFont.png", screen, CON_NUM_LINES, Con_rect); Assert(Console); CON_SetExecuteFunction(Console, con_parse); + CON_Background(Console, "scores.pcx", 0, 0); con_initialized = 1; } -- 2.39.2