[extremetuxracer] 02/07: Imported Upstream version 0.7.1
Markus Koschany
apo-guest at moszumanska.debian.org
Sun Feb 7 14:22:33 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch experimental
in repository extremetuxracer.
commit a3a0e893b1930415e4c5ba841de7b9534eeb276d
Author: Markus Koschany <apo at debian.org>
Date: Sun Feb 7 14:22:19 2016 +0100
Imported Upstream version 0.7.1
---
NEWS | 10 ++++++++++
build/Installer/productInfo.wxi | 4 ++--
configure | 22 ++++++++++-----------
configure.ac | 4 ++--
.../courses/extras/follow_white_rabbit/Makefile.am | 1 +
.../courses/extras/follow_white_rabbit/Makefile.in | 1 +
.../courses/extras/follow_white_rabbit/preview.png | Bin 0 -> 30562 bytes
data/courses/extras/i_like_spike_2/Makefile.am | 3 ++-
data/courses/extras/i_like_spike_2/Makefile.in | 3 ++-
data/courses/extras/i_like_spike_2/preview.png | Bin 0 -> 36022 bytes
data/courses/extras/inception/Makefile.am | 1 +
data/courses/extras/inception/Makefile.in | 1 +
data/courses/extras/inception/preview.png | Bin 0 -> 38900 bytes
data/courses/extras/penguins_day/Makefile.am | 1 +
data/courses/extras/penguins_day/Makefile.in | 1 +
data/courses/extras/penguins_day/preview.png | Bin 0 -> 36492 bytes
data/courses/extras/pygoscelis_adeliae/Makefile.am | 1 +
data/courses/extras/pygoscelis_adeliae/Makefile.in | 1 +
data/courses/extras/pygoscelis_adeliae/preview.png | Bin 0 -> 49776 bytes
data/courses/extras/slide_or_fly/Makefile.am | 1 +
data/courses/extras/slide_or_fly/Makefile.in | 1 +
data/courses/extras/slide_or_fly/preview.png | Bin 0 -> 35229 bytes
data/courses/extras/twists/Makefile.am | 1 +
data/courses/extras/twists/Makefile.in | 1 +
data/courses/extras/twists/preview.png | Bin 0 -> 39518 bytes
data/credits.lst | 4 +++-
data/translations/fr_FR.lst | 12 +++++------
resources/etr.desktop | 1 +
src/game_config.cpp | 10 +++++++---
src/game_config.h | 2 +-
src/textures.cpp | 2 +-
src/version.h | 4 ++--
src/winsys.cpp | 11 +++++++++++
33 files changed, 73 insertions(+), 31 deletions(-)
diff --git a/NEWS b/NEWS
index ff73134..6c9ffae 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,16 @@
NEWS for Extreme Tux Racer
===============================================================================
+Version 0.7.1 5th of February, 2016
+-------------------------------------------------------------------------------
+Bugfix release
+
+- Fixed use of user provided CPPFLAGS
+- "I Like Spike" course installed to correct location
+- Added preview images for all courses that were missing one
+- Added keywords to the desktop file
+- Do not try to save screenshots to read-only location but to user
+ home directory
Version 0.7 23th of January, 2016
-------------------------------------------------------------------------------
diff --git a/build/Installer/productInfo.wxi b/build/Installer/productInfo.wxi
index bc3e9b5..c6845b9 100644
--- a/build/Installer/productInfo.wxi
+++ b/build/Installer/productInfo.wxi
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Include>
- <?define ProductName = "Extreme TuxRacer 0.7.0 ($(var.Platform))" ?>
+ <?define ProductName = "Extreme TuxRacer 0.7.1 ($(var.Platform))" ?>
<?define ProductNameShort = "Extreme TuxRacer" ?>
- <?define ProductVersion = "0.7.0.0" ?>
+ <?define ProductVersion = "0.7.1.0" ?>
<?define ProductManufacturer = "The ExtremeTuxRacer team" ?>
<?define ProductDescription = "High speed arctic racing game" ?>
diff --git a/configure b/configure
index 3760249..f94172e 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for etr 0.7.0.
+# Generated by GNU Autoconf 2.69 for etr 0.7.1.
#
# Report bugs to <https://sourceforge.net/projects/extremetuxracer>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='etr'
PACKAGE_TARNAME='etr'
-PACKAGE_VERSION='0.7.0'
-PACKAGE_STRING='etr 0.7.0'
+PACKAGE_VERSION='0.7.1'
+PACKAGE_STRING='etr 0.7.1'
PACKAGE_BUGREPORT='https://sourceforge.net/projects/extremetuxracer'
PACKAGE_URL=''
@@ -1312,7 +1312,7 @@ if test "$ac_init_help" = "long"; then
# 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 etr 0.7.0 to adapt to many kinds of systems.
+\`configure' configures etr 0.7.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1383,7 +1383,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of etr 0.7.0:";;
+ short | recursive ) echo "Configuration of etr 0.7.1:";;
esac
cat <<\_ACEOF
@@ -1493,7 +1493,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-etr configure 0.7.0
+etr configure 0.7.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1954,7 +1954,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by etr $as_me 0.7.0, which was
+It was created by etr $as_me 0.7.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2822,7 +2822,7 @@ fi
# Define the identity of the package.
PACKAGE='etr'
- VERSION='0.7.0'
+ VERSION='0.7.1'
cat >>confdefs.h <<_ACEOF
@@ -5333,7 +5333,7 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- CPPFLAGS="${CFPPLAGS} $SFML_WINDOW_CFLAGS"
+ CPPFLAGS="${CPPFLAGS} $SFML_WINDOW_CFLAGS"
LIBS="${LIBS} $SFML_WINDOW_LIBS"
fi
@@ -6054,7 +6054,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by etr $as_me 0.7.0, which was
+This file was extended by etr $as_me 0.7.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6120,7 +6120,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-etr config.status 0.7.0
+etr config.status 0.7.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 240396d..8cb300e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.61])
-AC_INIT([etr], [0.7.0], [https://sourceforge.net/projects/extremetuxracer])
+AC_INIT([etr], [0.7.1], [https://sourceforge.net/projects/extremetuxracer])
AC_CONFIG_SRCDIR([src/gui.cpp])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([etr_config.h])
@@ -48,7 +48,7 @@ PKG_CHECK_MODULES([SFML_AUDIO], [sfml-audio >= 2.2],
PKG_CHECK_MODULES([SFML_WINDOW], [sfml-window >= 2.2],
[
- CPPFLAGS="${CFPPLAGS} $SFML_WINDOW_CFLAGS"
+ CPPFLAGS="${CPPFLAGS} $SFML_WINDOW_CFLAGS"
LIBS="${LIBS} $SFML_WINDOW_LIBS"
],
[AC_MSG_ERROR([sfml-window not found])])
diff --git a/data/courses/extras/follow_white_rabbit/Makefile.am b/data/courses/extras/follow_white_rabbit/Makefile.am
index 3dc9d67..2aa1ce0 100644
--- a/data/courses/extras/follow_white_rabbit/Makefile.am
+++ b/data/courses/extras/follow_white_rabbit/Makefile.am
@@ -4,6 +4,7 @@ pkgdatadir = $(datadir)/$(PACKAGE)/courses/extras/follow_white_rabbit
pkgdata_DATA = \
course.dim \
elev.png \
+ preview.png \
terrain.png \
trees.png
diff --git a/data/courses/extras/follow_white_rabbit/Makefile.in b/data/courses/extras/follow_white_rabbit/Makefile.in
index b16ac8f..6918f90 100644
--- a/data/courses/extras/follow_white_rabbit/Makefile.in
+++ b/data/courses/extras/follow_white_rabbit/Makefile.in
@@ -262,6 +262,7 @@ top_srcdir = @top_srcdir@
pkgdata_DATA = \
course.dim \
elev.png \
+ preview.png \
terrain.png \
trees.png
diff --git a/data/courses/extras/follow_white_rabbit/preview.png b/data/courses/extras/follow_white_rabbit/preview.png
new file mode 100644
index 0000000..5bcfcaf
Binary files /dev/null and b/data/courses/extras/follow_white_rabbit/preview.png differ
diff --git a/data/courses/extras/i_like_spike_2/Makefile.am b/data/courses/extras/i_like_spike_2/Makefile.am
index 500db9b..af41d2e 100644
--- a/data/courses/extras/i_like_spike_2/Makefile.am
+++ b/data/courses/extras/i_like_spike_2/Makefile.am
@@ -1,9 +1,10 @@
-pkgdatadir = $(datadir)/$(PACKAGE)/courses/extras/i_like_spike
+pkgdatadir = $(datadir)/$(PACKAGE)/courses/extras/i_like_spike_2
pkgdata_DATA = \
course.dim \
elev.png \
+ preview.png \
terrain.png \
trees.png
diff --git a/data/courses/extras/i_like_spike_2/Makefile.in b/data/courses/extras/i_like_spike_2/Makefile.in
index db43c19..fa9f47e 100644
--- a/data/courses/extras/i_like_spike_2/Makefile.in
+++ b/data/courses/extras/i_like_spike_2/Makefile.in
@@ -149,7 +149,7 @@ DATA = $(pkgdata_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/$(PACKAGE)/courses/extras/i_like_spike
+pkgdatadir = $(datadir)/$(PACKAGE)/courses/extras/i_like_spike_2
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -262,6 +262,7 @@ top_srcdir = @top_srcdir@
pkgdata_DATA = \
course.dim \
elev.png \
+ preview.png \
terrain.png \
trees.png
diff --git a/data/courses/extras/i_like_spike_2/preview.png b/data/courses/extras/i_like_spike_2/preview.png
new file mode 100644
index 0000000..3f9e0a9
Binary files /dev/null and b/data/courses/extras/i_like_spike_2/preview.png differ
diff --git a/data/courses/extras/inception/Makefile.am b/data/courses/extras/inception/Makefile.am
index 983337b..138573e 100644
--- a/data/courses/extras/inception/Makefile.am
+++ b/data/courses/extras/inception/Makefile.am
@@ -4,6 +4,7 @@ pkgdatadir = $(datadir)/$(PACKAGE)/courses/extras/inception
pkgdata_DATA = \
course.dim \
elev.png \
+ preview.png \
terrain.png \
trees.png
diff --git a/data/courses/extras/inception/Makefile.in b/data/courses/extras/inception/Makefile.in
index 3edfa16..245436c 100644
--- a/data/courses/extras/inception/Makefile.in
+++ b/data/courses/extras/inception/Makefile.in
@@ -262,6 +262,7 @@ top_srcdir = @top_srcdir@
pkgdata_DATA = \
course.dim \
elev.png \
+ preview.png \
terrain.png \
trees.png
diff --git a/data/courses/extras/inception/preview.png b/data/courses/extras/inception/preview.png
new file mode 100644
index 0000000..3ff47a3
Binary files /dev/null and b/data/courses/extras/inception/preview.png differ
diff --git a/data/courses/extras/penguins_day/Makefile.am b/data/courses/extras/penguins_day/Makefile.am
index 8fd6306..547215e 100644
--- a/data/courses/extras/penguins_day/Makefile.am
+++ b/data/courses/extras/penguins_day/Makefile.am
@@ -4,6 +4,7 @@ pkgdatadir = $(datadir)/$(PACKAGE)/courses/extras/penguins_day
pkgdata_DATA = \
course.dim \
elev.png \
+ preview.png \
terrain.png \
trees.png
diff --git a/data/courses/extras/penguins_day/Makefile.in b/data/courses/extras/penguins_day/Makefile.in
index 889b38b..41ad5b7 100644
--- a/data/courses/extras/penguins_day/Makefile.in
+++ b/data/courses/extras/penguins_day/Makefile.in
@@ -262,6 +262,7 @@ top_srcdir = @top_srcdir@
pkgdata_DATA = \
course.dim \
elev.png \
+ preview.png \
terrain.png \
trees.png
diff --git a/data/courses/extras/penguins_day/preview.png b/data/courses/extras/penguins_day/preview.png
new file mode 100644
index 0000000..8135390
Binary files /dev/null and b/data/courses/extras/penguins_day/preview.png differ
diff --git a/data/courses/extras/pygoscelis_adeliae/Makefile.am b/data/courses/extras/pygoscelis_adeliae/Makefile.am
index 710281b..04c1edf 100644
--- a/data/courses/extras/pygoscelis_adeliae/Makefile.am
+++ b/data/courses/extras/pygoscelis_adeliae/Makefile.am
@@ -4,6 +4,7 @@ pkgdatadir = $(datadir)/$(PACKAGE)/courses/extras/pygoscelis_adeliae
pkgdata_DATA = \
course.dim \
elev.png \
+ preview.png \
terrain.png \
trees.png
diff --git a/data/courses/extras/pygoscelis_adeliae/Makefile.in b/data/courses/extras/pygoscelis_adeliae/Makefile.in
index ec57dff..4cce39b 100644
--- a/data/courses/extras/pygoscelis_adeliae/Makefile.in
+++ b/data/courses/extras/pygoscelis_adeliae/Makefile.in
@@ -262,6 +262,7 @@ top_srcdir = @top_srcdir@
pkgdata_DATA = \
course.dim \
elev.png \
+ preview.png \
terrain.png \
trees.png
diff --git a/data/courses/extras/pygoscelis_adeliae/preview.png b/data/courses/extras/pygoscelis_adeliae/preview.png
new file mode 100644
index 0000000..d2938ac
Binary files /dev/null and b/data/courses/extras/pygoscelis_adeliae/preview.png differ
diff --git a/data/courses/extras/slide_or_fly/Makefile.am b/data/courses/extras/slide_or_fly/Makefile.am
index 5a04b60..cbc2907 100644
--- a/data/courses/extras/slide_or_fly/Makefile.am
+++ b/data/courses/extras/slide_or_fly/Makefile.am
@@ -4,6 +4,7 @@ pkgdatadir = $(datadir)/$(PACKAGE)/courses/extras/slide_or_fly
pkgdata_DATA = \
course.dim \
elev.png \
+ preview.png \
terrain.png \
trees.png
diff --git a/data/courses/extras/slide_or_fly/Makefile.in b/data/courses/extras/slide_or_fly/Makefile.in
index b0ca45f..e667b74 100644
--- a/data/courses/extras/slide_or_fly/Makefile.in
+++ b/data/courses/extras/slide_or_fly/Makefile.in
@@ -262,6 +262,7 @@ top_srcdir = @top_srcdir@
pkgdata_DATA = \
course.dim \
elev.png \
+ preview.png \
terrain.png \
trees.png
diff --git a/data/courses/extras/slide_or_fly/preview.png b/data/courses/extras/slide_or_fly/preview.png
new file mode 100644
index 0000000..f807e58
Binary files /dev/null and b/data/courses/extras/slide_or_fly/preview.png differ
diff --git a/data/courses/extras/twists/Makefile.am b/data/courses/extras/twists/Makefile.am
index 7e97fb0..9ca4ae2 100644
--- a/data/courses/extras/twists/Makefile.am
+++ b/data/courses/extras/twists/Makefile.am
@@ -4,6 +4,7 @@ pkgdatadir = $(datadir)/$(PACKAGE)/courses/extras/twists
pkgdata_DATA = \
course.dim \
elev.png \
+ preview.png \
terrain.png \
trees.png
diff --git a/data/courses/extras/twists/Makefile.in b/data/courses/extras/twists/Makefile.in
index b6442e4..9d9d86f 100644
--- a/data/courses/extras/twists/Makefile.in
+++ b/data/courses/extras/twists/Makefile.in
@@ -262,6 +262,7 @@ top_srcdir = @top_srcdir@
pkgdata_DATA = \
course.dim \
elev.png \
+ preview.png \
terrain.png \
trees.png
diff --git a/data/courses/extras/twists/preview.png b/data/courses/extras/twists/preview.png
new file mode 100644
index 0000000..ad66097
Binary files /dev/null and b/data/courses/extras/twists/preview.png differ
diff --git a/data/credits.lst b/data/credits.lst
index 6fd3434..52ef502 100644
--- a/data/credits.lst
+++ b/data/credits.lst
@@ -1,5 +1,5 @@
*[offs] 0 [text] Extreme Tux Racer [font] 0 [size] 7 [col] 1
-*[offs] 50 [text] Version 0.7.0 [font] 0 [size] 3 [col] 0
+*[offs] 50 [text] Version 0.7.1 [font] 0 [size] 3 [col] 0
*[offs] 40 [text] Some courses may have been modified from their [font] 0 [size] 2 [col] 0
*[offs] 20 [text] original versions to fit the requirements of the game. [font] 0 [size] 2 [col] 0
@@ -40,6 +40,8 @@
*[offs] 40 [text] Translations: [font] 0 [size] 4 [col] 1
*[offs] 30 [text] Czech: Pavel Borecki [font] 0 [size] 3 [col] 0
*[offs] 30 [text] Finnish: Marko Lindqvist [font] 0 [size] 3 [col] 0
+*[offs] 30 [text] French: Sylvain St-Amand (SSTSylvain) [font] 0 [size] 3 [col] 0
+*[offs] 30 [text] German: Philipp Kloke [font] 0 [size] 3 [col] 0
*[offs] 30 [text] Translators up to version 0.6.0 unknown [font] 0 [size] 3 [col] 0
*[offs] 50 [text] Copyright © 1999 - 2000 Jasmin F. Patry[font] 0 [size] 3 [col] 0
diff --git a/data/translations/fr_FR.lst b/data/translations/fr_FR.lst
index 6abe838..d76087f 100644
--- a/data/translations/fr_FR.lst
+++ b/data/translations/fr_FR.lst
@@ -20,7 +20,7 @@
*[idx] 14 [engl] seconds [trans] secondes
*[idx] 15 [engl] Ok [trans] Valider
*[idx] 16 [engl] Congratulations! You won the cup! [trans] Félicitation ! Vous avez remporté cette coupe !
-*[idx] 17 [engl] You have reached level [trans] Vous avez attein le niveau
+*[idx] 17 [engl] You have reached level [trans] Vous avez atteint le niveau
*[idx] 18 [engl] Sorry, you didn't advance [trans] Désolé, vous n'avez pas avancé
*[idx] 19 [engl] You don't have any lives left [trans] Il ne vous reste plus aucune vie
*[idx] 20 [engl] Select a race [trans] Choisissez une course
@@ -54,7 +54,7 @@
*[idx] 44 [engl] 1, 2, 3 - change view mode [trans] 1, 2, 3 - changement mode visionnement
*[idx] 45 [engl] F - hide/show fps display [trans] F - cache/affiche affichage ips
*[idx] 46 [engl] H - hide/show hud display [trans] H - cache/affiche affichage hud
-*[idx] 47 [engl] S - screenshot [trans] S - imprime écran
+*[idx] 47 [engl] S - screenshot [trans] S - imprime écran
*[idx] 48 [engl] U - toggle ui snow [trans] U - bascule neige iu
*[idx] 49 [engl] P - set pause mode [trans] P - active mode pause
*[idx] 50 [engl] T - trick [trans] T - astuce
@@ -79,11 +79,11 @@
*[idx] 66 [engl] Enter a name for the new player and select an avatar: [trans] Entrer un nom d'utilisateur et sélectionner un avatar :
-*[idx] 67 [engl] Loading resources, [trans] Chargement des resources,
+*[idx] 67 [engl] Loading resources, [trans] Chargement des ressources,
*[idx] 68 [engl] please wait ... [trans] s.v.p. attendez ...
-*[idx] 69 [engl] Mirror track: Off [trans] Piste mirroir : Désactiver
-*[idx] 70 [engl] Mirror track: On [trans] Piste mirroir : Activer
+*[idx] 69 [engl] Mirror track: Off [trans] Piste miroir : Désactiver
+*[idx] 70 [engl] Mirror track: On [trans] Piste miroir : Activer
*[idx] 71 [engl] Light: Sunny [trans] Lumière : Ensoleillé
*[idx] 72 [engl] Light: Cloudy [trans] Lumière : Nuageux
@@ -114,7 +114,7 @@
*[idx] 92 [engl] Loading courses failed. [trans] Chargement courses échoué.
*[idx] 93 [engl] Loading characters failed. [trans] Chargement personnages échoué.
-*[idx] 94 [engl] Loading environments failed. [trans] Chargement environments échoué.
+*[idx] 94 [engl] Loading environments failed. [trans] Chargement environnement échoué.
*[idx] 95 [engl] Loading terrains failed. [trans] Chargement terrains échoué.
*[idx] 96 [engl] Loading avatars failed. [trans] Chargement avatars échoué.
*[idx] 97 [engl] herrings [trans] harengs
diff --git a/resources/etr.desktop b/resources/etr.desktop
index 1ffcf7a..d6686a4 100644
--- a/resources/etr.desktop
+++ b/resources/etr.desktop
@@ -15,3 +15,4 @@ Terminal=false
StartupNotify=false
Categories=Game;ArcadeGame;
+Keywords=game;tux;3D;pinguin;race;arcade;
diff --git a/src/game_config.cpp b/src/game_config.cpp
index 2a31972..cd6c36c 100644
--- a/src/game_config.cpp
+++ b/src/game_config.cpp
@@ -268,6 +268,7 @@ void InitConfig() {
// the progdir is always the current dir
param.config_dir = "config";
param.data_dir = "data";
+ param.save_dir = "data";
param.configfile = param.config_dir + SEP "options.txt";
#else /* WIN32 */
@@ -288,20 +289,23 @@ void InitConfig() {
#endif /* 0 */
struct passwd *pwent = getpwuid(getuid());
+ const char *home;
+
param.config_dir = pwent->pw_dir;
param.config_dir += SEP;
param.config_dir += ".etr";
// or: param.config_dir = param.prog_dir + SEP "config";
- if (!DirExists(param.config_dir.c_str()))
+ if (!DirExists(param.config_dir.c_str())) {
mkdir(param.config_dir.c_str(), 0775);
+ }
param.data_dir = ETR_DATA_DIR;
param.data_dir += SEP;
param.data_dir += "etr";
- // param.data_dir = param.prog_dir + SEP "data";
+ param.save_dir = param.config_dir;
param.configfile = param.config_dir + SEP "options";
#endif /* WIN32 */
- param.screenshot_dir = param.data_dir + SEP "screenshots";
+ param.screenshot_dir = param.save_dir + SEP "screenshots";
param.obj_dir = param.data_dir + SEP "objects";
param.env_dir2 = param.data_dir + SEP "env";
param.char_dir = param.data_dir + SEP "char";
diff --git a/src/game_config.h b/src/game_config.h
index 925c885..47add6f 100644
--- a/src/game_config.h
+++ b/src/game_config.h
@@ -21,9 +21,9 @@ GNU General Public License for more details.
struct TParam {
// defined at runtime:
- // string prog_dir;
string config_dir;
string data_dir;
+ string save_dir;
string common_course_dir;
string obj_dir;
string terr_dir;
diff --git a/src/textures.cpp b/src/textures.cpp
index e066c8d..71c9d81 100644
--- a/src/textures.cpp
+++ b/src/textures.cpp
@@ -247,7 +247,7 @@ void CTexture::DrawFrame(size_t idx, int x, int y, double w, double h, int frame
void CTexture::DrawNumChr(char c, int x, int y, int w, int h) {
int idx;
- if (isdigit(c)) {
+ if (std::isdigit((unsigned char)c)) {
char chrname[2] = {c, '\0'};
idx = atoi(chrname);
} else if (c == ':')
diff --git a/src/version.h b/src/version.h
index e315e54..3df0867 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,2 +1,2 @@
-#define ETR_VERSION_STRING "0.7.0"
-#define ETR_VERSION 0,7,0,0
+#define ETR_VERSION_STRING "0.7.1"
+#define ETR_VERSION 0,7,1,0
diff --git a/src/winsys.cpp b/src/winsys.cpp
index 5d46979..6a6d8c1 100644
--- a/src/winsys.cpp
+++ b/src/winsys.cpp
@@ -19,6 +19,8 @@ GNU General Public License for more details.
#include <etr_config.h>
#endif
+#include <sys/stat.h>
+
#include "winsys.h"
#include "course.h"
#include "game_ctrl.h"
@@ -164,6 +166,15 @@ void CWinsys::TakeScreenshot() const {
sf::Image img = tex.copyToImage();
string path = param.screenshot_dir;
+
+#if !defined (OS_WIN32_MINGW) && !defined (OS_WIN32_MSC)
+ const char *cpath = path.c_str();
+
+ if (!DirExists(cpath)) {
+ mkdir(cpath, 0775);
+ }
+#endif /* WIN32 */
+
path += SEP;
path += g_game.course->dir;
path += '_';
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/extremetuxracer.git
More information about the Pkg-games-commits
mailing list