[Tux4kids-commits] r307 - in tuxmath/trunk: data/images/sprites src
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Thu Oct 25 17:20:53 UTC 2007
Author: dbruce-guest
Date: 2007-10-25 17:20:52 +0000 (Thu, 25 Oct 2007)
New Revision: 307
Modified:
tuxmath/trunk/data/images/sprites/comet0.png
tuxmath/trunk/data/images/sprites/comet1.png
tuxmath/trunk/data/images/sprites/comet2.png
tuxmath/trunk/data/images/sprites/comet3.png
tuxmath/trunk/data/images/sprites/comet4.png
tuxmath/trunk/data/images/sprites/comet5.png
tuxmath/trunk/data/images/sprites/cometd.png
tuxmath/trunk/data/images/sprites/goldstar0.png
tuxmath/trunk/data/images/sprites/goldstar1.png
tuxmath/trunk/data/images/sprites/goldstard.png
tuxmath/trunk/data/images/sprites/help0.png
tuxmath/trunk/data/images/sprites/help1.png
tuxmath/trunk/data/images/sprites/help2.png
tuxmath/trunk/data/images/sprites/help3.png
tuxmath/trunk/data/images/sprites/helpd.png
tuxmath/trunk/data/images/sprites/lesson0.png
tuxmath/trunk/data/images/sprites/lesson1.png
tuxmath/trunk/data/images/sprites/lesson2.png
tuxmath/trunk/data/images/sprites/lesson3.png
tuxmath/trunk/data/images/sprites/lessond.png
tuxmath/trunk/data/images/sprites/no_goldstar0.png
tuxmath/trunk/data/images/sprites/no_goldstard.png
tuxmath/trunk/data/images/sprites/quit0.png
tuxmath/trunk/data/images/sprites/quit1.png
tuxmath/trunk/data/images/sprites/quit2.png
tuxmath/trunk/data/images/sprites/quit3.png
tuxmath/trunk/data/images/sprites/quit4.png
tuxmath/trunk/data/images/sprites/quit5.png
tuxmath/trunk/data/images/sprites/quit6.png
tuxmath/trunk/data/images/sprites/quit7.png
tuxmath/trunk/data/images/sprites/quit8.png
tuxmath/trunk/data/images/sprites/quitd.png
tuxmath/trunk/data/images/sprites/tux_config0.png
tuxmath/trunk/data/images/sprites/tux_config1.png
tuxmath/trunk/data/images/sprites/tux_config_brown0.png
tuxmath/trunk/data/images/sprites/tux_config_brown1.png
tuxmath/trunk/data/images/sprites/tux_config_brownd.png
tuxmath/trunk/data/images/sprites/tux_configd.png
tuxmath/trunk/data/images/sprites/tux_helmet_blue0.png
tuxmath/trunk/data/images/sprites/tux_helmet_blue1.png
tuxmath/trunk/data/images/sprites/tux_helmet_blue2.png
tuxmath/trunk/data/images/sprites/tux_helmet_blue3.png
tuxmath/trunk/data/images/sprites/tux_helmet_blue4.png
tuxmath/trunk/data/images/sprites/tux_helmet_blue5.png
tuxmath/trunk/data/images/sprites/tux_helmet_blued.png
tuxmath/trunk/data/images/sprites/tux_helmet_green0.png
tuxmath/trunk/data/images/sprites/tux_helmet_green1.png
tuxmath/trunk/data/images/sprites/tux_helmet_green2.png
tuxmath/trunk/data/images/sprites/tux_helmet_green3.png
tuxmath/trunk/data/images/sprites/tux_helmet_green4.png
tuxmath/trunk/data/images/sprites/tux_helmet_green5.png
tuxmath/trunk/data/images/sprites/tux_helmet_greend.png
tuxmath/trunk/data/images/sprites/tux_helmet_red0.png
tuxmath/trunk/data/images/sprites/tux_helmet_red1.png
tuxmath/trunk/data/images/sprites/tux_helmet_red2.png
tuxmath/trunk/data/images/sprites/tux_helmet_red3.png
tuxmath/trunk/data/images/sprites/tux_helmet_red4.png
tuxmath/trunk/data/images/sprites/tux_helmet_red5.png
tuxmath/trunk/data/images/sprites/tux_helmet_redd.png
tuxmath/trunk/data/images/sprites/tux_helmet_yellow0.png
tuxmath/trunk/data/images/sprites/tux_helmet_yellow1.png
tuxmath/trunk/data/images/sprites/tux_helmet_yellow2.png
tuxmath/trunk/data/images/sprites/tux_helmet_yellow3.png
tuxmath/trunk/data/images/sprites/tux_helmet_yellow4.png
tuxmath/trunk/data/images/sprites/tux_helmet_yellow5.png
tuxmath/trunk/data/images/sprites/tux_helmet_yellowd.png
tuxmath/trunk/src/titlescreen.c
Log:
work on menu sprite graphics (GIMP!)
Modified: tuxmath/trunk/data/images/sprites/comet0.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/comet1.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/comet2.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/comet3.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/comet4.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/comet5.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/cometd.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/goldstar0.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/goldstar1.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/goldstard.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/help0.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/help1.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/help2.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/help3.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/helpd.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/lesson0.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/lesson1.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/lesson2.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/lesson3.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/lessond.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/no_goldstar0.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/no_goldstard.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/quit0.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/quit1.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/quit2.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/quit3.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/quit4.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/quit5.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/quit6.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/quit7.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/quit8.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/quitd.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_config0.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_config1.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_config_brown0.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_config_brown1.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_config_brownd.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_configd.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_blue0.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_blue1.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_blue2.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_blue3.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_blue4.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_blue5.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_blued.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_green0.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_green1.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_green2.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_green3.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_green4.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_green5.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_greend.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_red0.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_red1.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_red2.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_red3.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_red4.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_red5.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_redd.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_yellow0.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_yellow1.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_yellow2.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_yellow3.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_yellow4.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_yellow5.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/sprites/tux_helmet_yellowd.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/src/titlescreen.c
===================================================================
--- tuxmath/trunk/src/titlescreen.c 2007-10-25 11:44:54 UTC (rev 306)
+++ tuxmath/trunk/src/titlescreen.c 2007-10-25 17:20:52 UTC (rev 307)
@@ -1112,8 +1112,8 @@
menu_button_rect[i].w = menu_text_rect[i].w + 30;
}
if (menu_sprite_rect != NULL) {
- menu_sprite_rect[i].x = menu_button_rect[i].x+6;
- menu_sprite_rect[i].y = menu_button_rect[i].y+4;
+ menu_sprite_rect[i].x = menu_button_rect[i].x+3;
+ menu_sprite_rect[i].y = menu_button_rect[i].y+3;
menu_sprite_rect[i].w = 40;
menu_sprite_rect[i].h = 50;
}
@@ -1424,11 +1424,11 @@
for (i = loc_screen_start, imod = 0; i < loc_screen_start+n_entries_per_screen && i < n_menu_entries; i++, imod++) {
if (i == loc) { //Draw text in yellow
- DrawButton(&menu_button_rect[imod], 15, SEL_RGBA);
+ DrawButton(&menu_button_rect[imod], 10, SEL_RGBA);
SDL_BlitSurface(menu_item_selected[loc], NULL, screen, &menu_text_rect[imod]);
}
else { //Draw text in white
- DrawButton(&menu_button_rect[imod], 15, REG_RGBA);
+ DrawButton(&menu_button_rect[imod], 10, REG_RGBA);
SDL_BlitSurface(menu_item_unselected[i], NULL, screen, &menu_text_rect[imod]);
}
if (menu_sprites != NULL && menu_sprites[i] != NULL)
@@ -1468,7 +1468,7 @@
// have to make sure we redraw in the sprite rects, too
SDL_BlitSurface(images[IMG_MENU_BKG], &menu_sprite_rect[imod], screen, &menu_sprite_rect[imod]);
}
- DrawButton(&menu_button_rect[imod], 15, REG_RGBA); // draw button
+ DrawButton(&menu_button_rect[imod], 10, REG_RGBA); // draw button
SDL_BlitSurface(menu_item_unselected[old_loc], NULL, screen, &menu_text_rect[imod]); // draw text
if (use_sprite) {
SDL_BlitSurface(menu_sprites[old_loc]->default_img, NULL, screen, &menu_sprite_rect[imod]);
@@ -1485,7 +1485,7 @@
SDL_BlitSurface(images[IMG_MENU_BKG], &menu_button_rect[imod], screen, &menu_button_rect[imod]);
if (use_sprite)
SDL_BlitSurface(images[IMG_MENU_BKG], &menu_sprite_rect[imod], screen, &menu_sprite_rect[imod]);
- DrawButton(&menu_button_rect[imod], 15, SEL_RGBA);
+ DrawButton(&menu_button_rect[imod], 10, SEL_RGBA);
SDL_BlitSurface(menu_item_selected[loc], NULL, screen, &menu_text_rect[imod]);
if (use_sprite) {
menu_sprites[loc]->cur = 0; // start at beginning of animation sequence
@@ -1502,7 +1502,7 @@
imod = loc-loc_screen_start;
//SDL_BlitSurface(images[IMG_MENU_BKG], &menu_button_rect[imod], screen, &menu_button_rect[imod]);
SDL_BlitSurface(images[IMG_MENU_BKG], &menu_sprite_rect[imod], screen, &menu_sprite_rect[imod]);
- DrawButton(&menu_button_rect[imod], 15, SEL_RGBA);
+ DrawButton(&menu_button_rect[imod], 10, SEL_RGBA);
//SDL_BlitSurface(menu_item_selected[loc], NULL, screen, &menu_text_rect[imod]);
// Note: even though the whole button was redrawn, we don't
// have to redraw the text & background as long as we don't
More information about the Tux4kids-commits
mailing list