From 637334a6e21814ec16f775e48683b707cd0261dc Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Wed, 19 Mar 2003 23:20:09 +0000 Subject: [PATCH] moved joy_init back to main, other header cleanups --- ChangeLog | 5 +++++ arch/linux/Makefile.am | 2 +- arch/linux/include/ukali.h | 6 +----- arch/linux/init.c | 7 +------ arch/linux/linuxnet.c | 3 +-- arch/ogl/Makefile.am | 2 +- main/inferno.c | 4 +++- 7 files changed, 13 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 37acaf19..92b91306 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2003-03-19 Bradley Bell + * 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, + other header cleanups + * arch/win32/ipx_win.c, configure.ac: ipx on win32 fixed! 2003-03-19 Martin Schaffner diff --git a/arch/linux/Makefile.am b/arch/linux/Makefile.am index ea61115f..8748d63c 100644 --- a/arch/linux/Makefile.am +++ b/arch/linux/Makefile.am @@ -2,7 +2,7 @@ EXTRA_SUBDIRS = include noinst_LIBRARIES = libarch_linux.a -INCLUDES = -I$(top_srcdir)/arch/include -I$(top_srcdir)/include -I$(top_srcdir)/main -I$(srcdir)/include +INCLUDES = -I$(top_srcdir)/arch/include -I$(top_srcdir)/include -I$(srcdir)/include if USE_NETWORK NETWORK_SRCS = ipx_bsd.c ipx_kali.c ipx_lin.c ipx_udp.c linuxnet.c ukali.c diff --git a/arch/linux/include/ukali.h b/arch/linux/include/ukali.h index d5c176d8..398b2c04 100644 --- a/arch/linux/include/ukali.h +++ b/arch/linux/include/ukali.h @@ -1,4 +1,4 @@ -/* $Id: ukali.h,v 1.6 2003-03-13 00:20:21 btb Exp $ */ +/* $Id: ukali.h,v 1.7 2003-03-19 23:20:09 btb Exp $ */ /* * * Header for kali support functions @@ -8,10 +8,6 @@ #ifndef __UKALI_H__ #define __UKALI_H__ -//added on 10/04/98 by Matt Mueller to show correct ver in kali -#include "vers_id.h" -//end addition -MM - // 4213 is the port that KaliNix is listening on // // char code; // 1 == open, 2 == close, 3 == data, 5 == GetMyAddr diff --git a/arch/linux/init.c b/arch/linux/init.c index 1f0fd72a..fd5ac065 100644 --- a/arch/linux/init.c +++ b/arch/linux/init.c @@ -1,4 +1,4 @@ -/* $Id: init.c,v 1.5 2003-03-13 00:20:21 btb Exp $ */ +/* $Id: init.c,v 1.6 2003-03-19 23:20:09 btb Exp $ */ /* * * linux init.c - added Matt Mueller 9/6/98 @@ -13,7 +13,6 @@ #include #include "pstypes.h" #include "console.h" -#include "text.h" #include "event.h" #include "error.h" #include "joy.h" @@ -37,10 +36,6 @@ void arch_init() #ifdef SVGALIB_INPUT arch_svgalib_init(); #endif - if (!FindArg( "-nojoystick" )) { - con_printf(CON_VERBOSE, "\n%s", TXT_VERBOSE_6); - joy_init(); - } //added 06/09/99 Matt Mueller - fix nonetwork compile #ifdef NETWORK //end addition -MM diff --git a/arch/linux/linuxnet.c b/arch/linux/linuxnet.c index 08e52212..0e84f527 100644 --- a/arch/linux/linuxnet.c +++ b/arch/linux/linuxnet.c @@ -1,4 +1,4 @@ -/* $Id: linuxnet.c,v 1.7 2003-01-01 00:56:24 btb Exp $ */ +/* $Id: linuxnet.c,v 1.8 2003-03-19 23:20:09 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -31,7 +31,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include /* for htons & co. */ #include "pstypes.h" -#include "config.h" #include "args.h" #include "ipx_drv.h" diff --git a/arch/ogl/Makefile.am b/arch/ogl/Makefile.am index f5d8948c..6f3a1aef 100644 --- a/arch/ogl/Makefile.am +++ b/arch/ogl/Makefile.am @@ -1,6 +1,6 @@ noinst_LIBRARIES = libarch_ogl.a -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/main -I$(top_srcdir)/arch/include +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/arch/include libarch_ogl_a_SOURCES = gr.c ogl.c sdlgl.c diff --git a/main/inferno.c b/main/inferno.c index cebc4196..104c1625 100644 --- a/main/inferno.c +++ b/main/inferno.c @@ -1,4 +1,4 @@ -/* $Id: inferno.c,v 1.56 2003-03-13 07:16:46 btb Exp $ */ +/* $Id: inferno.c,v 1.57 2003-03-19 23:20:09 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -1293,6 +1293,8 @@ int main(int argc,char **argv) con_printf (CON_VERBOSE, "%s", TXT_VERBOSE_1); ReadConfigFile(); + do_joystick_init(); + #ifdef NETWORK do_network_init(); #endif -- 2.39.2