diff --git a/ChangeLog b/ChangeLog index 1dbce2ddb..478d7f4ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2003-03-19 Bradley Bell + * arch/sdl/gr.c: removing dependencies on stuff in main/ + * arch/linux/Makefile.am, arch/linux/init.c, arch/linux/linuxnet.c, arch/linux/include/ukali.h, arch/ogl/Makefile.am, main/inferno.c: moved joy_init back to main, diff --git a/arch/sdl/gr.c b/arch/sdl/gr.c index 716ad5d93..745f3db83 100644 --- a/arch/sdl/gr.c +++ b/arch/sdl/gr.c @@ -1,4 +1,4 @@ -/* $Id: gr.c,v 1.9 2003-01-15 02:42:41 btb Exp $ */ +/* $Id: gr.c,v 1.10 2003-03-20 02:01:38 btb Exp $ */ /* * * SDL video functions. @@ -21,12 +21,6 @@ #include "error.h" #include "menu.h" -//added on 9/30/98 by Matt Mueller to set the title bar. Woohoo! -#include "vers_id.h" -//end addition -MM - -#include "gamefont.h" - //added 10/05/98 by Matt Mueller - make fullscreen mode optional #include "args.h" @@ -102,7 +96,7 @@ int gr_set_mode(u_int32_t mode) //Style "D1X*" NoTitle, NoHandles, BorderWidth 0 //if you can't use -fullscreen like me (crashes X), this is a big help in //getting the window centered correctly (if you use SmartPlacement) - SDL_WM_SetCaption(DESCENT_VERSION, "Descent II"); + SDL_WM_SetCaption(PACKAGE_STRING, "Descent II"); //end addition -MM //edited 10/05/98 by Matt Mueller - make fullscreen mode optional