[Tux4kids-commits] r640 - in tuxmath/trunk: . data/images/factroids data/images/sprites nsis src
fongog-guest at alioth.debian.org
fongog-guest at alioth.debian.org
Sat Aug 16 22:20:44 UTC 2008
Author: fongog-guest
Date: 2008-08-16 22:20:43 +0000 (Sat, 16 Aug 2008)
New Revision: 640
Modified:
tuxmath/trunk/configure
tuxmath/trunk/data/images/factroids/Makefile
tuxmath/trunk/data/images/factroids/Makefile.in
tuxmath/trunk/data/images/sprites/Makefile
tuxmath/trunk/data/images/sprites/Makefile.in
tuxmath/trunk/nsis/tuxmath.nsi
tuxmath/trunk/nsis/tuxmath_with_conf.nsi
tuxmath/trunk/src/factroids.c
Log:
Fixed: When the player enter to factorois or faractoroids via keyboard, the intro screen dont desapere.
Added: Number wraping in fraction activiy.
Fixed: Number wrap at the bottom of screen.
Added: New collition sistem, that can adapt hiself to any asteroid workart.
Fixed: Some animation bugs in init()
Fixed: Real asteroid center calculation.
Fixed: Rolling asteroids...
Modified: tuxmath/trunk/configure
===================================================================
--- tuxmath/trunk/configure 2008-08-16 10:18:51 UTC (rev 639)
+++ tuxmath/trunk/configure 2008-08-16 22:20:43 UTC (rev 640)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Tux Of Math Command 1.6.4.
+# Generated by GNU Autoconf 2.61 for Tux Of Math Command 1.7.0.
#
# Report bugs to <tuxmath-devel at lists.sourceforge.net>.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='Tux Of Math Command'
PACKAGE_TARNAME='tuxmath'
-PACKAGE_VERSION='1.6.4'
-PACKAGE_STRING='Tux Of Math Command 1.6.4'
+PACKAGE_VERSION='1.7.0'
+PACKAGE_STRING='Tux Of Math Command 1.7.0'
PACKAGE_BUGREPORT='tuxmath-devel at lists.sourceforge.net'
ac_unique_file="src/tuxmath.c"
@@ -669,7 +669,6 @@
INSTALL_PROGRAM
INSTALL_SCRIPT
INSTALL_DATA
-am__isrc
CYGPATH_W
PACKAGE
VERSION
@@ -1281,7 +1280,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Tux Of Math Command 1.6.4 to adapt to many kinds of systems.
+\`configure' configures Tux Of Math Command 1.7.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1352,7 +1351,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Tux Of Math Command 1.6.4:";;
+ short | recursive ) echo "Configuration of Tux Of Math Command 1.7.0:";;
esac
cat <<\_ACEOF
@@ -1465,7 +1464,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Tux Of Math Command configure 1.6.4
+Tux Of Math Command configure 1.7.0
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1479,7 +1478,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Tux Of Math Command $as_me 1.6.4, which was
+It was created by Tux Of Math Command $as_me 1.7.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2040,8 +2039,7 @@
NONENONEs,x,x, &&
program_prefix=${target_alias}-
-am__api_version='1.10'
-
+am__api_version="1.9"
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
@@ -2193,54 +2191,39 @@
echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
-if test -z "$MKDIR_P"; then
- if test "${ac_cv_path_mkdir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+ # We used to keeping the `.' as first argument, in order to
+ # allow $(mkdir_p) to be used without argument. As in
+ # $(mkdir_p) $(somedir)
+ # where $(somedir) is conditionally defined. However this is wrong
+ # for two reasons:
+ # 1. if the package is installed by a user who cannot write `.'
+ # make install will fail,
+ # 2. the above comment should most certainly read
+ # $(mkdir_p) $(DESTDIR)$(somedir)
+ # so it does not work when $(somedir) is undefined and
+ # $(DESTDIR) is not.
+ # To support the latter case, we have to write
+ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+ # so the `.' trick is pointless.
+ mkdir_p='mkdir -p --'
else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in mkdir gmkdir; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
- case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
- 'mkdir (GNU coreutils) '* | \
- 'mkdir (coreutils) '* | \
- 'mkdir (fileutils) '4.1*)
- ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
- break 3;;
- esac
- done
- done
-done
-IFS=$as_save_IFS
-
-fi
-
- if test "${ac_cv_path_mkdir+set}" = set; then
- MKDIR_P="$ac_cv_path_mkdir -p"
+ # On NextStep and OpenStep, the `mkdir' command does not
+ # recognize any option. It will interpret all options as
+ # directories to create, and then abort because `.' already
+ # exists.
+ for d in ./-p ./--version;
+ do
+ test -d $d && rmdir $d
+ done
+ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+ if test -f "$ac_aux_dir/mkinstalldirs"; then
+ mkdir_p='$(mkinstalldirs)'
else
- # As a last resort, use the slow shell script. Don't cache a
- # value for MKDIR_P within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- test -d ./--version && rmdir ./--version
- MKDIR_P="$ac_install_sh -d"
+ mkdir_p='$(install_sh) -d'
fi
fi
-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-echo "${ECHO_T}$MKDIR_P" >&6; }
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
- [\\/$]* | ?:[\\/]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2322,16 +2305,12 @@
fi
rmdir .tst 2>/dev/null
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
- # is not polluted with repeated "-I."
- am__isrc=' -I$(srcdir)'
- # test to see if srcdir already configured
- if test -f $srcdir/config.status; then
- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+ test -f $srcdir/config.status; then
+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
{ (exit 1); exit 1; }; }
- fi
fi
# test whether we have cygpath
@@ -2346,7 +2325,7 @@
# Define the identity of the package.
PACKAGE='tuxmath'
- VERSION='1.6.4'
+ VERSION='1.7.0'
cat >>confdefs.h <<_ACEOF
@@ -2374,7 +2353,7 @@
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
# Installed binaries are usually stripped using `strip' when the user
# run `make install-strip'. However `strip' might not be the right
@@ -2478,7 +2457,7 @@
fi
fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
@@ -2861,7 +2840,9 @@
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
fi
- if test "x$enable_dependency_tracking" != xno; then
+
+
+if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
AMDEP_FALSE='#'
else
@@ -2870,6 +2851,7 @@
fi
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3856,7 +3838,6 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -3886,7 +3867,9 @@
echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
- if
+
+
+if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
@@ -12823,7 +12806,6 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -12853,7 +12835,9 @@
echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
- if
+
+
+if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
@@ -13762,7 +13746,9 @@
{ echo "$as_me:$LINENO: result: $native_win32" >&5
echo "${ECHO_T}$native_win32" >&6; }
- if test $native_win32 = yes; then
+
+
+if test $native_win32 = yes; then
BUILD_MINGW32_TRUE=
BUILD_MINGW32_FALSE='#'
else
@@ -17129,7 +17115,9 @@
fi
- if test $dll_path = no; then
+
+
+if test $dll_path = no; then
NSI_BUILD_TRUE=
NSI_BUILD_FALSE='#'
else
@@ -17636,7 +17624,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Tux Of Math Command $as_me 1.6.4, which was
+This file was extended by Tux Of Math Command $as_me 1.7.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17689,7 +17677,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-Tux Of Math Command config.status 1.6.4
+Tux Of Math Command config.status 1.7.0
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -17959,7 +17947,6 @@
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!$INSTALL_DATA$ac_delim
-am__isrc!$am__isrc$ac_delim
CYGPATH_W!$CYGPATH_W$ac_delim
PACKAGE!$PACKAGE$ac_delim
VERSION!$VERSION$ac_delim
@@ -18004,6 +17991,7 @@
am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
CPP!$CPP$ac_delim
+GREP!$GREP$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -18045,7 +18033,6 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-GREP!$GREP$ac_delim
EGREP!$EGREP$ac_delim
GLIBC2!$GLIBC2$ac_delim
RANLIB!$RANLIB$ac_delim
@@ -18100,7 +18087,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 53; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 52; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -18501,22 +18488,21 @@
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
-_am_arg=$ac_file
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $_am_arg | $_am_arg:* )
+ $ac_file | $ac_file:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$_am_arg" : 'X\(//\)[^/]' \| \
- X"$_am_arg" : 'X\(//\)$' \| \
- X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$_am_arg" |
+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X$ac_file : 'X\(//\)[^/]' \| \
+ X$ac_file : 'X\(//\)$' \| \
+ X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
+echo X$ac_file |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -18664,9 +18650,8 @@
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ # So let's grep whole file.
+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
Modified: tuxmath/trunk/data/images/factroids/Makefile
===================================================================
--- tuxmath/trunk/data/images/factroids/Makefile 2008-08-16 10:18:51 UTC (rev 639)
+++ tuxmath/trunk/data/images/factroids/Makefile 2008-08-16 22:20:43 UTC (rev 640)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# data/images/factroids/Makefile. Generated from Makefile.in by configure.
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005 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.
@@ -14,11 +14,15 @@
+srcdir = .
+top_srcdir = ../../..
pkgdatadir = $(datadir)/tuxmath
pkglibdir = $(libdir)/tuxmath
pkgincludedir = $(includedir)/tuxmath
+top_builddir = ../../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = /usr/bin/install -c
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -71,14 +75,18 @@
dist_cometsDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_comets_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/cheezmeister/code/c/tuxmath/trunk/missing --run aclocal-1.10
+ACLOCAL = ${SHELL} /home/usuario/code/tuxmath/trunk/missing --run aclocal-1.9
ALLOCA =
-AMTAR = ${SHELL} /home/cheezmeister/code/c/tuxmath/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/cheezmeister/code/c/tuxmath/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/cheezmeister/code/c/tuxmath/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/cheezmeister/code/c/tuxmath/trunk/missing --run automake-1.10
+AMDEP_FALSE = #
+AMDEP_TRUE =
+AMTAR = ${SHELL} /home/usuario/code/tuxmath/trunk/missing --run tar
+AUTOCONF = ${SHELL} /home/usuario/code/tuxmath/trunk/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/usuario/code/tuxmath/trunk/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/usuario/code/tuxmath/trunk/missing --run automake-1.9
AWK = mawk
BUILD_INCLUDED_LIBINTL = no
+BUILD_MINGW32_FALSE =
+BUILD_MINGW32_TRUE = #
CATOBJEXT = .gmo
CC = gcc
CCDEPMODE = depmode=gcc3
@@ -106,11 +114,10 @@
HAVE_SNPRINTF = 1
HAVE_VISIBILITY = 1
HAVE_WPRINTF = 0
-INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
INSTOBJEXT = .mo
INTLBISON = :
INTLLIBS =
@@ -131,23 +138,24 @@
LTLIBOBJS =
LTLIBPTH =
LTLIBTHREAD =
-MAKEINFO = ${SHELL} /home/cheezmeister/code/c/tuxmath/trunk/missing --run makeinfo
-MKDIR_P = /bin/mkdir -p
+MAKEINFO = ${SHELL} /home/usuario/code/tuxmath/trunk/missing --run makeinfo
MSGFMT = /usr/bin/msgfmt
MSGFMT_015 = /usr/bin/msgfmt
MSGMERGE = /usr/bin/msgmerge
-NAME_VERSION = tuxmath-1.6.3
+NAME_VERSION = tuxmath-1.7.0
NSIS =
-NSI_DLL_DIR = /home/cheezmeister/tuxmath_dll
+NSI_BUILD_FALSE = #
+NSI_BUILD_TRUE =
+NSI_DLL_DIR = /home/usuario/tuxmath_dll
NSI_INSTALL_DIR = mingw32
OBJEXT = o
PACKAGE = tuxmath
PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
PACKAGE_DATA_DIR = data
PACKAGE_NAME = Tux Of Math Command
-PACKAGE_STRING = Tux Of Math Command 1.6.3
+PACKAGE_STRING = Tux Of Math Command 1.7.0
PACKAGE_TARNAME = tuxmath
-PACKAGE_VERSION = 1.6.3
+PACKAGE_VERSION = 1.7.0
PATH_SEPARATOR = :
POSUB = po
POW_LIB =
@@ -161,18 +169,16 @@
STRIP =
USE_INCLUDED_LIBINTL = no
USE_NLS = yes
-VERSION = 1.6.3
+VERSION = 1.7.0
WINDRES =
WOE32DLL = no
XGETTEXT = /usr/bin/xgettext
XGETTEXT_015 = /usr/bin/xgettext
YACC = yacc
YFLAGS =
-abs_builddir = /home/cheezmeister/code/c/tuxmath/trunk/data/images/factroids
-abs_srcdir = /home/cheezmeister/code/c/tuxmath/trunk/data/images/factroids
-abs_top_builddir = /home/cheezmeister/code/c/tuxmath/trunk
-abs_top_srcdir = /home/cheezmeister/code/c/tuxmath/trunk
ac_ct_CC = gcc
+am__fastdepCC_FALSE = #
+am__fastdepCC_TRUE =
am__include = include
am__leading_dot = .
am__quote =
@@ -184,7 +190,6 @@
build_cpu = i686
build_os = linux-gnu
build_vendor = pc
-builddir = .
datadir = ${datarootdir}
datarootdir = ${prefix}/share
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
@@ -198,13 +203,13 @@
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/cheezmeister/code/c/tuxmath/trunk/install-sh
+install_sh = /home/usuario/code/tuxmath/trunk/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
localstatedir = ${prefix}/var
mandir = ${datarootdir}/man
-mkdir_p = /bin/mkdir -p
+mkdir_p = mkdir -p --
oldincludedir = /usr/include
pdfdir = ${docdir}
prefix = /usr/local
@@ -212,15 +217,12 @@
psdir = ${docdir}
sbindir = ${exec_prefix}/sbin
sharedstatedir = ${prefix}/com
-srcdir = .
sysconfdir = ${prefix}/etc
target = i686-pc-linux-gnu
target_alias =
target_cpu = i686
target_os = linux-gnu
target_vendor = pc
-top_builddir = ../../..
-top_srcdir = ../../..
cometsdir = $(pkgdatadir)/images/factroids
dist_comets_DATA = asteroid1.png \
galaxy2.png \
@@ -273,9 +275,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
install-dist_cometsDATA: $(dist_comets_DATA)
@$(NORMAL_INSTALL)
- test -z "$(cometsdir)" || $(MKDIR_P) "$(DESTDIR)$(cometsdir)"
+ test -z "$(cometsdir)" || $(mkdir_p) "$(DESTDIR)$(cometsdir)"
@list='$(dist_comets_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -298,21 +301,22 @@
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 \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -328,7 +332,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(cometsdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -374,20 +378,12 @@
install-data-am: install-dist_cometsDATA
-install-dvi: install-dvi-am
-
install-exec-am:
-install-html: install-html-am
-
install-info: install-info-am
install-man:
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -406,21 +402,17 @@
ps-am:
-uninstall-am: uninstall-dist_cometsDATA
+uninstall-am: uninstall-dist_cometsDATA uninstall-info-am
-.MAKE: install-am install-strip
-
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_cometsDATA 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-ps install-ps-am install-strip \
+ install-dist_cometsDATA 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-generic pdf \
pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_cometsDATA
+ uninstall-dist_cometsDATA 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.
Modified: tuxmath/trunk/data/images/factroids/Makefile.in
===================================================================
--- tuxmath/trunk/data/images/factroids/Makefile.in 2008-08-16 10:18:51 UTC (rev 639)
+++ tuxmath/trunk/data/images/factroids/Makefile.in 2008-08-16 22:20:43 UTC (rev 640)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005 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.
@@ -14,11 +14,15 @@
@SET_MAKE@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -73,12 +77,16 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -106,7 +114,6 @@
HAVE_SNPRINTF = @HAVE_SNPRINTF@
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
-INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -132,12 +139,13 @@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
NAME_VERSION = @NAME_VERSION@
NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
NSI_DLL_DIR = @NSI_DLL_DIR@
NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
@@ -168,11 +176,9 @@
XGETTEXT_015 = @XGETTEXT_015@
YACC = @YACC@
YFLAGS = @YFLAGS@
-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@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -184,7 +190,6 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
-builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -212,15 +217,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
cometsdir = $(pkgdatadir)/images/factroids
dist_comets_DATA = asteroid1.png \
galaxy2.png \
@@ -273,9 +275,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
install-dist_cometsDATA: $(dist_comets_DATA)
@$(NORMAL_INSTALL)
- test -z "$(cometsdir)" || $(MKDIR_P) "$(DESTDIR)$(cometsdir)"
+ test -z "$(cometsdir)" || $(mkdir_p) "$(DESTDIR)$(cometsdir)"
@list='$(dist_comets_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -298,21 +301,22 @@
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 \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -328,7 +332,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(cometsdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -374,20 +378,12 @@
install-data-am: install-dist_cometsDATA
-install-dvi: install-dvi-am
-
install-exec-am:
-install-html: install-html-am
-
install-info: install-info-am
install-man:
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -406,21 +402,17 @@
ps-am:
-uninstall-am: uninstall-dist_cometsDATA
+uninstall-am: uninstall-dist_cometsDATA uninstall-info-am
-.MAKE: install-am install-strip
-
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_cometsDATA 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-ps install-ps-am install-strip \
+ install-dist_cometsDATA 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-generic pdf \
pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_cometsDATA
+ uninstall-dist_cometsDATA 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.
Modified: tuxmath/trunk/data/images/sprites/Makefile
===================================================================
--- tuxmath/trunk/data/images/sprites/Makefile 2008-08-16 10:18:51 UTC (rev 639)
+++ tuxmath/trunk/data/images/sprites/Makefile 2008-08-16 22:20:43 UTC (rev 640)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# data/images/sprites/Makefile. Generated from Makefile.in by configure.
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005 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.
@@ -14,11 +14,15 @@
+srcdir = .
+top_srcdir = ../../..
pkgdatadir = $(datadir)/tuxmath
pkglibdir = $(libdir)/tuxmath
pkgincludedir = $(includedir)/tuxmath
+top_builddir = ../../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = /usr/bin/install -c
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -71,14 +75,18 @@
dist_spritesDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_sprites_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/cheezmeister/code/c/tuxmath/trunk/missing --run aclocal-1.10
+ACLOCAL = ${SHELL} /home/usuario/code/tuxmath/trunk/missing --run aclocal-1.9
ALLOCA =
-AMTAR = ${SHELL} /home/cheezmeister/code/c/tuxmath/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/cheezmeister/code/c/tuxmath/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/cheezmeister/code/c/tuxmath/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/cheezmeister/code/c/tuxmath/trunk/missing --run automake-1.10
+AMDEP_FALSE = #
+AMDEP_TRUE =
+AMTAR = ${SHELL} /home/usuario/code/tuxmath/trunk/missing --run tar
+AUTOCONF = ${SHELL} /home/usuario/code/tuxmath/trunk/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/usuario/code/tuxmath/trunk/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/usuario/code/tuxmath/trunk/missing --run automake-1.9
AWK = mawk
BUILD_INCLUDED_LIBINTL = no
+BUILD_MINGW32_FALSE =
+BUILD_MINGW32_TRUE = #
CATOBJEXT = .gmo
CC = gcc
CCDEPMODE = depmode=gcc3
@@ -106,11 +114,10 @@
HAVE_SNPRINTF = 1
HAVE_VISIBILITY = 1
HAVE_WPRINTF = 0
-INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
INSTOBJEXT = .mo
INTLBISON = :
INTLLIBS =
@@ -131,23 +138,24 @@
LTLIBOBJS =
LTLIBPTH =
LTLIBTHREAD =
-MAKEINFO = ${SHELL} /home/cheezmeister/code/c/tuxmath/trunk/missing --run makeinfo
-MKDIR_P = /bin/mkdir -p
+MAKEINFO = ${SHELL} /home/usuario/code/tuxmath/trunk/missing --run makeinfo
MSGFMT = /usr/bin/msgfmt
MSGFMT_015 = /usr/bin/msgfmt
MSGMERGE = /usr/bin/msgmerge
-NAME_VERSION = tuxmath-1.6.3
+NAME_VERSION = tuxmath-1.7.0
NSIS =
-NSI_DLL_DIR = /home/cheezmeister/tuxmath_dll
+NSI_BUILD_FALSE = #
+NSI_BUILD_TRUE =
+NSI_DLL_DIR = /home/usuario/tuxmath_dll
NSI_INSTALL_DIR = mingw32
OBJEXT = o
PACKAGE = tuxmath
PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
PACKAGE_DATA_DIR = data
PACKAGE_NAME = Tux Of Math Command
-PACKAGE_STRING = Tux Of Math Command 1.6.3
+PACKAGE_STRING = Tux Of Math Command 1.7.0
PACKAGE_TARNAME = tuxmath
-PACKAGE_VERSION = 1.6.3
+PACKAGE_VERSION = 1.7.0
PATH_SEPARATOR = :
POSUB = po
POW_LIB =
@@ -161,18 +169,16 @@
STRIP =
USE_INCLUDED_LIBINTL = no
USE_NLS = yes
-VERSION = 1.6.3
+VERSION = 1.7.0
WINDRES =
WOE32DLL = no
XGETTEXT = /usr/bin/xgettext
XGETTEXT_015 = /usr/bin/xgettext
YACC = yacc
YFLAGS =
-abs_builddir = /home/cheezmeister/code/c/tuxmath/trunk/data/images/sprites
-abs_srcdir = /home/cheezmeister/code/c/tuxmath/trunk/data/images/sprites
-abs_top_builddir = /home/cheezmeister/code/c/tuxmath/trunk
-abs_top_srcdir = /home/cheezmeister/code/c/tuxmath/trunk
ac_ct_CC = gcc
+am__fastdepCC_FALSE = #
+am__fastdepCC_TRUE =
am__include = include
am__leading_dot = .
am__quote =
@@ -184,7 +190,6 @@
build_cpu = i686
build_os = linux-gnu
build_vendor = pc
-builddir = .
datadir = ${datarootdir}
datarootdir = ${prefix}/share
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
@@ -198,13 +203,13 @@
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/cheezmeister/code/c/tuxmath/trunk/install-sh
+install_sh = /home/usuario/code/tuxmath/trunk/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
localstatedir = ${prefix}/var
mandir = ${datarootdir}/man
-mkdir_p = /bin/mkdir -p
+mkdir_p = mkdir -p --
oldincludedir = /usr/include
pdfdir = ${docdir}
prefix = /usr/local
@@ -212,15 +217,12 @@
psdir = ${docdir}
sbindir = ${exec_prefix}/sbin
sharedstatedir = ${prefix}/com
-srcdir = .
sysconfdir = ${prefix}/etc
target = i686-pc-linux-gnu
target_alias =
target_cpu = i686
target_os = linux-gnu
target_vendor = pc
-top_builddir = ../../..
-top_srcdir = ../../..
spritesdir = $(pkgdatadir)/images/sprites
dist_sprites_DATA = comet0.png \
comet1.png \
@@ -338,9 +340,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
install-dist_spritesDATA: $(dist_sprites_DATA)
@$(NORMAL_INSTALL)
- test -z "$(spritesdir)" || $(MKDIR_P) "$(DESTDIR)$(spritesdir)"
+ test -z "$(spritesdir)" || $(mkdir_p) "$(DESTDIR)$(spritesdir)"
@list='$(dist_sprites_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -363,21 +366,22 @@
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 \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -393,7 +397,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(spritesdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -439,20 +443,12 @@
install-data-am: install-dist_spritesDATA
-install-dvi: install-dvi-am
-
install-exec-am:
-install-html: install-html-am
-
install-info: install-info-am
install-man:
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -471,21 +467,17 @@
ps-am:
-uninstall-am: uninstall-dist_spritesDATA
+uninstall-am: uninstall-dist_spritesDATA uninstall-info-am
-.MAKE: install-am install-strip
-
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_spritesDATA 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-ps install-ps-am install-strip \
+ install-dist_spritesDATA 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-generic pdf \
pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_spritesDATA
+ uninstall-dist_spritesDATA 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.
Modified: tuxmath/trunk/data/images/sprites/Makefile.in
===================================================================
--- tuxmath/trunk/data/images/sprites/Makefile.in 2008-08-16 10:18:51 UTC (rev 639)
+++ tuxmath/trunk/data/images/sprites/Makefile.in 2008-08-16 22:20:43 UTC (rev 640)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005 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.
@@ -14,11 +14,15 @@
@SET_MAKE@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -73,12 +77,16 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -106,7 +114,6 @@
HAVE_SNPRINTF = @HAVE_SNPRINTF@
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
-INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -132,12 +139,13 @@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
NAME_VERSION = @NAME_VERSION@
NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
NSI_DLL_DIR = @NSI_DLL_DIR@
NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
@@ -168,11 +176,9 @@
XGETTEXT_015 = @XGETTEXT_015@
YACC = @YACC@
YFLAGS = @YFLAGS@
-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@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -184,7 +190,6 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
-builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -212,15 +217,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
spritesdir = $(pkgdatadir)/images/sprites
dist_sprites_DATA = comet0.png \
comet1.png \
@@ -338,9 +340,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
install-dist_spritesDATA: $(dist_sprites_DATA)
@$(NORMAL_INSTALL)
- test -z "$(spritesdir)" || $(MKDIR_P) "$(DESTDIR)$(spritesdir)"
+ test -z "$(spritesdir)" || $(mkdir_p) "$(DESTDIR)$(spritesdir)"
@list='$(dist_sprites_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -363,21 +366,22 @@
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 \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -393,7 +397,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(spritesdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -439,20 +443,12 @@
install-data-am: install-dist_spritesDATA
-install-dvi: install-dvi-am
-
install-exec-am:
-install-html: install-html-am
-
install-info: install-info-am
install-man:
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -471,21 +467,17 @@
ps-am:
-uninstall-am: uninstall-dist_spritesDATA
+uninstall-am: uninstall-dist_spritesDATA uninstall-info-am
-.MAKE: install-am install-strip
-
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_spritesDATA 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-ps install-ps-am install-strip \
+ install-dist_spritesDATA 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-generic pdf \
pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_spritesDATA
+ uninstall-dist_spritesDATA 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.
Modified: tuxmath/trunk/nsis/tuxmath.nsi
===================================================================
--- tuxmath/trunk/nsis/tuxmath.nsi 2008-08-16 10:18:51 UTC (rev 639)
+++ tuxmath/trunk/nsis/tuxmath.nsi 2008-08-16 22:20:43 UTC (rev 640)
@@ -3,7 +3,7 @@
# modified for tuxmath by Yves Combe (yves at ycombe.net)
# modified more for tuxmath by David Bruce <dbruce at tampabay.rr.com>
-!define PKG_VERSION "1.6.3"
+!define PKG_VERSION "1.7.0"
!define PKG_PREFIX "tuxmath"
!define APP_PREFIX "TuxMath"
Modified: tuxmath/trunk/nsis/tuxmath_with_conf.nsi
===================================================================
--- tuxmath/trunk/nsis/tuxmath_with_conf.nsi 2008-08-16 10:18:51 UTC (rev 639)
+++ tuxmath/trunk/nsis/tuxmath_with_conf.nsi 2008-08-16 22:20:43 UTC (rev 640)
@@ -2,7 +2,7 @@
# with a few tiny modifications by Phil Harper(philh at theopencd.org)
# modified for tuxmath by Yves Combe (yves at ycombe.net)
-!define PKG_VERSION "1.6.3"
+!define PKG_VERSION "1.7.0"
!define PKG_PREFIX "tuxmath"
!define APP_PREFIX "TuxMath"
Modified: tuxmath/trunk/src/factroids.c
===================================================================
--- tuxmath/trunk/src/factroids.c 2008-08-16 10:18:51 UTC (rev 639)
+++ tuxmath/trunk/src/factroids.c 2008-08-16 22:20:43 UTC (rev 640)
@@ -89,6 +89,7 @@
int xspeed, yspeed;
int x, y;
int rx, ry;
+ int x1,y1,x2,y2,x3,y3;
int radius;
int centerx, centery;
int angle;
@@ -204,6 +205,9 @@
static void FF_ShowMessage(char* str1, char* str2, char* str3, char* str4);
+static SDL_Surface* get_asteroid_image(int size,int angle);
+static int AsteroidColl(int astW,int astH,int astX,int astY,
+ int x, int y);
static int is_prime(int num);
static int fast_cos(int angle);
static int fast_sin(int angle);
@@ -438,10 +442,21 @@
tuxship.xspeed=0;
tuxship.yspeed=0;
tuxship.radius=(images[IMG_SHIP01]->h)/2;
+
+ tuxship.x1=images[IMG_SHIP01]->w-(images[IMG_SHIP01]->w/8);
+ tuxship.y1=images[IMG_SHIP01]->h/2;
+ tuxship.x2=images[IMG_SHIP01]->w/8;
+ tuxship.y2=images[IMG_SHIP01]->h/8;
+ tuxship.x3=images[IMG_SHIP01]->w/8;
+ tuxship.y3=images[IMG_SHIP01]->h-(images[IMG_SHIP01]->h/8);
shoot_pressed=0;
-
+
score=1;
wave=0;
+ xdead=0;
+ ydead=0;
+ isdead=0;
+ countdead=0;
FF_add_level();
@@ -479,16 +494,18 @@
_("can simplify the fraction... The rocks will split until you got all"),
_("Type the number and shot presing return!"));
}
+
+
while(1){
SDL_PollEvent(&event);
if (event.type == SDL_QUIT)
{
SDL_quit_received = 1;
quit = 1;
+ return;
}
if (event.type == SDL_MOUSEBUTTONDOWN ||
- event.type == SDL_KEYDOWN ||
- event.type == SDL_KEYUP)
+ event.type == SDL_KEYDOWN)
{
return;
}
@@ -528,13 +545,25 @@
{
tuxship.angle=tuxship.angle - DEG_PER_ROTATION*roto_speed;
if (tuxship.angle < 0)
- tuxship.angle = tuxship.angle + 360;
+ tuxship.angle = tuxship.angle + 360;
+
+ tuxship.x1= fast_cos(DEG_PER_ROTATION*-roto_speed)*tuxship.centerx
+ -fast_sin(DEG_PER_ROTATION*-roto_speed)*tuxship.centery;
+ tuxship.y1= fast_sin(DEG_PER_ROTATION*-roto_speed)*tuxship.centerx
+ +fast_cos(DEG_PER_ROTATION*-roto_speed)*tuxship.centery;
+
}
else if (left_pressed)
{
tuxship.angle=tuxship.angle + DEG_PER_ROTATION*roto_speed;
if (tuxship.angle >= 360)
tuxship.angle = tuxship.angle - 360;
+
+ tuxship.x1= fast_cos(DEG_PER_ROTATION*roto_speed)*tuxship.centerx
+ -fast_sin(DEG_PER_ROTATION*roto_speed)*tuxship.centery;
+ tuxship.y1= fast_sin(DEG_PER_ROTATION*roto_speed*tuxship.centerx
+ +fast_cos(DEG_PER_ROTATION*roto_speed))*tuxship.centery;
+
}
/**************** Move, and increse speed ***************/
@@ -568,6 +597,7 @@
tuxship.y = tuxship.y - (screen->h);
else if (tuxship.y < -60)
tuxship.y = tuxship.y + (screen->h);
+
/**************** Shoot ***************/
if(shoot_pressed)
{
@@ -579,6 +609,7 @@
static void FF_handle_asteroids(void){
+ SDL_Surface* surf;
int i, found=0;
for (i = 0; i < MAX_ASTEROIDS; i++){
if (asteroid[i].alive)
@@ -586,14 +617,26 @@
found=1;
- /**************Move the astroids ****************/
+ /*************** Rotate asteroid ****************/
+
+ asteroid[i].angle = (asteroid[i].angle + asteroid[i].angle_speed);
+ // Wrap rotation angle...
+
+ if (asteroid[i].angle < 0)
+ asteroid[i].angle = asteroid[i].angle + 360;
+ else if (asteroid[i].angle >= 360)
+ asteroid[i].angle = asteroid[i].angle - 360;
+
+ /**************Move the astroids ****************/
+ surf=get_asteroid_image(asteroid[i].size,asteroid[i].angle);
+
asteroid[i].rx = asteroid[i].rx + asteroid[i].xspeed;
asteroid[i].ry = asteroid[i].ry + asteroid[i].yspeed;
- asteroid[i].x = (asteroid[i].rx - (IMG_tuxship[asteroid[i].angle/DEG_PER_ROTATION]->w/2));
- asteroid[i].y = (asteroid[i].ry - (IMG_tuxship[asteroid[i].angle/DEG_PER_ROTATION]->h/2));
-
+ asteroid[i].x = (asteroid[i].rx - (surf->w/2));
+ asteroid[i].y = (asteroid[i].ry - (surf->h/2));
+
// Wrap asteroid around edges of screen:
if (asteroid[i].x >= (screen->w))
@@ -605,43 +648,28 @@
asteroid[i].ry = asteroid[i].ry - (screen->h);
else if (asteroid[i].ry < 0)
asteroid[i].ry = asteroid[i].ry + (screen->h);
-
-
- // Rotate asteroid:
-
- asteroid[i].angle = (asteroid[i].angle + asteroid[i].angle_speed);
-
-
- // Wrap rotation angle...
-
- if (asteroid[i].angle < 0)
- asteroid[i].angle = asteroid[i].angle + 360;
- else if (asteroid[i].angle >= 360)
- asteroid[i].angle = asteroid[i].angle - 360;
- // Collisions!
- if(asteroid[i].size<=2){
- if(tuxship.x+30<asteroid[i].x+80 &&
- tuxship.x+30>asteroid[i].x &&
- tuxship.y+30<asteroid[i].y+80 &&
- tuxship.y+30>asteroid[i].y &&
- tuxship.lives>0 &&
- asteroid[i].alive)
- {
+ /**************Center Asteroids**************/
- if(!tuxship.hurt)
- {
- xdead=asteroid[i].x;
- ydead=asteroid[i].y;
-
- tuxship.lives--;
- tuxship.hurt=1;
- tuxship.hurt_count=50;
- FF_destroy_asteroid(i, tuxship.xspeed, tuxship.yspeed);
- playsound(SND_EXPLOSION);
+ asteroid[i].centerx=((surf->w)/2)+(asteroid[i].x-5);
+ asteroid[i].centery=((surf->h)/2)+(asteroid[i].y-5);
+
+ /*************** Collisions! ****************/
+
+ if(AsteroidColl(surf->w, surf->h, asteroid[i].x, asteroid[i].y, tuxship.centerx, tuxship.centery))
+ {
+ if(!tuxship.hurt)
+ {
+ xdead=asteroid[i].centerx;
+ ydead=asteroid[i].centery;
+
+ tuxship.lives--;
+ tuxship.hurt=1;
+ tuxship.hurt_count=50;
+ FF_destroy_asteroid(i, tuxship.xspeed, tuxship.yspeed);
+ playsound(SND_EXPLOSION);
- }
- }
- }
+ }
+ }
}
}
if(!found)
@@ -686,10 +714,11 @@
static void FF_draw(void){
int i, offset;
+ int xnum, ynum;
char str[64];
SDL_Surface* surf;
SDL_Rect dest;
-
+
SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 0, 0, 0));
/************ Draw Background ***************/
@@ -734,32 +763,52 @@
surf=get_asteroid_image(asteroid[i].size,asteroid[i].angle);
+ dest.w = surf->w;
+ dest.h = surf->h;
+
SDL_BlitSurface(surf, NULL, screen, &dest);
+
+ // Wrap the numbers of the asteroids
+ if((asteroid[i].centery)>23 && (asteroid[i].centery)<screen->h){
+ if((asteroid[i].centerx)>0 && (asteroid[i].centerx)<screen->w){
+ xnum=asteroid[i].centerx-3;
+ ynum=asteroid[i].centery;
+ }
+ else if((asteroid[i].centerx)<=0){
+ xnum=20;
+ ynum=asteroid[i].centery;
+ }
+ else if((asteroid[i].centerx)<=screen->w){
+ xnum=screen->w-20;
+ ynum=asteroid[i].centery;
+ }
+ }
+ else if((asteroid[i].centery)<=23){
+ xnum=asteroid[i].centerx;
+ ynum=23;
+ }
+ else if((asteroid[i].centery)>=screen->h){
+ xnum=asteroid[i].centerx;
+ ynum=screen->h-7;
+ }
+
+ //Draw Numbers
if(FF_game==FACTOROIDS_GAME)
{
+
sprintf(str, "%.1d", asteroid[i].fact_number);
- if((asteroid[i].y+10)>23 && (asteroid[i].y+30)<screen->h){
- if((asteroid[i].x+20)>0 && (asteroid[i].x+40)<screen->w)
- draw_nums(str, asteroid[i].x+20,asteroid[i].y+10);
- else if((asteroid[i].x+20)<=0)
- draw_nums(str, 20, asteroid[i].y+10);
- else if((asteroid[i].x+40)<=screen->w)
- draw_nums(str, screen->w-20, asteroid[i].y+10);
- }
- else if((asteroid[i].y+10)<=23)
- draw_nums(str, asteroid[i].x+20, 23);
- else if((asteroid[i].y+30)>=screen->h)
- draw_nums(str, asteroid[i].x+20, screen->h-30);
-
+ draw_nums(str, xnum, ynum);
+
}
else if (FF_game==FRACTIONS_GAME)
{
+
sprintf(str, "%d", asteroid[i].a);
- draw_nums(str, asteroid[i].x+20,asteroid[i].y+20);
- draw_line(asteroid[i].x+20,asteroid[i].y+25, asteroid[i].x+50,asteroid[i].y+25,
+ draw_nums(str, xnum, ynum);
+ draw_line(xnum, ynum+4, xnum+30,ynum+4,
255, 255, 255);
sprintf(str, "%d", asteroid[i].b);
- draw_nums(str, asteroid[i].x+20,asteroid[i].y+55);
+ draw_nums(str, xnum, ynum+35);
}
}
}
@@ -933,11 +982,45 @@
}
-int CircularColl(int ax, int ay, int ar, int bx, int by, int br){
- if ((((ax-bx)*(ax-bx))+((ay-by)*(ay-by)))<((ar+br)*(ar+br)))
+/*Tree rectangle vs a point collitions
+ returns 1 if the collitions is detected
+ and 0 if not*/
+
+int AsteroidColl(int astW,int astH,int astX,int astY,
+ int x, int y)
+{
+ int astWq=astW/8;
+ int astHq=astH/8;
+ int x1, y1, x2, y2;
+
+ x1=astX+astWq*3;
+ y1=astY;
+
+ x2=astX+astWq*6;
+ y2=astY+astH;
+
+ if(x>x1 && x<x2 && y>y1 && y<y2)
return 1;
- else
- return 2;
+
+ x1=astX;
+ y1=astY+astHq*3;
+
+ x2=astW;
+ y2=astY+astHq*6;
+
+ if(x>x1 && x<x2 && y>y1 && y<y2)
+ return 1;
+
+ x1=astX+astWq;
+ y1=astY+astHq;
+
+ x2=astX+astWq*7;
+ y2=astY+astHq*7;
+
+ if(x>x1 && x<x2 && y>y1 && y<y2)
+ return 1;
+
+ return 0;
}
// Returns x % w but in the range [-w/2, w/2]
More information about the Tux4kids-commits
mailing list