[Tux4kids-commits] [SCM] tuxhistory - Educational history game branch, master, updated. f1ea9c9b8df401b0be2ca3931ad1676a2ddbcbd8
julio (none)
julio at julio-desktop.
Thu Jul 1 20:03:39 UTC 2010
The following commit has been merged in the master branch:
commit f1ea9c9b8df401b0be2ca3931ad1676a2ddbcbd8
Author: julio <julio at julio-desktop.(none)>
Date: Thu Jul 1 15:02:24 2010 -0500
minor change...
diff --git a/data/sounds/Makefile.in b/data/sounds/Makefile.in
deleted file mode 100644
index c5a5902..0000000
--- a/data/sounds/Makefile.in
+++ /dev/null
@@ -1,581 +0,0 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-
-VPATH = @srcdir@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = data/stdsounds
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/dependencies/m4/mkstemp.m4 \
- $(top_srcdir)/dependencies/m4/stdlib_h.m4 \
- $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
- $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
- $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/ggz.m4 \
- $(top_srcdir)/m4/glib-gettext.m4 $(top_srcdir)/m4/gtk-2.0.m4 \
- $(top_srcdir)/m4/gtk2-client.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/locale.m4 \
- $(top_srcdir)/m4/ngettext.m4 $(top_srcdir)/m4/no-client.m4 \
- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/readline.m4 \
- $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
- $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
- $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
- $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/version.in \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdatadir)"
-DATA = $(pkgdata_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/$(PACKAGE)/stdsounds
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTH_CFLAGS = @AUTH_CFLAGS@
-AUTH_LIBS = @AUTH_LIBS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AUTO_DEPS = @AUTO_DEPS@
-AWK = @AWK@
-CAIRO_CFLAGS = @CAIRO_CFLAGS@
-CAIRO_LIBS = @CAIRO_LIBS@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CLIENT_LIBS = @CLIENT_LIBS@
-COMMON_LIBS = @COMMON_LIBS@
-CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FT2_CFLAGS = @FT2_CFLAGS@
-FT2_CONFIG = @FT2_CONFIG@
-FT2_LIBS = @FT2_LIBS@
-FTWL_CFLAGS = @FTWL_CFLAGS@
-GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
-GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
-GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
-GGZMOD_LDFLAGS = @GGZMOD_LDFLAGS@
-GGZ_CONFIG = @GGZ_CONFIG@
-GGZ_GTK_INCLUDES = @GGZ_GTK_INCLUDES@
-GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
-GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
-GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
-GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
-GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
-GNULIB_PUTENV = @GNULIB_PUTENV@
-GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
-GNULIB_RPMATCH = @GNULIB_RPMATCH@
-GNULIB_SETENV = @GNULIB_SETENV@
-GNULIB_STRTOD = @GNULIB_STRTOD@
-GNULIB_UNSETENV = @GNULIB_UNSETENV@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GUI_beos_CFLAGS = @GUI_beos_CFLAGS@
-GUI_beos_CXXFLAGS = @GUI_beos_CXXFLAGS@
-GUI_beos_LDFLAGS = @GUI_beos_LDFLAGS@
-GUI_beos_LIBS = @GUI_beos_LIBS@
-GUI_ftwl_CFLAGS = @GUI_ftwl_CFLAGS@
-GUI_ftwl_CXXFLAGS = @GUI_ftwl_CXXFLAGS@
-GUI_ftwl_LDFLAGS = @GUI_ftwl_LDFLAGS@
-GUI_ftwl_LIBS = @GUI_ftwl_LIBS@
-GUI_gtk2_CFLAGS = @GUI_gtk2_CFLAGS@
-GUI_gtk2_CXXFLAGS = @GUI_gtk2_CXXFLAGS@
-GUI_gtk2_LDFLAGS = @GUI_gtk2_LDFLAGS@
-GUI_gtk2_LIBS = @GUI_gtk2_LIBS@
-GUI_sdl_CFLAGS = @GUI_sdl_CFLAGS@
-GUI_sdl_CXXFLAGS = @GUI_sdl_CXXFLAGS@
-GUI_sdl_LDFLAGS = @GUI_sdl_LDFLAGS@
-GUI_sdl_LIBS = @GUI_sdl_LIBS@
-GUI_stub_CFLAGS = @GUI_stub_CFLAGS@
-GUI_stub_CXXFLAGS = @GUI_stub_CXXFLAGS@
-GUI_stub_LDFLAGS = @GUI_stub_LDFLAGS@
-GUI_stub_LIBS = @GUI_stub_LIBS@
-GUI_win32_CFLAGS = @GUI_win32_CFLAGS@
-GUI_win32_CXXFLAGS = @GUI_win32_CXXFLAGS@
-GUI_win32_LDFLAGS = @GUI_win32_LDFLAGS@
-GUI_win32_LIBS = @GUI_win32_LIBS@
-GUI_xaw_CFLAGS = @GUI_xaw_CFLAGS@
-GUI_xaw_CXXFLAGS = @GUI_xaw_CXXFLAGS@
-GUI_xaw_LDFLAGS = @GUI_xaw_LDFLAGS@
-GUI_xaw_LIBS = @GUI_xaw_LIBS@
-GZIP = @GZIP@
-HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
-HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
-HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
-HAVE_MKDTEMP = @HAVE_MKDTEMP@
-HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
-HAVE_RPMATCH = @HAVE_RPMATCH@
-HAVE_SETENV = @HAVE_SETENV@
-HAVE_STRTOD = @HAVE_STRTOD@
-HAVE_UNSETENV = @HAVE_UNSETENV@
-HOST_PATH_SEPARATOR = @HOST_PATH_SEPARATOR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
-LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIB_GGZ = @LIB_GGZ@
-LIB_GGZDMOD = @LIB_GGZDMOD@
-LIB_GGZMOD = @LIB_GGZMOD@
-LIB_GGZ_GTK = @LIB_GGZ_GTK@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBOBJS = @LTLIBOBJS@
-LUA_AS_DEPENDENCY = @LUA_AS_DEPENDENCY@
-LUA_CFLAGS = @LUA_CFLAGS@
-LUA_LIBS = @LUA_LIBS@
-MAJOR_VERSION = @MAJOR_VERSION@
-MAKEINFO = @MAKEINFO@
-MINOR_VERSION = @MINOR_VERSION@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
-NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-RANLIB = @RANLIB@
-REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
-REPLACE_PUTENV = @REPLACE_PUTENV@
-REPLACE_STRTOD = @REPLACE_STRTOD@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SERVER_LIBS = @SERVER_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SOUND_CFLAGS = @SOUND_CFLAGS@
-SOUND_LIBS = @SOUND_LIBS@
-STRIP = @STRIP@
-TOLUA = @TOLUA@
-TOLUA_AS_DEPENDENCY = @TOLUA_AS_DEPENDENCY@
-TOLUA_CFLAGS = @TOLUA_CFLAGS@
-TOLUA_LIBS = @TOLUA_LIBS@
-UNAME = @UNAME@
-USE_NLS = @USE_NLS@
-UTILITY_LIBS = @UTILITY_LIBS@
-VERSION = @VERSION@
-VERSION_LABEL = @VERSION_LABEL@
-VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
-VOID_UNSETENV = @VOID_UNSETENV@
-WINDRES = @WINDRES@
-XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-ggz_config = @ggz_config@
-ggz_gtk_includes = @ggz_gtk_includes@
-ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzdatadir = @ggzdatadir@
-ggzdconfdir = @ggzdconfdir@
-ggzddatadir = @ggzddatadir@
-ggzdexecmoddir = @ggzdexecmoddir@
-ggzdexecmodpath = @ggzdexecmodpath@
-ggzdmod_includes = @ggzdmod_includes@
-ggzdmod_libraries = @ggzdmod_libraries@
-ggzexecmoddir = @ggzexecmoddir@
-ggzmod_includes = @ggzmod_includes@
-ggzmod_libraries = @ggzmod_libraries@
-ggzmoduleconfdir = @ggzmoduleconfdir@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-libggz_includes = @libggz_includes@
-libggz_libraries = @libggz_libraries@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-packagesrcdir = @packagesrcdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-pkgdata_DATA = \
- foot3.ogg \
- inh2o.ogg \
- LrgCan.ogg \
- LrgExpl.ogg \
- MedCan.ogg \
- metbrk.ogg \
- MgBar1.ogg \
- MgBar2.ogg \
- MgHeavy.ogg \
- Mortar.ogg \
- SmlExpl.ogg \
- Splash.ogg \
- THover.ogg \
- Tread.ogg \
- wall01.ogg \
- woodbrk.ogg
-
-EXTRA_DIST = $(pkgdata_DATA)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/stdsounds/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/stdsounds/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-install-pkgdataDATA: $(pkgdata_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
- @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
- done
-
-uninstall-pkgdataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
- for dir in "$(DESTDIR)$(pkgdatadir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-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-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-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
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pkgdataDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pkgdataDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-pkgdataDATA install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-pkgdataDATA
-
-
-# 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.
-.NOEXPORT:
diff --git a/src/map.c b/src/map.c
index fa443bb..98069d2 100644
--- a/src/map.c
+++ b/src/map.c
@@ -176,7 +176,7 @@ int get_terrain_enum(char *terrain_string)
//Return array has 9 elements
static int *get_context_tildes(int x, int y)
{
- //int i,j;
+ int i;
int *a;
a = (int *)malloc(9*sizeof(int));
@@ -208,14 +208,13 @@ static int *get_context_tildes(int x, int y)
*(a + 8) = -1;
*(a + 4) = map[x-1][y].terrain;
*(a + 6) = map[x-1][y+1].terrain;
- *(a + 7) = map[x+1][y].terrain;
+ *(a + 7) = map[x][y+1].terrain;
}
else
{
*(a + 4) = map[x-1][y].terrain;
*(a + 5) = map[x+1][y].terrain;
*(a + 6) = map[x-1][y+1].terrain;
- *(a + 7) = map[x+1][y].terrain;
*(a + 8) = map[x+1][y+1].terrain;
}
}
@@ -259,7 +258,7 @@ static int *get_context_tildes(int x, int y)
*(a + 2) = map[x][y-1].terrain;
*(a + 3) = map[x+1][y-1].terrain;
*(a + 5) = map[x+1][y].terrain;
- *(a + 7) = map[x+1][y].terrain;
+ *(a + 7) = map[x][y+1].terrain;
*(a + 8) = map[x+1][y+1].terrain;
}
else if(x >= x_tildes)
@@ -271,7 +270,7 @@ static int *get_context_tildes(int x, int y)
*(a + 2) = map[x][y-1].terrain;
*(a + 4) = map[x-1][y].terrain;
*(a + 6) = map[x-1][y+1].terrain;
- *(a + 7) = map[x+1][y].terrain;
+ *(a + 7) = map[x][y+1].terrain;
}
else
{
@@ -281,10 +280,16 @@ static int *get_context_tildes(int x, int y)
*(a + 4) = map[x-1][y].terrain;
*(a + 5) = map[x+1][y].terrain;
*(a + 6) = map[x-1][y+1].terrain;
- *(a + 7) = map[x+1][y].terrain;
+ *(a + 7) = map[x][y+1].terrain;
*(a + 8) = map[x+1][y+1].terrain;
}
}
+ for (i=0; i<9; i++)
+ {
+ printf("%d ", *(a + i));
+ }
+ printf("\n");
+
return a;
}
@@ -295,7 +300,7 @@ static int *get_draw_tilde(int *array, int oe)
int i,j;
// Allocate a as a dinamic array, please free it using FREE()
- a = (int *)malloc(3*sizeof(int));
+ a = (int *)malloc(9*sizeof(int));
if( a == NULL )
{
printf("get_context_tildes: Error trying to allocate memory!");
@@ -359,16 +364,29 @@ static int *get_draw_tilde(int *array, int oe)
}
- for(i = 1; i < 9; i++)
+ for(i = 0; i < 9; i++)
{
- if(*array != *(array+i))
+ printf("I: %d ", i);
+ if(*(array+i) != -1)
{
- if((j=get_tile_num(i,oe)) < 0)
+ if(*array != *(array+i))
+ {
+ j=get_tile_num(i,oe);
+ printf("J: %d ", i, j);
+ if(j < 0)
+ {
+ printf("Error parsing tiles\n");
+ return NULL;
+ }
+ printf("NUM: %d, %d, %d\n", *(array + i), (NUM_COMPTILDE - 1),
+ *(array + i) * (NUM_COMPTILDE) + j);
+ *(a + i) = *(array + i) * (NUM_COMPTILDE) + j;
+ }
+ else
{
- printf("Error parsing tiles\n");
- return NULL;
+ *(a + i) = -1;
}
- *(a + i) = *(array + i) * (NUM_COMPTILDE - 1) + j;
+
}
else
{
@@ -384,20 +402,21 @@ static int get_tile_num(int i, int k)
if (i >= NUM_COMPTILDE)
return -1;
oe = k%2;
- if (i == 1) return (k) ? BORDER_NW_ODD : BORDER_NW_EVEN;
- if (i == 2) return (k) ? BORDER_N_ODD : BORDER_N_EVEN;
- if (i == 3) return (k) ? BORDER_NE_ODD : BORDER_NE_EVEN;
- if (i == 4) return (k) ? BORDER_W_ODD : BORDER_W_EVEN;
- if (i == 5) return (k) ? BORDER_E_ODD : BORDER_E_EVEN;
- if (i == 6) return (k) ? BORDER_SW_ODD : BORDER_SW_EVEN;
- if (i == 7) return (k) ? BORDER_S_ODD : BORDER_S_EVEN;
- if (i == 8) return (k) ? BODER_SE_ODD : BORDER_SE_EVEN;
+ if (i == 1) return (k) ? BODER_SE_ODD : BORDER_SE_EVEN;
+ else if (i == 2) return (k) ? BORDER_S_ODD : BORDER_S_EVEN;
+ else if (i == 3) return (k) ? BORDER_SW_ODD : BORDER_SW_EVEN;
+ else if (i == 4) return (k) ? BORDER_E_ODD : BORDER_E_EVEN;
+ else if (i == 5) return (k) ? BORDER_W_ODD : BORDER_W_EVEN;
+ else if (i == 6) return (k) ? BORDER_NE_ODD : BORDER_NE_EVEN;
+ else if (i == 7) return (k) ? BORDER_N_ODD : BORDER_N_EVEN;
+ else if (i == 8) return (k) ? BORDER_NW_ODD : BORDER_NW_EVEN;
+ else return -1;
}
int generate_map(void)
{
SDL_Rect dest;
- int i, j, k;
+ int i, j, k, l;
int oe;
int x, y;
int *context_array;
@@ -448,11 +467,19 @@ int generate_map(void)
printf("ENUM: %d GRASSLAND: %d\n", *img_enums, GRASSLAND_CENTER_0);
//Draw in the map buffer the resulting values
- SDL_BlitSurface(terrain[*img_enums], NULL, map_image, &dest);
+ for(l = 0; l < 9; l++)
+ {
+ if (*(img_enums+l)!=-1)
+ {
+ SDL_BlitSurface(terrain[*(img_enums+l)], NULL, map_image, &dest);
+ }
+ }
+ printf(".");
//Prepare te new coords for the next tilde
dest.x = dest.x - (terrain[*img_enums]->w/2);
dest.y = dest.y - (terrain[*img_enums]->h/2);
+
FREE(context_array);
FREE(img_enums);
--
tuxhistory - Educational history game
More information about the Tux4kids-commits
mailing list