diff --git a/src/Makefile.in b/src/Makefile.in index cc71bd6..e9f2e5b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,7 +1,6 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +10,6 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -@SET_MAKE@ SHELL = @SHELL@ @@ -33,9 +31,13 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include + +DESTDIR = + pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = .. ACLOCAL = @ACLOCAL@ @@ -44,29 +46,24 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ + NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -AMTAR = @AMTAR@ -AWK = @AWK@ CC = @CC@ -DEPDIR = @DEPDIR@ -EXEEXT = @EXEEXT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +MAKEINFO = @MAKEINFO@ NO_PREFIX_PACKAGE_DATA_DIR = @NO_PREFIX_PACKAGE_DATA_DIR@ NO_PREFIX_PACKAGE_DOC_DIR = @NO_PREFIX_PACKAGE_DOC_DIR@ NO_PREFIX_PACKAGE_HELP_DIR = @NO_PREFIX_PACKAGE_HELP_DIR@ NO_PREFIX_PACKAGE_MENU_DIR = @NO_PREFIX_PACKAGE_MENU_DIR@ NO_PREFIX_PACKAGE_PIXMAPS_DIR = @NO_PREFIX_PACKAGE_PIXMAPS_DIR@ -OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_DATA_DIR = @PACKAGE_DATA_DIR@ PACKAGE_DOC_DIR = @PACKAGE_DOC_DIR@ @@ -77,303 +74,259 @@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ VERSION = @VERSION@ -am__include = @am__include@ -am__quote = @am__quote@ -install_sh = @install_sh@ INCLUDES = bin_PROGRAMS = bomberclone -bomberclone_SOURCES = \ - main.c\ - bomb.c\ - bomberclone.h\ - debug.c\ - packets.c\ - font.c\ - gfx.c\ - player.c\ - packets.h\ - game.c\ - netmenu.c\ - network.c\ - udp.c\ - menu.c\ - mapmenu.c\ - field.c\ - network.h\ - sysfunc.c\ - configuration.c\ - pkgcache.c\ - gamesrv.h\ - gamesrv.c \ - chat.c \ - multiwait.c \ - chat.h \ - keybinput.h \ - keybinput.c \ - single.c +bomberclone_SOURCES = main.c bomb.c bomberclone.h debug.c packets.c font.c gfx.c player.c packets.h game.c netmenu.c network.c udp.c menu.c mapmenu.c field.c network.h sysfunc.c configuration.c pkgcache.c gamesrv.h gamesrv.c chat.c multiwait.c chat.h keybinput.h keybinput.c single.c -subdir = src mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -bin_PROGRAMS = bomberclone$(EXEEXT) -PROGRAMS = $(bin_PROGRAMS) - -am_bomberclone_OBJECTS = main.$(OBJEXT) bomb.$(OBJEXT) debug.$(OBJEXT) \ - packets.$(OBJEXT) font.$(OBJEXT) gfx.$(OBJEXT) player.$(OBJEXT) \ - game.$(OBJEXT) netmenu.$(OBJEXT) network.$(OBJEXT) \ - udp.$(OBJEXT) menu.$(OBJEXT) mapmenu.$(OBJEXT) field.$(OBJEXT) \ - sysfunc.$(OBJEXT) configuration.$(OBJEXT) pkgcache.$(OBJEXT) \ - gamesrv.$(OBJEXT) chat.$(OBJEXT) multiwait.$(OBJEXT) \ - keybinput.$(OBJEXT) single.$(OBJEXT) -bomberclone_OBJECTS = $(am_bomberclone_OBJECTS) -bomberclone_LDADD = $(LDADD) -bomberclone_DEPENDENCIES = -bomberclone_LDFLAGS = +CONFIG_HEADER = ../config.h +CONFIG_CLEAN_FILES = +PROGRAMS = $(bin_PROGRAMS) -DEFS = @DEFS@ -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + +DEFS = @DEFS@ -I. -I$(srcdir) -I.. CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -depcomp = $(SHELL) $(top_srcdir)/depcomp -@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/bomb.Po $(DEPDIR)/chat.Po \ -@AMDEP_TRUE@ $(DEPDIR)/configuration.Po $(DEPDIR)/debug.Po \ -@AMDEP_TRUE@ $(DEPDIR)/field.Po $(DEPDIR)/font.Po \ -@AMDEP_TRUE@ $(DEPDIR)/game.Po $(DEPDIR)/gamesrv.Po \ -@AMDEP_TRUE@ $(DEPDIR)/gfx.Po $(DEPDIR)/keybinput.Po \ -@AMDEP_TRUE@ $(DEPDIR)/main.Po $(DEPDIR)/mapmenu.Po \ -@AMDEP_TRUE@ $(DEPDIR)/menu.Po $(DEPDIR)/multiwait.Po \ -@AMDEP_TRUE@ $(DEPDIR)/netmenu.Po $(DEPDIR)/network.Po \ -@AMDEP_TRUE@ $(DEPDIR)/packets.Po $(DEPDIR)/pkgcache.Po \ -@AMDEP_TRUE@ $(DEPDIR)/player.Po $(DEPDIR)/single.Po \ -@AMDEP_TRUE@ $(DEPDIR)/sysfunc.Po $(DEPDIR)/udp.Po -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +bomberclone_OBJECTS = main.o bomb.o debug.o packets.o font.o gfx.o \ +player.o game.o netmenu.o network.o udp.o menu.o mapmenu.o field.o \ +sysfunc.o configuration.o pkgcache.o gamesrv.o chat.o multiwait.o \ +keybinput.o single.o +bomberclone_LDADD = $(LDADD) +bomberclone_DEPENDENCIES = +bomberclone_LDFLAGS = CFLAGS = @CFLAGS@ -DIST_SOURCES = $(bomberclone_SOURCES) -DIST_COMMON = Makefile.am Makefile.in -SOURCES = $(bomberclone_SOURCES) +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +DIST_COMMON = Makefile.am Makefile.in + -all: all-am +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) +TAR = tar +GZIP_ENV = --best +DEP_FILES = .deps/bomb.P .deps/chat.P .deps/configuration.P \ +.deps/debug.P .deps/field.P .deps/font.P .deps/game.P .deps/gamesrv.P \ +.deps/gfx.P .deps/keybinput.P .deps/main.P .deps/mapmenu.P .deps/menu.P \ +.deps/multiwait.P .deps/netmenu.P .deps/network.P .deps/packets.P \ +.deps/pkgcache.P .deps/player.P .deps/single.P .deps/sysfunc.P \ +.deps/udp.P +SOURCES = $(bomberclone_SOURCES) +OBJECTS = $(bomberclone_OBJECTS) + +all: all-redirect .SUFFIXES: -.SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status +.SUFFIXES: .S .c .o .s +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + +mostlyclean-binPROGRAMS: + +clean-binPROGRAMS: + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + +distclean-binPROGRAMS: + +maintainer-clean-binPROGRAMS: + install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - ; then \ - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \ - $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \ + if test -f $$p; then \ + echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ - rm -f $(DESTDIR)$(bindir)/$$f; \ + list='$(bin_PROGRAMS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done -clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -bomberclone$(EXEEXT): $(bomberclone_OBJECTS) $(bomberclone_DEPENDENCIES) - @rm -f bomberclone$(EXEEXT) - $(LINK) $(bomberclone_LDFLAGS) $(bomberclone_OBJECTS) $(bomberclone_LDADD) $(LIBS) +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + -rm -f *.o core *.core + +clean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/bomb.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/configuration.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/debug.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/field.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/font.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/game.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gamesrv.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gfx.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/keybinput.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mapmenu.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/menu.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/multiwait.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/netmenu.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/network.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/packets.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pkgcache.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/player.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/single.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sysfunc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/udp.Po@am__quote@ +maintainer-clean-compile: -distclean-depend: - -rm -rf $(DEPDIR) - -.c.o: -@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< - -.c.obj: -@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `cygpath -w $<` -CCDEPMODE = @CCDEPMODE@ -uninstall-info-am: +bomberclone: $(bomberclone_OBJECTS) $(bomberclone_DEPENDENCIES) + @rm -f bomberclone + $(LINK) $(bomberclone_LDFLAGS) $(bomberclone_OBJECTS) $(bomberclone_LDADD) $(LIBS) tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ +ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - mkid -fID $$unique $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $$unique $(LISP) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) + +mostlyclean-tags: -GTAGS: - here=`CDPATH=: && cd $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here +clean-tags: distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH + -rm -f TAGS ID -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +maintainer-clean-tags: -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = src distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ - fi; \ + d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done -check-am: all-am -check: check-am -all-am: Makefile $(PROGRAMS) -installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -install: install-am +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: install-binPROGRAMS install-exec: install-exec-am + +install-data-am: install-data: install-data-am -uninstall: uninstall-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am +install: install-am +uninstall-am: uninstall-binPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: + $(mkinstalldirs) $(DESTDIR)$(bindir) + + mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am +mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ + mostlyclean-tags mostlyclean-depend mostlyclean-generic -clean-am: clean-binPROGRAMS clean-generic mostlyclean-am - -distclean: distclean-am - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-tags - -dvi: dvi-am - -dvi-am: - -info: info-am - -info-am: +mostlyclean: mostlyclean-am -install-data-am: +clean-am: clean-binPROGRAMS clean-compile clean-tags clean-depend \ + clean-generic mostlyclean-am -install-exec-am: install-binPROGRAMS +clean: clean-am -install-info: install-info-am +distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \ + distclean-depend distclean-generic clean-am -install-man: +distclean: distclean-am -installcheck-am: +maintainer-clean-am: maintainer-clean-binPROGRAMS \ + maintainer-clean-compile maintainer-clean-tags \ + maintainer-clean-depend maintainer-clean-generic \ + distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-am -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic - -uninstall-am: uninstall-binPROGRAMS uninstall-info-am +.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ +maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ +mostlyclean-compile distclean-compile clean-compile \ +maintainer-clean-compile tags mostlyclean-tags distclean-tags \ +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean -.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic distclean distclean-compile distclean-depend \ - distclean-generic distclean-tags distdir dvi dvi-am info \ - info-am install install-am install-binPROGRAMS install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic tags uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/src/basic.h b/src/basic.h index ff27563..3bbbb47 100644 --- a/src/basic.h +++ b/src/basic.h @@ -19,7 +19,6 @@ #define MAX_RANGE 10 #define MAX_SPEED 40 #define MAX_UPDATERECTS 2048 -#define MAX_CONNECTS 16 /* maximal number of connection data */ #define MAX_SERVERENTRYS 8 /* number of entrys in the server tab */ #define MAX_GAMESRVENTRYS 255 /* number of entry which can be get */ #define MAX_FIELDSIZE_X 51 diff --git a/src/configuration.c b/src/configuration.c index 7f83526..5291678 100644 --- a/src/configuration.c +++ b/src/configuration.c @@ -235,7 +235,7 @@ change_res () { int menuselect = 0; _menu menu[] = { - {0, "Full Screen"}, + {1, "Full Screen"}, {1, "640x480"}, {2, "800x600"}, {3, "1024x768"}, @@ -316,7 +316,7 @@ configuration () int menuselect = 0; _menu menu[] = { - {0, "Player Name:"}, + {1, "Player Name:"}, {1, "Video Options"}, {2, "Sound Options"}, {3, "Map Options"}, diff --git a/src/main.c b/src/main.c index da9be3a..d69bfcf 100644 --- a/src/main.c +++ b/src/main.c @@ -14,10 +14,10 @@ main (int argc, char **argv) { int menuselect = 0; _menu menu[] = { - {0, "Singleplayer"}, + {1, "Singleplayer"}, {1, "Multiplayer"}, - {2, "Configuration"}, - {3, "Quit Game"}, + {1, "Configuration"}, + {1, "Quit Game"}, {-1, ""} }; char text[255]; diff --git a/src/mapmenu.c b/src/mapmenu.c index efe1c02..ceac14c 100644 --- a/src/mapmenu.c +++ b/src/mapmenu.c @@ -66,14 +66,15 @@ void mapmenu () char text[255], *map, pathname[LEN_PATHFILENAME], size[4]; _menu menu[] = { - {0, "Random Map:"}, + {1, "Random Map:"}, {1, "Selected Map:"}, {2, " Size X:"}, {3, " Size Y:"}, {4, "Random Tileset:"}, {5, "Selected Tileset:"}, - {-2, ""}, - {6, "Return To Previous Manu"}, + {6, "Max Players:"}, + {0, ""}, + {8, "Return To Previous Menu"}, {-1, ""} }; @@ -89,24 +90,24 @@ void mapmenu () menu[1].index = 1; sprintf (menu[0].text, "Random Map: OFF"); menu[2].text[0] = 0; - menu[2].index = -2; + menu[2].index = 0; menu[3].text[0] = 0; - menu[3].index = -2; + menu[3].index = 0; break; case (1): menu[1].text[0] = 0; - menu[1].index = -2; + menu[1].index = 0; sprintf (menu[0].text, "Random Map: random file"); menu[2].text[0] = 0; - menu[2].index = -2; + menu[2].index = 0; menu[3].text[0] = 0; - menu[3].index = -2; + menu[3].index = 0; break; case (2): menu[1].text[0] = 0; - menu[1].index = -2; + menu[1].index = 0; sprintf (menu[0].text, "Random Map: auto-generated"); sprintf (menu[2].text, " Size X: %d", bman.fieldsize.x); menu[2].index = 2; @@ -118,7 +119,7 @@ void mapmenu () if(gfx.random_tileset) { menu[5].text[0] = 0; - menu[5].index = -2; + menu[5].index = 0; } else { @@ -134,6 +135,8 @@ void mapmenu () else sprintf (menu[4].text, "Random Tileset: OFF"); + sprintf(menu[6].text,"Max Players: %d/%d",bman.maxplayer,MAX_PLAYERS); + menuselect = menu_loop ("Map Options", menu, menuselect); switch (menuselect) { @@ -193,8 +196,17 @@ void mapmenu () else strcpy (gfx.tileset, map); break; + case (6): + sprintf (text, "%d", bman.maxplayer); + menu_get_text ("Max Players", text, 2); + bman.maxplayer = atoi (text); + if (bman.maxplayer > MAX_PLAYERS) + bman.maxplayer = MAX_PLAYERS; + if (bman.maxplayer < 2) + bman.maxplayer = 2; + break; - case (6): // Return to previous menu + case (8): // Return to previous menu menuselect = -1; break; } diff --git a/src/menu.c b/src/menu.c index 64d5112..fc1b04a 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1,4 +1,4 @@ -/* $Id: menu.c,v 1.18 2003/05/08 14:35:49 stpohle Exp $ */ +/* $Id: menu.c,v 1.19 2003/05/08 20:36:13 patty21 Exp $ */ /* menu's for the game */ #include @@ -146,18 +146,27 @@ menu_loop (char *menutitle, _menu menu[], int lastselect) if (keys[SDLK_DOWN] && (!keypressed)) { menuselect++; - if (menu[menuselect].index == -1) menuselect = 0; + while (menu[menuselect].index == 0) + menuselect++; + if (menu[menuselect].index == -1) { + menuselect = 0; + while (menu[menuselect].index == 0) + menuselect++; + } keypressed = 1; ds = 1; } if (keys[SDLK_UP] && (!keypressed)) { menuselect--; + while (menu[menuselect].index == 0 && menuselect >= 0) + menuselect--; if (menuselect == -1) menuselect = lastentry-1; keypressed = 1; ds = 1; } + if (keys[SDLK_RETURN] && (!keypressed)) { done=1; keypressed = 1; diff --git a/src/netmenu.c b/src/netmenu.c index c72cb07..00f50f5 100644 --- a/src/netmenu.c +++ b/src/netmenu.c @@ -36,7 +36,7 @@ netmenu () { int menuselect = 0; _menu menu[] = { - {0, "Join A Netgame"}, + {1, "Join A Netgame"}, {1, "Create A New Netgame"}, {2, "Options"}, {3, "Return To Main Menu"}, @@ -74,7 +74,7 @@ networkmenu_options () int menuselect = 0; char text[255]; _menu menu[] = { - {0, "Game Name:"}, + {1, "Game Name:"}, {1, "Max Players:"}, {2, "Network"}, {3, "Notify Masterserver"}, @@ -82,8 +82,9 @@ networkmenu_options () {5, "Return To Multiplayer Menu"}, {-1, ""} }; - - +#ifdef _WIN32 + menu[2].index=0; +#endif while (menuselect != -1 && bman.state != GS_quit) { sprintf (menu[0].text, "Gamename: %s", bman.gamename);