From f754e96b35665c5be11c4ea82a878463fc5a92df Mon Sep 17 00:00:00 2001 From: Duong-Khang Nguyen Date: Sun, 13 Jun 2004 21:48:16 +0000 Subject: [PATCH] added CONFIG_HEADER and fixed minorest bugs :) SVN-Revision: 1480 --- ChangeLog | 17 +++- config.h.in | 271 +++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 4 +- po/de.po | 2 +- po/es.po | 3 +- po/pt.po | 3 +- src/background.cpp | 2 +- src/defines.h | 4 +- src/special.cpp | 1 + stamp-h1 | 1 + 10 files changed, 296 insertions(+), 12 deletions(-) create mode 100644 config.h.in create mode 100644 stamp-h1 diff --git a/ChangeLog b/ChangeLog index 56c25cb34..6a5238baa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ +- SuperTux changes - +http://super-tux.sf.net/ + +Last update: May 3, 2004 + +2004-06-13 neoneurone + + * configure.ac: added CONFIG_HEADER + * special.cpp: added "sprite = NULL;" + * background.cpp: fix "br" variable, replaced by "bg" + 2004-06-07 neoneurone +2004-06-07 neoneurone * Makefile.am, configure.ac, autogen.sh: minor changes for using automake version 1.6 @@ -24,11 +36,6 @@ (EXTRA_DIST): Add config.rpath. * configure.ac (AC_OUTPUT): Add po/Makefile.in, -- SuperTux changes - -http://super-tux.sf.net/ - -Last update: May 3, 2004 - Milestone 0.1.1 - May 11, 2004 ----------------------------- diff --git a/config.h.in b/config.h.in new file mode 100644 index 000000000..9e1cdb82a --- /dev/null +++ b/config.h.in @@ -0,0 +1,271 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +#undef CRAY_STACKSEG_END + +/* Define to 1 if using `alloca.c'. */ +#undef C_ALLOCA + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +#undef ENABLE_NLS + +/* Define to 1 if you have `alloca', as a function or macro. */ +#undef HAVE_ALLOCA + +/* Define to 1 if you have and it should be used (not on Ultrix). + */ +#undef HAVE_ALLOCA_H + +/* Use the Apple OpenGL framework. */ +#undef HAVE_APPLE_OPENGL_FRAMEWORK + +/* Define to 1 if you have the header file. */ +#undef HAVE_ARGZ_H + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +#undef HAVE_DCGETTEXT + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#undef HAVE_DIRENT_H + +/* Define to 1 if you have the `feof_unlocked' function. */ +#undef HAVE_FEOF_UNLOCKED + +/* Define to 1 if you have the `fgets_unlocked' function. */ +#undef HAVE_FGETS_UNLOCKED + +/* Define to 1 if you have the `getcwd' function. */ +#undef HAVE_GETCWD + +/* Define to 1 if you have the `getc_unlocked' function. */ +#undef HAVE_GETC_UNLOCKED + +/* Define to 1 if you have the `getegid' function. */ +#undef HAVE_GETEGID + +/* Define to 1 if you have the `geteuid' function. */ +#undef HAVE_GETEUID + +/* Define to 1 if you have the `getgid' function. */ +#undef HAVE_GETGID + +/* Define to 1 if you have the `getpagesize' function. */ +#undef HAVE_GETPAGESIZE + +/* Define if the GNU gettext() function is already present or preinstalled. */ +#undef HAVE_GETTEXT + +/* Define to 1 if you have the `getuid' function. */ +#undef HAVE_GETUID + +/* Define if you have the iconv() function. */ +#undef HAVE_ICONV + +/* Define if exists and doesn't clash with . */ +#undef HAVE_INTTYPES_H + +/* Define if exists, doesn't clash with , and + declares uintmax_t. */ +#undef HAVE_INTTYPES_H_WITH_UINTMAX + +/* Define if you have and nl_langinfo(CODESET). */ +#undef HAVE_LANGINFO_CODESET + +/* Define if your file defines LC_MESSAGES. */ +#undef HAVE_LC_MESSAGES + +/* Define to 1 if you have the `SDL_image' library (-lSDL_image). */ +#undef HAVE_LIBSDL_IMAGE + +/* Define to 1 if you have the `SDL_mixer' library (-lSDL_mixer). */ +#undef HAVE_LIBSDL_MIXER + +/* Define to 1 if you have the `z' library (-lz). */ +#undef HAVE_LIBZ + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIMITS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LOCALE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MALLOC_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the `mempcpy' function. */ +#undef HAVE_MEMPCPY + +/* Define to 1 if you have the `mkdir' function. */ +#undef HAVE_MKDIR + +/* Define to 1 if you have a working `mmap' system call. */ +#undef HAVE_MMAP + +/* Define to 1 if you have the `munmap' function. */ +#undef HAVE_MUNMAP + +/* Define to 1 if you have the header file, and it defines `DIR'. */ +#undef HAVE_NDIR_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NL_TYPES_H + +/* Define if you have POSIX threads libraries and header files. */ +#undef HAVE_PTHREAD + +/* Define to 1 if you have the `putenv' function. */ +#undef HAVE_PUTENV + +/* Define to 1 if you have the `setenv' function. */ +#undef HAVE_SETENV + +/* Define to 1 if you have the `setlocale' function. */ +#undef HAVE_SETLOCALE + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDDEF_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define if exists, doesn't clash with , and declares + uintmax_t. */ +#undef HAVE_STDINT_H_WITH_UINTMAX + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the `stpcpy' function. */ +#undef HAVE_STPCPY + +/* Define to 1 if you have the `strcasecmp' function. */ +#undef HAVE_STRCASECMP + +/* Define to 1 if you have the `strdup' function. */ +#undef HAVE_STRDUP + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the `strstr' function. */ +#undef HAVE_STRSTR + +/* Define to 1 if you have the `strtoul' function. */ +#undef HAVE_STRTOUL + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#undef HAVE_SYS_DIR_H + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#undef HAVE_SYS_NDIR_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PARAM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the `tsearch' function. */ +#undef HAVE_TSEARCH + +/* Define if you have the 'uintmax_t' type in or . */ +#undef HAVE_UINTMAX_T + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define if you have the unsigned long long type. */ +#undef HAVE_UNSIGNED_LONG_LONG + +/* Define to 1 if you have the header file. */ +#undef HAVE_WINDOWS_H + +/* Define to 1 if you have the `__argz_count' function. */ +#undef HAVE___ARGZ_COUNT + +/* Define to 1 if you have the `__argz_next' function. */ +#undef HAVE___ARGZ_NEXT + +/* Define to 1 if you have the `__argz_stringify' function. */ +#undef HAVE___ARGZ_STRINGIFY + +/* Define to 1 if you have the `__fsetlocking' function. */ +#undef HAVE___FSETLOCKING + +/* Define as const if the declaration of iconv() needs const. */ +#undef ICONV_CONST + +/* Define if integer division by zero raises signal SIGFPE. */ +#undef INTDIV0_RAISES_SIGFPE + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define if exists and defines unusable PRI* macros. */ +#undef PRI_MACROS_BROKEN + +/* Define to the necessary symbol if this constant uses a non-standard name on + your system. */ +#undef PTHREAD_CREATE_JOINABLE + +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at run-time. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +#undef STACK_DIRECTION + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Version number of package */ +#undef VERSION + +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const + +/* Define as `__inline' if that's what the C compiler calls it, or to nothing + if it is not supported. */ +#undef inline + +/* Define to `long' if does not define. */ +#undef off_t + +/* Define to `unsigned' if does not define. */ +#undef size_t + +/* Define to unsigned long or unsigned long long if and + don't define. */ +#undef uintmax_t diff --git a/configure.ac b/configure.ac index 2f132b65b..98ded9453 100644 --- a/configure.ac +++ b/configure.ac @@ -12,9 +12,11 @@ dnl =========================================================================== dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.54]) AC_INIT(SuperTux, 0.1.1) +AC_CONFIG_HEADER(config.h) AC_CONFIG_SRCDIR([src/supertux.cpp]) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE +AM_CONFIG_HEADER SDL_VERSION=1.2.4 @@ -47,7 +49,7 @@ AC_MSG_CHECKING(for debug mode) AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [enable debugging mode]),, enable_debug="yes") if test "x${enable_debug}" != "xno"; then - CXXFLAGS="$CXXFLAGS -Wall -Werror -DDEBUG -O0 -g3" + CXXFLAGS="$CXXFLAGS -Wall -Werror -DDEBUG -O3 -g" AC_MSG_RESULT([enabled]) else AC_MSG_RESULT([disabled]) diff --git a/po/de.po b/po/de.po index 082d5ec0e..07bae71c2 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,6 @@ msgid "" msgstr "" "Project-Id-Version: SuperTux 0.1.1\n" -"Report-Msgid-Bugs-To: super-tux-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2004-06-10 14:53+0100\n" "PO-Revision-Date: 2004-06-03 00:29+0200\n" "Last-Translator: \n" @@ -15,6 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: super-tux-devel@lists.sourceforge.net\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/gameloop.cpp:163 diff --git a/po/es.po b/po/es.po index 23f0ef3de..8c1c02c34 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,6 @@ msgid "" msgstr "" "Project-Id-Version: SuperTux-CVS\n" -"Report-Msgid-Bugs-To: super-tux-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2004-06-10 14:53+0100\n" "PO-Revision-Date: 2004-06-09 23:10+0200\n" "Last-Translator: Javier Beaumont \n" @@ -15,6 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: super-tux-devel@lists.sourceforge.net\n" "X-Generator: KBabel 1.3.1\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -27,6 +27,7 @@ msgid "PAUSE - Press 'P' To Play" msgstr "PAUSA - Pulsa 'P' para continuar" #: src/gameloop.cpp:528 +#, c-format msgid "Playing: " msgstr "Jugando: " diff --git a/po/pt.po b/po/pt.po index d127ab1ac..accd61694 100644 --- a/po/pt.po +++ b/po/pt.po @@ -9,7 +9,6 @@ msgid "" msgstr "" "Project-Id-Version: pt\n" -"Report-Msgid-Bugs-To: super-tux-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2004-06-10 14:53+0100\n" "PO-Revision-Date: 2004-06-10 14:53+0100\n" "Last-Translator: Ricardo Cruz \n" @@ -17,6 +16,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: super-tux-devel@lists.sourceforge.net\n" "X-Generator: KBabel 1.3\n" #: src/gameloop.cpp:163 @@ -374,4 +374,3 @@ msgstr "Tens a certeza que queres remover o slot %d?" #: src/worldmap.cpp:723 msgid "GAMEOVER" msgstr "FIM DO JOGO" - diff --git a/src/background.cpp b/src/background.cpp index fcf91f518..42b9e41f3 100644 --- a/src/background.cpp +++ b/src/background.cpp @@ -39,7 +39,7 @@ Background::Background(LispReader& reader) int tr, tg, tb, br, bg, bb; if(reader.read_int("top_red", tr) && reader.read_int("top_green", tg) && reader.read_int("top_blue", tb) && reader.read_int("bottom_red", br) - && reader.read_int("bottom_green", br) + && reader.read_int("bottom_green", bg) && reader.read_int("bottom_blue", bb)) { set_gradient(Color(tr, tg, tb), Color(br, bg, bb)); } diff --git a/src/defines.h b/src/defines.h index 8d9d8af22..a2e8c1681 100644 --- a/src/defines.h +++ b/src/defines.h @@ -20,7 +20,9 @@ // 02111-1307, USA. #ifndef SUPERTUX_DEFINES_H -#define SUPERTUX_DEFINES_H +#define SUPERTUX_DEFINES_H 1 + +#include /* Version: */ diff --git a/src/special.cpp b/src/special.cpp index 38f548b20..ec2fd47ab 100644 --- a/src/special.cpp +++ b/src/special.cpp @@ -263,6 +263,7 @@ Upgrade::draw(DrawingContext& context) case UPGRADE_1UP: sprite = img_1up; break; default: assert(!"wrong type in Powerup::draw()"); + sprite = NULL; // added by neoneurone, g++ likes this ! } if(base.height < 32) // still raising up? diff --git a/stamp-h1 b/stamp-h1 new file mode 100644 index 000000000..4547fe1b5 --- /dev/null +++ b/stamp-h1 @@ -0,0 +1 @@ +timestamp for config.h -- 2.11.0