[Tux4kids-commits] r1440 - branches/commonification/tuxtype/trunk/src
Bolesław Kulbabiński
bolekk-guest at alioth.debian.org
Sat Aug 15 21:12:24 UTC 2009
Author: bolekk-guest
Date: 2009-08-15 21:12:24 +0000 (Sat, 15 Aug 2009)
New Revision: 1440
Modified:
branches/commonification/tuxtype/trunk/src/fileops_media.c
branches/commonification/tuxtype/trunk/src/fileops_media.h
branches/commonification/tuxtype/trunk/src/laser.c
branches/commonification/tuxtype/trunk/src/laser.h
branches/commonification/tuxtype/trunk/src/titlescreen.c
Log:
moved laser.h image paths into fileops_media
Modified: branches/commonification/tuxtype/trunk/src/fileops_media.c
===================================================================
--- branches/commonification/tuxtype/trunk/src/fileops_media.c 2009-08-15 21:10:40 UTC (rev 1439)
+++ branches/commonification/tuxtype/trunk/src/fileops_media.c 2009-08-15 21:12:24 UTC (rev 1440)
@@ -32,17 +32,73 @@
"/images/backgrounds/4.jpg"
};
-static char* image_filenames[NUM_SOUNDS] = {
- "/images/num_0.png",
- "/images/num_1.png",
- "/images/num_2.png",
- "/images/num_3.png",
- "/images/num_4.png",
- "/images/num_5.png",
- "/images/num_6.png",
- "/images/num_7.png",
- "/images/num_8.png",
- "/images/num_9.png"
+static char* image_filenames[NUM_IMGS] = {
+ "/images/num_0.svg",
+ "/images/num_1.svg",
+ "/images/num_2.svg",
+ "/images/num_3.svg",
+ "/images/num_4.svg",
+ "/images/num_5.svg",
+ "/images/num_6.svg",
+ "/images/num_7.svg",
+ "/images/num_8.svg",
+ "/images/num_9.svg",
+ "/images/status/tux_helmet1.svg",
+ "/images/status/tux_helmet2.svg",
+ "/images/status/tux_helmet3.svg",
+ "/images/cities/city-blue.svg",
+ "/images/cities/csplode-blue-1.svg",
+ "/images/cities/csplode-blue-2.svg",
+ "/images/cities/csplode-blue-3.svg",
+ "/images/cities/csplode-blue-4.svg",
+ "/images/cities/csplode-blue-5.svg",
+ "/images/cities/cdead-blue.svg",
+ "/images/cities/city-green.svg",
+ "/images/cities/csplode-green-1.svg",
+ "/images/cities/csplode-green-2.svg",
+ "/images/cities/csplode-green-3.svg",
+ "/images/cities/csplode-green-4.svg",
+ "/images/cities/csplode-green-5.svg",
+ "/images/cities/cdead-green.svg",
+ "/images/cities/city-orange.svg",
+ "/images/cities/csplode-orange-1.svg",
+ "/images/cities/csplode-orange-2.svg",
+ "/images/cities/csplode-orange-3.svg",
+ "/images/cities/csplode-orange-4.svg",
+ "/images/cities/csplode-orange-5.svg",
+ "/images/cities/cdead-orange.svg",
+ "/images/cities/city-red.svg",
+ "/images/cities/csplode-red-1.svg",
+ "/images/cities/csplode-red-2.svg",
+ "/images/cities/csplode-red-3.svg",
+ "/images/cities/csplode-red-4.svg",
+ "/images/cities/csplode-red-5.svg",
+ "/images/cities/cdead-red.svg",
+ "/images/comets/comet1.svg",
+ "/images/comets/comet2.svg",
+ "/images/comets/comet3.svg",
+ "/images/comets/cometex1.svg",
+ "/images/comets/cometex2.svg",
+ "/images/tux/console.svg",
+ "/images/tux/tux-console1.svg",
+ "/images/tux/tux-console2.svg",
+ "/images/tux/tux-console3.svg",
+ "/images/tux/tux-console4.svg",
+ "/images/tux/tux-relax1.svg",
+ "/images/tux/tux-relax2.svg",
+ "/images/tux/tux-drat.svg",
+ "/images/tux/tux-yipe.svg",
+ "/images/tux/tux-yay1.svg",
+ "/images/tux/tux-yay2.svg",
+ "/images/tux/tux-yes1.svg",
+ "/images/tux/tux-yes2.svg",
+ "/images/tux/tux-sit.svg",
+ "/images/tux/tux-fist0.svg",
+ "/images/tux/tux-fist1.svg",
+ "/images/status/wave.svg",
+ "/images/status/score.svg",
+ "/images/status/numbers.svg",
+ "/images/status/gameover.svg"
};
static char* sprite_filenames[NUM_SPRITES] = {
@@ -54,7 +110,8 @@
"/images/tux/run",
"/images/tux/gulp",
"/images/tux/win",
- "/images/tux/yipe"
+ "/images/tux/yipe",
+ "/images/cities/shield"
};
static char* sound_filenames[NUM_SOUNDS] = {
@@ -185,15 +242,24 @@
images[id] = NULL;
if(!settings.use_english)
+ {
sprintf(fn, "%s%s", settings.theme_data_path, image_filenames[id]);
- if(!CheckFile(fn))
+ if(rect)
+ images[id] = LoadImageOfBoundingBox(fn, IMG_ALPHA, rect->w, rect->h);
+ else
+ images[id] = LoadImage(fn, IMG_ALPHA);
+ }
+
+ if(NULL == images[id])
+ {
sprintf(fn, "%s%s", settings.default_data_path, image_filenames[id]);
- if(rect)
- images[id] = LoadImageOfBoundingBox(fn, IMG_ALPHA, rect->w, rect->h);
- else
- images[id] = LoadImage(fn, IMG_ALPHA);
+ if(rect)
+ images[id] = LoadImageOfBoundingBox(fn, IMG_ALPHA, rect->w, rect->h);
+ else
+ images[id] = LoadImage(fn, IMG_ALPHA);
+ }
if(NULL == images[id])
{
Modified: branches/commonification/tuxtype/trunk/src/fileops_media.h
===================================================================
--- branches/commonification/tuxtype/trunk/src/fileops_media.h 2009-08-15 21:10:40 UTC (rev 1439)
+++ branches/commonification/tuxtype/trunk/src/fileops_media.h 2009-08-15 21:12:24 UTC (rev 1440)
@@ -41,6 +41,62 @@
IMG_NUM_7,
IMG_NUM_8,
IMG_NUM_9,
+ IMG_TUX_HELMET1,
+ IMG_TUX_HELMET2,
+ IMG_TUX_HELMET3,
+ IMG_CITY_BLUE,
+ IMG_CITY_BLUE_EXPL1,
+ IMG_CITY_BLUE_EXPL2,
+ IMG_CITY_BLUE_EXPL3,
+ IMG_CITY_BLUE_EXPL4,
+ IMG_CITY_BLUE_EXPL5,
+ IMG_CITY_BLUE_DEAD,
+ IMG_CITY_GREEN,
+ IMG_CITY_GREEN_EXPL1,
+ IMG_CITY_GREEN_EXPL2,
+ IMG_CITY_GREEN_EXPL3,
+ IMG_CITY_GREEN_EXPL4,
+ IMG_CITY_GREEN_EXPL5,
+ IMG_CITY_GREEN_DEAD,
+ IMG_CITY_ORANGE,
+ IMG_CITY_ORANGE_EXPL1,
+ IMG_CITY_ORANGE_EXPL2,
+ IMG_CITY_ORANGE_EXPL3,
+ IMG_CITY_ORANGE_EXPL4,
+ IMG_CITY_ORANGE_EXPL5,
+ IMG_CITY_ORANGE_DEAD,
+ IMG_CITY_RED,
+ IMG_CITY_RED_EXPL1,
+ IMG_CITY_RED_EXPL2,
+ IMG_CITY_RED_EXPL3,
+ IMG_CITY_RED_EXPL4,
+ IMG_CITY_RED_EXPL5,
+ IMG_CITY_RED_DEAD,
+ IMG_COMET1,
+ IMG_COMET2,
+ IMG_COMET3,
+ IMG_COMETEX1,
+ IMG_COMETEX2,
+ IMG_CONSOLE,
+ IMG_TUX_CONSOLE1,
+ IMG_TUX_CONSOLE2,
+ IMG_TUX_CONSOLE3,
+ IMG_TUX_CONSOLE4,
+ IMG_TUX_RELAX1,
+ IMG_TUX_RELAX2,
+ IMG_TUX_DRAT,
+ IMG_TUX_YIPE,
+ IMG_TUX_YAY1,
+ IMG_TUX_YAY2,
+ IMG_TUX_YES1,
+ IMG_TUX_YES2,
+ IMG_TUX_SIT,
+ IMG_TUX_FIST1,
+ IMG_TUX_FIST2,
+ IMG_WAVE,
+ IMG_SCORE,
+ IMG_NUMBERS,
+ IMG_GAMEOVER,
NUM_IMGS
};
@@ -49,11 +105,12 @@
ANIM_FISHY,
ANIM_SPLAT,
ANIM_TUX_WALKING,
- ANIM_TUX_STANDING,
- ANIM_TUX_RUNNING,
- ANIM_TUX_GULPING,
- ANIM_TUX_WINNING,
- ANIM_TUX_YIPING,
+ ANIM_TUX_STANDING,
+ ANIM_TUX_RUNNING,
+ ANIM_TUX_GULPING,
+ ANIM_TUX_WINNING,
+ ANIM_TUX_YIPING,
+ ANIM_SHIELD,
NUM_SPRITES
};
Modified: branches/commonification/tuxtype/trunk/src/laser.c
===================================================================
--- branches/commonification/tuxtype/trunk/src/laser.c 2009-08-15 21:10:40 UTC (rev 1439)
+++ branches/commonification/tuxtype/trunk/src/laser.c 2009-08-15 21:12:24 UTC (rev 1440)
@@ -36,7 +36,6 @@
/* Local (to laser.c) 'globals': */
static sprite* shield = NULL;
-static SDL_Surface* images[NUM_IMAGES] = {NULL};
static int wave, speed, score, pre_wave_score, num_attackers, distanceMoved;
static wchar_t ans[NUM_ANS];
@@ -90,8 +89,8 @@
/* Clear window: */
- SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 0, 0, 0));
- SDL_Flip(screen);
+ SDL_FillRect(GetScreen(), NULL, SDL_MapRGB(GetScreen()->format, 0, 0, 0));
+ SDL_Flip(GetScreen());
/* --- MAIN GAME LOOP: --- */
@@ -360,7 +359,7 @@
comets[i].x = comets[i].x + 0;
comets[i].y = comets[i].y + speed;
- if (comets[i].y >= (screen->h - images[IMG_CITY_BLUE]->h) && comets[i].expl == 0) {
+ if (comets[i].y >= (screen->h - GetImage(IMG_CITY_BLUE)->h) && comets[i].expl == 0) {
/* Disable shields or destroy city: */
@@ -474,31 +473,31 @@
dest.x = 0;
dest.y = 0;
- dest.w = images[IMG_WAVE]->w;
- dest.h = images[IMG_WAVE]->h;
+ dest.w = GetImage(IMG_WAVE)->w;
+ dest.h = GetImage(IMG_WAVE)->h;
- SDL_BlitSurface(images[IMG_WAVE], NULL, screen, &dest);
+ SDL_BlitSurface(GetImage(IMG_WAVE), NULL, GetScreen(), &dest);
sprintf(str, "%d", wave);
- laser_draw_numbers(str, images[IMG_WAVE]->w + (images[IMG_NUMBERS]->w / 10));
+ laser_draw_numbers(str, GetImage(IMG_WAVE)->w + (GetImage(IMG_NUMBERS)->w / 10));
/* Draw score: */
- dest.x = (screen->w - ((images[IMG_NUMBERS]->w / 10) * 7) - images[IMG_SCORE]->w);
+ dest.x = (screen->w - ((GetImage(IMG_NUMBERS)->w / 10) * 7) - GetImage(IMG_SCORE)->w);
dest.y = 0;
- dest.w = images[IMG_SCORE]->w;
- dest.h = images[IMG_SCORE]->h;
+ dest.w = GetImage(IMG_SCORE)->w;
+ dest.h = GetImage(IMG_SCORE)->h;
- SDL_BlitSurface(images[IMG_SCORE], NULL, screen, &dest);
-
+ SDL_BlitSurface(GetImage(IMG_SCORE), NULL, GetScreen(), &dest);
+
sprintf(str, "%.6d", score);
- laser_draw_numbers(str, screen->w - ((images[IMG_NUMBERS]->w / 10) * 6));
-
-
+ laser_draw_numbers(str, GetScreen()->w - ((GetImage(IMG_NUMBERS)->w / 10) * 6));
+
+
/* Draw comets: */
-
- for (i = 0; i < MAX_COMETS; i++)
+
+ for (i = 0; i < MAX_COMETS; i++)
if (comets[i].alive) {
/* Decide which image to display: */
@@ -506,16 +505,15 @@
img = IMG_COMET1 + ((frame + i) % 3);
else
img = (IMG_COMETEX2 - (comets[i].expl / (COMET_EXPL_START / 2)));
-
/* Draw it! */
- dest.x = comets[i].x - (images[img]->w / 2);
- dest.y = comets[i].y - images[img]->h;
- dest.w = images[img]->w;
- dest.h = images[img]->h;
-
- SDL_BlitSurface(images[img], NULL, screen, &dest);
+ dest.x = comets[i].x - (GetImage(img)->w / 2);
+ dest.y = comets[i].y - GetImage(img)->h;
+ dest.w = GetImage(img)->w;
+ dest.h = GetImage(img)->h;
+
+ SDL_BlitSurface(GetImage(img), NULL, GetScreen(), &dest);
}
@@ -524,37 +522,36 @@
for (i = 0; i < MAX_COMETS; i++)
if (comets[i].alive && comets[i].expl == 0)
laser_draw_let(comets[i].ch, comets[i].x, comets[i].y);
-
+
/* Draw cities: */
-
+
if (frame%2 == 0) NextFrame(shield);
for (i = 0; i < NUM_CITIES; i++) {
/* Decide which image to display: */
-
+
if (cities[i].alive) {
if (cities[i].expl == 0)
img = IMG_CITY_BLUE;
else
img = (IMG_CITY_BLUE_EXPL5 - (cities[i].expl / (CITY_EXPL_START / 5)));
- } else
+ } else
img = IMG_CITY_BLUE_DEAD;
-
-
+
/* Change image to appropriate color: */
-
+
img += ((wave % MAX_CITY_COLORS) * (IMG_CITY_GREEN - IMG_CITY_BLUE));
-
-
+
+
/* Draw it! */
-
- dest.x = cities[i].x - (images[img]->w / 2);
- dest.y = (screen->h) - (images[img]->h);
- dest.w = (images[img]->w);
- dest.h = (images[img]->h);
-
- SDL_BlitSurface(images[img], NULL, screen, &dest);
+ dest.x = cities[i].x - (GetImage(img)->w / 2);
+ dest.y = (screen->h) - (GetImage(img)->h);
+ dest.w = (GetImage(img)->w);
+ dest.h = (GetImage(img)->h);
+
+ SDL_BlitSurface(GetImage(img), NULL, screen, &dest);
+
/* Draw sheilds: */
if (cities[i].shields) {
@@ -587,17 +584,15 @@
if (gameover > 0) {
- dest.x = (screen->w - images[IMG_GAMEOVER]->w) / 2;
- dest.y = (screen->h - images[IMG_GAMEOVER]->h) / 2;
- dest.w = images[IMG_GAMEOVER]->w;
- dest.h = images[IMG_GAMEOVER]->h;
-
- SDL_BlitSurface(images[IMG_GAMEOVER], NULL, screen, &dest);
+ dest.x = (GetScreen()->w - GetImage(IMG_GAMEOVER)->w) / 2;
+ dest.y = (GetScreen()->h - GetImage(IMG_GAMEOVER)->h) / 2;
+ dest.w = GetImage(IMG_GAMEOVER)->w;
+ dest.h = GetImage(IMG_GAMEOVER)->h;
+
+ SDL_BlitSurface(GetImage(IMG_GAMEOVER), NULL, GetScreen(), &dest);
}
-
-
+
/* Swap buffers: */
-
SDL_Flip(screen);
@@ -659,22 +654,22 @@
/* Left vs. Right - makes room for Tux and the console */
if (i < NUM_CITIES / 2)
{
- cities[i].x = (((screen->w / (NUM_CITIES + 1)) * i)
- + ((images[IMG_CITY_BLUE] -> w) / 2));
+ cities[i].x = (((GetScreen()->w / (NUM_CITIES + 1)) * i)
+ + ((GetImage(IMG_CITY_BLUE) -> w) / 2));
}
else
{
- cities[i].x = screen->w
- - screen->w/(NUM_CITIES + 1) * (i - NUM_CITIES/2)
- + images[IMG_CITY_BLUE]->w/2;
+ cities[i].x = GetScreen()->w
+ - GetScreen()->w/(NUM_CITIES + 1) * (i - NUM_CITIES/2)
+ + GetImage(IMG_CITY_BLUE)->w/2;
}
}
else
{
/* put them in order across the bottom of *
* the screen so we can do words in order!!! */
- cities[i].x = i*screen->w/(NUM_CITIES)
- + images[IMG_CITY_BLUE]->w/2;
+ cities[i].x = i*GetScreen()->w/(NUM_CITIES)
+ + GetImage(IMG_CITY_BLUE)->w/2;
}
}
}
@@ -707,9 +702,9 @@
RenderLetters(COMET_ZAP_FONT_SIZE);
/* Load images: */
- for (i = 0; i < NUM_IMAGES; i++)
- images[i] = LoadImageNoPrefix(image_filenames[i], IMG_ALPHA);
- shield = LoadSpriteNoPrefix( "/images/cities/shield", IMG_ALPHA );
+ for (i = IMG_TUX_HELMET1; i <= IMG_GAMEOVER; i++)
+ SetImage(i, NULL);
+ shield = GetSprite(ANIM_SHIELD);
// PauseLoadMedia();
}
@@ -717,15 +712,8 @@
/* --- unload all media --- */
static void laser_unload_data(void) {
- int i;
-
FreeLetters();
-
- for (i = 0; i < NUM_IMAGES; i++)
- SDL_FreeSurface(images[i]);
-
- FreeSprite(shield);
- shield = NULL;
+ shield = NULL;
}
@@ -909,42 +897,33 @@
cur_x = x;
-
/* Draw each character: */
-
for (i = 0; i < strlen(str); i++)
- {
- c = -1;
+ {
+ c = -1;
- /* Determine which character to display: */
-
- if (str[i] >= '0' && str[i] <= '9')
- c = str[i] - '0';
-
+ /* Determine which character to display: */
+ if (str[i] >= '0' && str[i] <= '9')
+ c = str[i] - '0';
- /* Display this character! */
-
- if (c != -1)
- {
- src.x = c * (images[IMG_NUMBERS]->w / 10);
- src.y = 0;
- src.w = (images[IMG_NUMBERS]->w / 10);
- src.h = images[IMG_NUMBERS]->h;
-
- dest.x = cur_x;
- dest.y = 0;
- dest.w = src.w;
- dest.h = src.h;
-
- SDL_BlitSurface(images[IMG_NUMBERS], &src,
- screen, &dest);
+ /* Display this character! */
+ if (c != -1)
+ {
+ src.x = c * (GetImage(IMG_NUMBERS)->w / 10);
+ src.y = 0;
+ src.w = (GetImage(IMG_NUMBERS)->w / 10);
+ src.h = GetImage(IMG_NUMBERS)->h;
+ dest.x = cur_x;
+ dest.y = 0;
+ dest.w = src.w;
+ dest.h = src.h;
+ SDL_BlitSurface(GetImage(IMG_NUMBERS), &src,
+ GetScreen(), &dest);
-
- /* Move the 'cursor' one character width: */
-
- cur_x = cur_x + (images[IMG_NUMBERS]->w / 10);
- }
+ /* Move the 'cursor' one character width: */
+ cur_x = cur_x + (GetImage(IMG_NUMBERS)->w / 10);
}
+ }
}
/* Draw a line: */
@@ -1071,12 +1050,12 @@
{
SDL_Rect dest;
- dest.x = (screen->w - images[i]->w) / 2;
- dest.y = (screen->h - images[i]->h);
- dest.w = images[i]->w;
- dest.h = images[i]->h;
+ dest.x = (screen->w - GetImage(i)->w) / 2;
+ dest.y = (screen->h - GetImage(i)->h);
+ dest.w = GetImage(i)->w;
+ dest.h = GetImage(i)->h;
- SDL_BlitSurface(images[i], NULL, screen, &dest);
+ SDL_BlitSurface(GetImage(i), NULL, GetScreen(), &dest);
}
Modified: branches/commonification/tuxtype/trunk/src/laser.h
===================================================================
--- branches/commonification/tuxtype/trunk/src/laser.h 2009-08-15 21:10:40 UTC (rev 1439)
+++ branches/commonification/tuxtype/trunk/src/laser.h 2009-08-15 21:12:24 UTC (rev 1440)
@@ -29,124 +29,4 @@
int x2, y2;
} laser_type;
-enum {
- IMG_TUX_HELMET1,
- IMG_TUX_HELMET2,
- IMG_TUX_HELMET3,
- IMG_CITY_BLUE,
- IMG_CITY_BLUE_EXPL1,
- IMG_CITY_BLUE_EXPL2,
- IMG_CITY_BLUE_EXPL3,
- IMG_CITY_BLUE_EXPL4,
- IMG_CITY_BLUE_EXPL5,
- IMG_CITY_BLUE_DEAD,
- IMG_CITY_GREEN,
- IMG_CITY_GREEN_EXPL1,
- IMG_CITY_GREEN_EXPL2,
- IMG_CITY_GREEN_EXPL3,
- IMG_CITY_GREEN_EXPL4,
- IMG_CITY_GREEN_EXPL5,
- IMG_CITY_GREEN_DEAD,
- IMG_CITY_ORANGE,
- IMG_CITY_ORANGE_EXPL1,
- IMG_CITY_ORANGE_EXPL2,
- IMG_CITY_ORANGE_EXPL3,
- IMG_CITY_ORANGE_EXPL4,
- IMG_CITY_ORANGE_EXPL5,
- IMG_CITY_ORANGE_DEAD,
- IMG_CITY_RED,
- IMG_CITY_RED_EXPL1,
- IMG_CITY_RED_EXPL2,
- IMG_CITY_RED_EXPL3,
- IMG_CITY_RED_EXPL4,
- IMG_CITY_RED_EXPL5,
- IMG_CITY_RED_DEAD,
- IMG_COMET1,
- IMG_COMET2,
- IMG_COMET3,
- IMG_COMETEX1,
- IMG_COMETEX2,
- IMG_CONSOLE,
- IMG_TUX_CONSOLE1,
- IMG_TUX_CONSOLE2,
- IMG_TUX_CONSOLE3,
- IMG_TUX_CONSOLE4,
- IMG_TUX_RELAX1,
- IMG_TUX_RELAX2,
- IMG_TUX_DRAT,
- IMG_TUX_YIPE,
- IMG_TUX_YAY1,
- IMG_TUX_YAY2,
- IMG_TUX_YES1,
- IMG_TUX_YES2,
- IMG_TUX_SIT,
- IMG_TUX_FIST1,
- IMG_TUX_FIST2,
- IMG_WAVE,
- IMG_SCORE,
- IMG_NUMBERS,
- IMG_GAMEOVER,
- NUM_IMAGES
-};
-
-
-static char* image_filenames[NUM_IMAGES] = {
- "/images/status/tux_helmet1.png",
- "/images/status/tux_helmet2.png",
- "/images/status/tux_helmet3.png",
- "/images/cities/city-blue.png",
- "/images/cities/csplode-blue-1.png",
- "/images/cities/csplode-blue-2.png",
- "/images/cities/csplode-blue-3.png",
- "/images/cities/csplode-blue-4.png",
- "/images/cities/csplode-blue-5.png",
- "/images/cities/cdead-blue.png",
- "/images/cities/city-green.png",
- "/images/cities/csplode-green-1.png",
- "/images/cities/csplode-green-2.png",
- "/images/cities/csplode-green-3.png",
- "/images/cities/csplode-green-4.png",
- "/images/cities/csplode-green-5.png",
- "/images/cities/cdead-green.png",
- "/images/cities/city-orange.png",
- "/images/cities/csplode-orange-1.png",
- "/images/cities/csplode-orange-2.png",
- "/images/cities/csplode-orange-3.png",
- "/images/cities/csplode-orange-4.png",
- "/images/cities/csplode-orange-5.png",
- "/images/cities/cdead-orange.png",
- "/images/cities/city-red.png",
- "/images/cities/csplode-red-1.png",
- "/images/cities/csplode-red-2.png",
- "/images/cities/csplode-red-3.png",
- "/images/cities/csplode-red-4.png",
- "/images/cities/csplode-red-5.png",
- "/images/cities/cdead-red.png",
- "/images/comets/comet1.png",
- "/images/comets/comet2.png",
- "/images/comets/comet3.png",
- "/images/comets/cometex1.png",
- "/images/comets/cometex2.png",
- "/images/tux/console.png",
- "/images/tux/tux-console1.png",
- "/images/tux/tux-console2.png",
- "/images/tux/tux-console3.png",
- "/images/tux/tux-console4.png",
- "/images/tux/tux-relax1.png",
- "/images/tux/tux-relax2.png",
- "/images/tux/tux-drat.png",
- "/images/tux/tux-yipe.png",
- "/images/tux/tux-yay1.png",
- "/images/tux/tux-yay2.png",
- "/images/tux/tux-yes1.png",
- "/images/tux/tux-yes2.png",
- "/images/tux/tux-sit.png",
- "/images/tux/tux-fist0.png",
- "/images/tux/tux-fist1.png",
- "/images/status/wave.png",
- "/images/status/score.png",
- "/images/status/numbers.png",
- "/images/status/gameover.png"
-};
-
#endif
Modified: branches/commonification/tuxtype/trunk/src/titlescreen.c
===================================================================
--- branches/commonification/tuxtype/trunk/src/titlescreen.c 2009-08-15 21:10:40 UTC (rev 1439)
+++ branches/commonification/tuxtype/trunk/src/titlescreen.c 2009-08-15 21:12:24 UTC (rev 1440)
@@ -38,7 +38,6 @@
X( RUN_INSTRUCTIONS ),\
X( RUN_COMET_ZAP ),\
X( RUN_LESSONS ),\
- X( RUN_MAIN_MENU ),\
X( RUN_EDIT_WORD_LIST ),\
X( RUN_PHRASE_TYPING ),\
X( RUN_INFO ),\
More information about the Tux4kids-commits
mailing list