From 0fec378e31bb1fa8c4efa1a79e5ba192981a69be Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Wed, 7 May 2003 04:24:20 +0000 Subject: [PATCH] view.c needs to be in the main console lib rather than the client plugin and make view_draw the default draw function for new views --- libs/console/Makefile.am | 5 +++-- libs/console/client.c | 1 - libs/console/view.c | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/console/Makefile.am b/libs/console/Makefile.am index b8dfa130c..bb08a960e 100644 --- a/libs/console/Makefile.am +++ b/libs/console/Makefile.am @@ -12,8 +12,9 @@ plugin_PROGRAMS= @SERVER_PLUGIN_TARGETS@ @CLIENT_PLUGIN_TARGETS@ noinst_PROGRAMS= @SERVER_PLUGIN_STATIC@ @CLIENT_PLUGIN_STATIC@ EXTRA_PROGRAMS= console_server.la console_client.la -common_sources= buffer.c complete.c console.c inputline.c list.c filelist.c -client_sources= client.c menu.c view.c +common_sources= \ + buffer.c complete.c console.c inputline.c list.c filelist.c view.c +client_sources= client.c menu.c server_sources= server.c libQFconsole_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) diff --git a/libs/console/client.c b/libs/console/client.c index 269d9fc5a..cc04265f3 100644 --- a/libs/console/client.c +++ b/libs/console/client.c @@ -757,7 +757,6 @@ C_Init (void) con_debuglog = COM_CheckParm ("-condebug"); con_data.view = view_new (0, 0, 320, 200, grav_northeast); - con_data.view->draw = view_draw; console_view = view_new (0, 0, 320, 200, grav_northwest); say_view = view_new (0, 0, 320, 8, grav_northwest); diff --git a/libs/console/view.c b/libs/console/view.c index 58f6dbe36..6ecbd18ff 100644 --- a/libs/console/view.c +++ b/libs/console/view.c @@ -54,6 +54,7 @@ view_new (int xp, int yp, int xl, int yl, grav_t grav) view->ylen = yl; view->gravity = grav; view->visible = 1; + view->draw = view_draw; return view; }