[Tux4kids-commits] r620 - in tuxmath/trunk: data/images/factroids data/images/sprites data/missions data/missions/arcade data/missions/campaign data/missions/campaign/cadet data/missions/campaign/commando data/missions/campaign/ranger data/missions/multiplay mingw src
cheezmeister-guest at alioth.debian.org
cheezmeister-guest at alioth.debian.org
Wed Aug 13 22:13:50 UTC 2008
Author: cheezmeister-guest
Date: 2008-08-13 22:13:49 +0000 (Wed, 13 Aug 2008)
New Revision: 620
Modified:
tuxmath/trunk/data/images/factroids/Makefile
tuxmath/trunk/data/images/sprites/Makefile
tuxmath/trunk/data/missions/arcade/commando
tuxmath/trunk/data/missions/arcade/ranger
tuxmath/trunk/data/missions/campaign/cadet/cadet
tuxmath/trunk/data/missions/campaign/cadet/round2
tuxmath/trunk/data/missions/campaign/campaign
tuxmath/trunk/data/missions/campaign/commando/round2
tuxmath/trunk/data/missions/campaign/commando/round3
tuxmath/trunk/data/missions/campaign/ranger/round2
tuxmath/trunk/data/missions/campaign/ranger/round3
tuxmath/trunk/data/missions/multiplay/Makefile.am
tuxmath/trunk/data/missions/multiplay/ranger
tuxmath/trunk/data/missions/options
tuxmath/trunk/mingw/tuxmath.cbp
tuxmath/trunk/src/campaign.c
tuxmath/trunk/src/fileops.c
tuxmath/trunk/src/game.c
tuxmath/trunk/src/multiplayer.c
tuxmath/trunk/src/options.c
tuxmath/trunk/src/options.h
tuxmath/trunk/src/titlescreen.c
tuxmath/trunk/src/tuxmath.h
Log:
1: Fixed some segfaults implied in the change of NUM_HIGH_SCORE_LEVELS
2: Adjusted some difficulty settings for arcade (ranger & commando) and campaign modes
3: Tweaked location and duration of in-game messages
4: Added conditional omission of score count
Modified: tuxmath/trunk/data/images/factroids/Makefile
===================================================================
--- tuxmath/trunk/data/images/factroids/Makefile 2008-08-13 19:37:30 UTC (rev 619)
+++ tuxmath/trunk/data/images/factroids/Makefile 2008-08-13 22:13:49 UTC (rev 620)
@@ -71,12 +71,12 @@
dist_cometsDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_comets_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/gog/svntux/tuxmath/trunk/missing --run aclocal-1.10
+ACLOCAL = ${SHELL} /home/cheezmeister/code/c/tuxmath/trunk/missing --run aclocal-1.10
ALLOCA =
-AMTAR = ${SHELL} /home/gog/svntux/tuxmath/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/gog/svntux/tuxmath/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/gog/svntux/tuxmath/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/gog/svntux/tuxmath/trunk/missing --run automake-1.10
+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
AWK = mawk
BUILD_INCLUDED_LIBINTL = no
CATOBJEXT = .gmo
@@ -131,14 +131,14 @@
LTLIBOBJS =
LTLIBPTH =
LTLIBTHREAD =
-MAKEINFO = ${SHELL} /home/gog/svntux/tuxmath/trunk/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/cheezmeister/code/c/tuxmath/trunk/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
MSGFMT = /usr/bin/msgfmt
MSGFMT_015 = /usr/bin/msgfmt
MSGMERGE = /usr/bin/msgmerge
NAME_VERSION = tuxmath-1.6.3
NSIS =
-NSI_DLL_DIR = /home/gog/tuxmath_dll
+NSI_DLL_DIR = /home/cheezmeister/tuxmath_dll
NSI_INSTALL_DIR = mingw32
OBJEXT = o
PACKAGE = tuxmath
@@ -168,10 +168,10 @@
XGETTEXT_015 = /usr/bin/xgettext
YACC = yacc
YFLAGS =
-abs_builddir = /home/gog/svntux/tuxmath/trunk/data/images/factroids
-abs_srcdir = /home/gog/svntux/tuxmath/trunk/data/images/factroids
-abs_top_builddir = /home/gog/svntux/tuxmath/trunk
-abs_top_srcdir = /home/gog/svntux/tuxmath/trunk
+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__include = include
am__leading_dot = .
@@ -198,7 +198,7 @@
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/gog/svntux/tuxmath/trunk/install-sh
+install_sh = $(SHELL) /home/cheezmeister/code/c/tuxmath/trunk/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
Modified: tuxmath/trunk/data/images/sprites/Makefile
===================================================================
--- tuxmath/trunk/data/images/sprites/Makefile 2008-08-13 19:37:30 UTC (rev 619)
+++ tuxmath/trunk/data/images/sprites/Makefile 2008-08-13 22:13:49 UTC (rev 620)
@@ -71,12 +71,12 @@
dist_spritesDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_sprites_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/gog/svntux/tuxmath/trunk/missing --run aclocal-1.10
+ACLOCAL = ${SHELL} /home/cheezmeister/code/c/tuxmath/trunk/missing --run aclocal-1.10
ALLOCA =
-AMTAR = ${SHELL} /home/gog/svntux/tuxmath/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/gog/svntux/tuxmath/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/gog/svntux/tuxmath/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/gog/svntux/tuxmath/trunk/missing --run automake-1.10
+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
AWK = mawk
BUILD_INCLUDED_LIBINTL = no
CATOBJEXT = .gmo
@@ -131,14 +131,14 @@
LTLIBOBJS =
LTLIBPTH =
LTLIBTHREAD =
-MAKEINFO = ${SHELL} /home/gog/svntux/tuxmath/trunk/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/cheezmeister/code/c/tuxmath/trunk/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
MSGFMT = /usr/bin/msgfmt
MSGFMT_015 = /usr/bin/msgfmt
MSGMERGE = /usr/bin/msgmerge
NAME_VERSION = tuxmath-1.6.3
NSIS =
-NSI_DLL_DIR = /home/gog/tuxmath_dll
+NSI_DLL_DIR = /home/cheezmeister/tuxmath_dll
NSI_INSTALL_DIR = mingw32
OBJEXT = o
PACKAGE = tuxmath
@@ -168,10 +168,10 @@
XGETTEXT_015 = /usr/bin/xgettext
YACC = yacc
YFLAGS =
-abs_builddir = /home/gog/svntux/tuxmath/trunk/data/images/sprites
-abs_srcdir = /home/gog/svntux/tuxmath/trunk/data/images/sprites
-abs_top_builddir = /home/gog/svntux/tuxmath/trunk
-abs_top_srcdir = /home/gog/svntux/tuxmath/trunk
+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__include = include
am__leading_dot = .
@@ -198,7 +198,7 @@
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/gog/svntux/tuxmath/trunk/install-sh
+install_sh = $(SHELL) /home/cheezmeister/code/c/tuxmath/trunk/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
Modified: tuxmath/trunk/data/missions/arcade/commando
===================================================================
--- tuxmath/trunk/data/missions/arcade/commando 2008-08-13 19:37:30 UTC (rev 619)
+++ tuxmath/trunk/data/missions/arcade/commando 2008-08-13 22:13:49 UTC (rev 620)
@@ -20,12 +20,12 @@
max_subtrahend = 20
min_multiplier = -20
max_multiplier = 20
-min_multiplicand = -20
-max_multiplicand = 20
+min_multiplicand = -10
+max_multiplicand = 10
min_divisor = -20
max_divisor = 20
-min_quotient = -20
-max_quotient = 20
+min_quotient = -10
+max_quotient = 10
use_bkgd = 1
demo_mode = 0
save_summary = 1
@@ -52,7 +52,7 @@
speed = 0.25
max_speed = 10.00
speedup_factor = 1.125
-slow_after_wrong = 0
+slow_after_wrong = 1
max_questions = 25000
bonus_comet_interval = 20
fraction_to_keep = 1
Modified: tuxmath/trunk/data/missions/arcade/ranger
===================================================================
--- tuxmath/trunk/data/missions/arcade/ranger 2008-08-13 19:37:30 UTC (rev 619)
+++ tuxmath/trunk/data/missions/arcade/ranger 2008-08-13 22:13:49 UTC (rev 620)
@@ -19,7 +19,7 @@
min_subtrahend = 0
max_subtrahend = 20
min_multiplier = 0
-max_multiplier = 10
+max_multiplier = 20
min_multiplicand = 0
max_multiplicand = 10
min_divisor = 0
@@ -33,17 +33,17 @@
repeat_wrongs = 1
copies_repeated_wrongs = 1
format_add_answer_last = 1
-format_add_answer_first = 0
-format_add_answer_middle = 0
+format_add_answer_first = 1
+format_add_answer_middle = 1
format_sub_answer_last = 1
-format_sub_answer_first = 0
-format_sub_answer_middle = 0
+format_sub_answer_first = 1
+format_sub_answer_middle = 1
format_mult_answer_last = 1
-format_mult_answer_first = 0
-format_mult_answer_middle = 0
+format_mult_answer_first = 1
+format_mult_answer_middle = 1
format_div_answer_last = 1
-format_div_answer_first = 0
-format_div_answer_middle = 0
+format_div_answer_first = 1
+format_div_answer_middle = 1
max_answer = 100
starting_comets = 2
extra_comets_per_wave = 2
Modified: tuxmath/trunk/data/missions/campaign/cadet/cadet
===================================================================
--- tuxmath/trunk/data/missions/campaign/cadet/cadet 2008-08-13 19:37:30 UTC (rev 619)
+++ tuxmath/trunk/data/missions/campaign/cadet/cadet 2008-08-13 22:13:49 UTC (rev 620)
@@ -4,6 +4,7 @@
subtraction_allowed = 0
multiplication_allowed = 0
division_allowed = 0
+typing_practice_allowed = 1
allow_negatives = 0
max_formula_nums = 2
min_formula_nums = 2
Modified: tuxmath/trunk/data/missions/campaign/cadet/round2
===================================================================
--- tuxmath/trunk/data/missions/campaign/cadet/round2 2008-08-13 19:37:30 UTC (rev 619)
+++ tuxmath/trunk/data/missions/campaign/cadet/round2 2008-08-13 22:13:49 UTC (rev 620)
@@ -1,5 +1,6 @@
#cadet round 2
+typing_practice_allowed = 0
min_augend = 0
max_augend = 10
min_augend = 0
Modified: tuxmath/trunk/data/missions/campaign/campaign
===================================================================
--- tuxmath/trunk/data/missions/campaign/campaign 2008-08-13 19:37:30 UTC (rev 619)
+++ tuxmath/trunk/data/missions/campaign/campaign 2008-08-13 22:13:49 UTC (rev 620)
@@ -14,3 +14,5 @@
bonus_speed_ratio = 1.8
max_speed = 10.00
fraction_to_keep = 0.10
+keep_score = 0
+
Modified: tuxmath/trunk/data/missions/campaign/commando/round2
===================================================================
--- tuxmath/trunk/data/missions/campaign/commando/round2 2008-08-13 19:37:30 UTC (rev 619)
+++ tuxmath/trunk/data/missions/campaign/commando/round2 2008-08-13 22:13:49 UTC (rev 620)
@@ -17,4 +17,4 @@
max_minuend = 10
min_subtrahend = -10
max_subtrahend = 10
-avg_list_length = 150
+avg_list_length = 80
Modified: tuxmath/trunk/data/missions/campaign/commando/round3
===================================================================
--- tuxmath/trunk/data/missions/campaign/commando/round3 2008-08-13 19:37:30 UTC (rev 619)
+++ tuxmath/trunk/data/missions/campaign/commando/round3 2008-08-13 22:13:49 UTC (rev 620)
@@ -18,4 +18,4 @@
max_minuend = 20
min_subtrahend = -20
max_subtrahend = 20
-avg_list_length = 100
+avg_list_length = 40
Modified: tuxmath/trunk/data/missions/campaign/ranger/round2
===================================================================
--- tuxmath/trunk/data/missions/campaign/ranger/round2 2008-08-13 19:37:30 UTC (rev 619)
+++ tuxmath/trunk/data/missions/campaign/ranger/round2 2008-08-13 22:13:49 UTC (rev 620)
@@ -2,6 +2,7 @@
addition_allowed = 1
subtraction_allowed = 0
+allow_negatives = 1
min_multiplier = -20
max_multiplier = 20
min_multiplicand = -20
Modified: tuxmath/trunk/data/missions/campaign/ranger/round3
===================================================================
--- tuxmath/trunk/data/missions/campaign/ranger/round3 2008-08-13 19:37:30 UTC (rev 619)
+++ tuxmath/trunk/data/missions/campaign/ranger/round3 2008-08-13 22:13:49 UTC (rev 620)
@@ -2,6 +2,7 @@
addition_allowed = 1
subtraction_allowed = 1
+allow_negatives = 1
min_multiplier = -20
max_multiplier = 20
min_multiplicand = -20
Modified: tuxmath/trunk/data/missions/multiplay/Makefile.am
===================================================================
--- tuxmath/trunk/data/missions/multiplay/Makefile.am 2008-08-13 19:37:30 UTC (rev 619)
+++ tuxmath/trunk/data/missions/multiplay/Makefile.am 2008-08-13 22:13:49 UTC (rev 620)
@@ -1,10 +1,11 @@
-## Makefile.am for tuxmath - data/missions/arcade:
+## Makefile.am for tuxmath - data/missions/multiplay:
## Process with Automake to create Makefile.in
-arcadedir = $(pkgdatadir)/missions/arcade
+multiplaydir = $(pkgdatadir)/missions/multiplay
-dist_arcade_DATA = ace \
+dist_multiplay_DATA = ace \
commando \
ranger \
scout \
- space_cadet
+ space_cadet \
+ mpoptions
Modified: tuxmath/trunk/data/missions/multiplay/ranger
===================================================================
--- tuxmath/trunk/data/missions/multiplay/ranger 2008-08-13 19:37:30 UTC (rev 619)
+++ tuxmath/trunk/data/missions/multiplay/ranger 2008-08-13 22:13:49 UTC (rev 620)
@@ -18,7 +18,7 @@
min_subtrahend = 0
max_subtrahend = 20
min_multiplier = 0
-max_multiplier = 10
+max_multiplier = 20
min_multiplicand = 0
max_multiplicand = 10
min_divisor = 0
@@ -32,17 +32,17 @@
repeat_wrongs = 1
copies_repeated_wrongs = 1
format_add_answer_last = 1
-format_add_answer_first = 0
-format_add_answer_middle = 0
+format_add_answer_first = 1
+format_add_answer_middle = 1
format_sub_answer_last = 1
-format_sub_answer_first = 0
-format_sub_answer_middle = 0
+format_sub_answer_first = 1
+format_sub_answer_middle = 1
format_mult_answer_last = 1
-format_mult_answer_first = 0
-format_mult_answer_middle = 0
+format_mult_answer_first = 1
+format_mult_answer_middle = 1
format_div_answer_last = 1
-format_div_answer_first = 0
-format_div_answer_middle = 0
+format_div_answer_first = 1
+format_div_answer_middle = 1
max_answer = 100
starting_comets = 2
extra_comets_per_wave = 2
Modified: tuxmath/trunk/data/missions/options
===================================================================
--- tuxmath/trunk/data/missions/options 2008-08-13 19:37:30 UTC (rev 619)
+++ tuxmath/trunk/data/missions/options 2008-08-13 22:13:49 UTC (rev 620)
@@ -485,7 +485,11 @@
city_explode_handicap = 0.00
+# if keep_score is false, score will not be displayed in-game
+# default true
+keep_score = 1
+
############################################################
# #
# Managing User Settings #
Modified: tuxmath/trunk/mingw/tuxmath.cbp
===================================================================
--- tuxmath/trunk/mingw/tuxmath.cbp 2008-08-13 19:37:30 UTC (rev 619)
+++ tuxmath/trunk/mingw/tuxmath.cbp 2008-08-13 22:13:49 UTC (rev 620)
@@ -19,12 +19,6 @@
<Add option='-DDATA_PREFIX=\"../data\"' />
<Add option='-DVERSION=\"1.6.3\"' />
</Compiler>
- <Linker>
- <Add library="SDL" />
- <Add library="SDL_image" />
- <Add library="SDL_mixer" />
- <Add library="SDL_ttf" />
- </Linker>
</Target>
<Target title="WinRelease">
<Option platforms="Windows;" />
@@ -38,14 +32,8 @@
<Add option="-DNO_STDIO_REDIRECT" />
<Add option='-DPROGRAM_NAME=\"TuxMath\"' />
<Add option='-DDATA_PREFIX="\"C:/Program Files/TuxMath/data\""' />
- <Add option='-DVERSION=\"1.6.3\"' />
+ <Add option="-DVERSION=FULLVERSION_STRING" />
</Compiler>
- <Linker>
- <Add library="SDL" />
- <Add library="SDL_image" />
- <Add library="SDL_mixer" />
- <Add library="SDL_ttf" />
- </Linker>
</Target>
<Target title="NixDebug">
<Option platforms="Unix;" />
@@ -61,12 +49,6 @@
<Add option='-DLOCALEDIR=\\"/usr/local/share/locale\\"' />
<Add option='-DVERSION=\\"1.6.3\\"' />
</Compiler>
- <Linker>
- <Add library="SDL" />
- <Add library="SDL_image" />
- <Add library="SDL_mixer" />
- <Add library="SDL_ttf" />
- </Linker>
</Target>
<Target title="NixRelease">
<Option platforms="Unix;" />
@@ -84,12 +66,6 @@
<Add option='-DLOCALEDIR=\\"/usr/local/share/locale\\"' />
<Add option="-DVERSION=FULLVERSION_STRING" />
</Compiler>
- <Linker>
- <Add library="SDL" />
- <Add library="SDL_image" />
- <Add library="SDL_mixer" />
- <Add library="SDL_ttf" />
- </Linker>
</Target>
</Build>
<Compiler>
@@ -97,6 +73,14 @@
<Add directory="NOTE: CHANGE TO WHEREVER CONFIG.H IS LOCATED" />
<Add directory="../" />
</Compiler>
+ <Linker>
+ <Add library="SDL" />
+ <Add library="SDL_gfx" />
+ <Add library="SDL_image" />
+ <Add library="SDL_mixer" />
+ <Add library="SDL_ttf" />
+ <Add library="SDL_Pango" />
+ </Linker>
<Unit filename="../config.h" />
<Unit filename="SDL_win32_main.c">
<Option compilerVar="CC" />
@@ -131,6 +115,10 @@
<Option compilerVar="CC" />
<Option target="WinRelease" />
</Unit>
+ <Unit filename="../src/factroids.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="../src/factroids.h" />
<Unit filename="../src/fileops.c">
<Option compilerVar="CC" />
</Unit>
Modified: tuxmath/trunk/src/campaign.c
===================================================================
--- tuxmath/trunk/src/campaign.c 2008-08-13 19:37:30 UTC (rev 619)
+++ tuxmath/trunk/src/campaign.c 2008-08-13 22:13:49 UTC (rev 620)
@@ -10,7 +10,8 @@
#include "titlescreen.h"
#include "game.h"
#include "fileops.h"
-#include "mathcards.h"
+#include "mathcards.h"
+#include "options.h"
void briefPlayer(int stage); //show text introducing the given stage
void readStageSettings(int stage);
@@ -44,7 +45,7 @@
snprintf(roundmessage, 10, "Round %d", j);
game_set_start_message(roundmessage, "", "", "");
-
+ Opts_SetKeepScore(0);
MC_PrintMathOptions(stdout, 0);
printf("Starting game...\n");
gameresult = game();
Modified: tuxmath/trunk/src/fileops.c
===================================================================
--- tuxmath/trunk/src/fileops.c 2008-08-13 19:37:30 UTC (rev 619)
+++ tuxmath/trunk/src/fileops.c 2008-08-13 22:13:49 UTC (rev 620)
@@ -1378,6 +1378,11 @@
{
Opts_SetMaxComets(atoi(value));
}
+
+ else if (0 == strcasecmp(parameter, "keep_score"))
+ {
+ Opts_SetKeepScore(atoi(value) );
+ }
else
{
Modified: tuxmath/trunk/src/game.c
===================================================================
--- tuxmath/trunk/src/game.c 2008-08-13 19:37:30 UTC (rev 619)
+++ tuxmath/trunk/src/game.c 2008-08-13 22:13:49 UTC (rev 620)
@@ -164,6 +164,7 @@
static void game_set_message(game_message *,const char *,int x, int y);
static void game_clear_message(game_message*);
+static void game_clear_messages(void);
static void game_write_message(const game_message* msg);
static void game_write_messages(void);
static void draw_led_console(void);
@@ -466,10 +467,10 @@
void game_set_start_message(const char* m1, const char* m2,
const char* m3, const char* m4)
{
- game_set_message(&s1, m1, screen->w / 2 - 40, RES_Y * 0 / 4);
- game_set_message(&s2, m2, screen->w / 2 - 40, RES_Y * 1 / 4);
- game_set_message(&s3, m3, screen->w / 2 - 40, RES_Y * 2 / 4);
- game_set_message(&s4, m4, screen->w / 2 - 40, RES_Y * 3 / 4);
+ game_set_message(&s1, m1, screen->w / 2 - 40, RES_Y * 2 / 10);
+ game_set_message(&s2, m2, screen->w / 2 - 40, RES_Y * 3 / 10);
+ game_set_message(&s3, m3, screen->w / 2 - 40, RES_Y * 4 / 10);
+ game_set_message(&s4, m4, screen->w / 2 - 40, RES_Y * 5 / 10);
start_message_chosen = 1;
}
@@ -927,6 +928,15 @@
game_set_message(msg,"",0,0);
}
+void game_clear_messages()
+{
+ game_clear_message(&s1);
+ game_clear_message(&s2);
+ game_clear_message(&s3);
+ game_clear_message(&s4);
+ game_clear_message(&s5);
+}
+
void game_write_message(const game_message *msg)
{
SDL_Surface *surf;
@@ -1221,7 +1231,10 @@
void game_countdown(void)
{
if (level_start_wait <= 0)
+ {
+ game_clear_messages();
return;
+ }
//dim start messages
s1.alpha -= SDL_ALPHA_OPAQUE / LEVEL_START_WAIT_START;
@@ -2158,22 +2171,24 @@
sprintf(str, "%d", wave);
draw_numbers(str, offset+images[IMG_WAVE]->w + (images[IMG_NUMBERS]->w / 10), 0);
- /* Draw "score" label: */
- dest.x = (screen->w - ((images[IMG_NUMBERS]->w / 10) * 7) -
- images[IMG_SCORE]->w -
- images[IMG_STOP]->w - 5);
- dest.y = 0;
- dest.w = images[IMG_SCORE]->w;
- dest.h = images[IMG_SCORE]->h;
-
- SDL_BlitSurface(images[IMG_SCORE], NULL, screen, &dest);
-
- /* Draw score numbers: */
- sprintf(str, "%.6d", score);
- draw_numbers(str,
- screen->w - ((images[IMG_NUMBERS]->w / 10) * 6) - images[IMG_STOP]->w - 5,
- 0);
+ if (Opts_KeepScore() )
+ {
+ /* Draw "score" label: */
+ dest.x = (screen->w - ((images[IMG_NUMBERS]->w / 10) * 7) -
+ images[IMG_SCORE]->w -
+ images[IMG_STOP]->w - 5);
+ dest.y = 0;
+ dest.w = images[IMG_SCORE]->w;
+ dest.h = images[IMG_SCORE]->h;
+ SDL_BlitSurface(images[IMG_SCORE], NULL, screen, &dest);
+ /* Draw score numbers: */
+ sprintf(str, "%.6d", score);
+ draw_numbers(str,
+ screen->w - ((images[IMG_NUMBERS]->w / 10) * 6) - images[IMG_STOP]->w - 5,
+ 0);
+ }
+
/* Draw other players' scores */
if (mp_get_parameter(PLAYERS) && mp_get_parameter(MODE) == SCORE_SWEEP )
{
Modified: tuxmath/trunk/src/multiplayer.c
===================================================================
--- tuxmath/trunk/src/multiplayer.c 2008-08-13 19:37:30 UTC (rev 619)
+++ tuxmath/trunk/src/multiplayer.c 2008-08-13 22:13:49 UTC (rev 620)
@@ -243,5 +243,9 @@
for (i = 0; i < params[PLAYERS]; ++i)
if (pnames[i])
free(pnames[i]);
+
+ for (i = 0; i < NUM_PARAMS; ++i)
+ params[i] = 0;
+
inprogress = 0;
}
Modified: tuxmath/trunk/src/options.c
===================================================================
--- tuxmath/trunk/src/options.c 2008-08-13 19:37:30 UTC (rev 619)
+++ tuxmath/trunk/src/options.c 2008-08-13 22:13:49 UTC (rev 620)
@@ -444,6 +444,12 @@
game_options->last_score = val;
}
+void Opts_SetKeepScore(int val)
+{
+ game_options->keep_score = val;
+}
+
+
/* "Get" functions for tuxmath options struct: */
int Opts_PerUserConfig(void)
{
@@ -800,6 +806,15 @@
return (game_options->use_sound>0 && game_options->sound_hw_available);
}
+int Opts_KeepScore(void)
+{
+ if (!game_options)
+ {
+ fprintf(stderr, "\nOpts_KeepScore(): game_options not valid!\n");
+ return GAME_OPTS_INVALID;
+ }
+ return game_options->keep_score;
+}
/********************************************************************/
/* "private methods" (static functions only visible in options.c) */
/********************************************************************/
Modified: tuxmath/trunk/src/options.h
===================================================================
--- tuxmath/trunk/src/options.h 2008-08-13 19:37:30 UTC (rev 619)
+++ tuxmath/trunk/src/options.h 2008-08-13 22:13:49 UTC (rev 620)
@@ -71,6 +71,7 @@
int num_cities; /* MUST BE AN EVEN NUMBER! */
int num_bkgds;
int max_city_colors;
+ int keep_score;
} game_option_type;
@@ -134,6 +135,7 @@
/* Used by high score table code, not config file: */
void Opts_SetLastScore(int val);
+void Opts_SetKeepScore(int val);
/* "Get" functions for tuxmath options struct: */
int Opts_PerUserConfig(void);
@@ -165,6 +167,7 @@
float Opts_DangerLevelSpeedup(void);
float Opts_DangerLevelMax(void);
float Opts_CityExplHandicap(void);
+int Opts_KeepScore(void);
/* whether sound system is successfully initialized and sound files loaded: */
/* this flag is set by the program, not the user, and is not in the config file. */
Modified: tuxmath/trunk/src/titlescreen.c
===================================================================
--- tuxmath/trunk/src/titlescreen.c 2008-08-13 19:37:30 UTC (rev 619)
+++ tuxmath/trunk/src/titlescreen.c 2008-08-13 22:13:49 UTC (rev 620)
@@ -788,7 +788,7 @@
const char* menu_text[3] =
{"Score Sweep", "Elimination", "Main menu"};
//just leech settings from arcade modes
- const char* diff_menu_text[NUM_HIGH_SCORE_LEVELS + 1] =
+ const char* diff_menu_text[NUM_MATH_COMMAND_LEVELS + 1] =
{"Space Cadet", "Scout", "Ranger", "Ace", "Commando", "Main menu"};
@@ -806,16 +806,14 @@
diffsprites[5] = sprite_list[SPRITE_MAIN];
-// NotImplemented();
-// return 0;
-
while (1)
{
//choose difficulty
- difficulty = choose_menu_item(diff_menu_text, diffsprites, NUM_HIGH_SCORE_LEVELS + 1, NULL, NULL);
+ difficulty = choose_menu_item(diff_menu_text, diffsprites,
+ NUM_MATH_COMMAND_LEVELS + 1, NULL, NULL);
- if (difficulty == -1 || difficulty == NUM_HIGH_SCORE_LEVELS)
- break; //user chose main menu or escape
+ if (difficulty == -1 || difficulty >= NUM_MATH_COMMAND_LEVELS)
+ break; //user chose main menu or hit escape
//choose mode
mode = choose_menu_item(menu_text,modesprites,3,NULL,NULL);
@@ -882,7 +880,7 @@
choice = choose_menu_item(menu_text,sprites,7,NULL,NULL);
while (choice >= 0) {
- if (choice < NUM_HIGH_SCORE_LEVELS) {
+ if (choice < NUM_MATH_COMMAND_LEVELS) {
// Play arcade game
if (read_named_config_file(arcade_config_files[choice]))
{
@@ -918,7 +916,7 @@
fprintf(stderr, "\nCould not find %s config file\n",arcade_config_files[choice]);
}
- } else if (choice == NUM_HIGH_SCORE_LEVELS) {
+ } else if (choice == NUM_MATH_COMMAND_LEVELS) {
// Display the Hall of Fame
DisplayHighScores(CADET_HIGH_SCORE);
}
@@ -2053,7 +2051,7 @@
if (egg_active) { //if we need to, draw the egg cursor
//who knows why GetMouseState() doesn't take Sint16's...
- SDL_GetMouseState((int*)&cursor.x, (int*)&cursor.y);
+ SDL_GetMouseState((int*)(&cursor.x), (int*)(&cursor.y));
cursor.x -= egg->w / 2; //center vertically
SDL_BlitSurface(egg, NULL, screen, &cursor);
SDL_UpdateRect(screen, cursor.x, cursor.y, cursor.w, cursor.h);
Modified: tuxmath/trunk/src/tuxmath.h
===================================================================
--- tuxmath/trunk/src/tuxmath.h 2008-08-13 19:37:30 UTC (rev 619)
+++ tuxmath/trunk/src/tuxmath.h 2008-08-13 22:13:49 UTC (rev 620)
@@ -127,7 +127,11 @@
RANGER_HIGH_SCORE,
ACE_HIGH_SCORE,
COMMANDO_HIGH_SCORE,
- FACTORS_HIGH_SCORE,
+ NUM_MATH_COMMAND_LEVELS
+};
+
+enum {
+ FACTORS_HIGH_SCORE = NUM_MATH_COMMAND_LEVELS,
FRACTIONS_HIGH_SCORE,
NUM_HIGH_SCORE_LEVELS
};
More information about the Tux4kids-commits
mailing list