[Tux4kids-commits] r172 - in tuxtype/trunk/tuxtype: . data/images
Karl Ove Hufthammer
huftis-guest at alioth.debian.org
Sun Apr 29 19:49:59 UTC 2007
Author: huftis-guest
Date: 2007-04-29 19:49:58 +0000 (Sun, 29 Apr 2007)
New Revision: 172
Added:
tuxtype/trunk/tuxtype/data/images/main_bkg.png
tuxtype/trunk/tuxtype/data/images/pract.png
Removed:
tuxtype/trunk/tuxtype/data/images/main_bkg.jpg
tuxtype/trunk/tuxtype/data/images/pract.jpg
Modified:
tuxtype/trunk/tuxtype/data/images/Makefile.am
tuxtype/trunk/tuxtype/data/images/Makefile.in
tuxtype/trunk/tuxtype/playgame.c
tuxtype/trunk/tuxtype/practice.c
tuxtype/trunk/tuxtype/scripting.c
tuxtype/trunk/tuxtype/theme.c
tuxtype/trunk/tuxtype/titlescreen.c
Log:
Reverted the main (non-photo) background images to PNG. The JPEG compression hurt them too much.
Modified: tuxtype/trunk/tuxtype/data/images/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/images/Makefile.am 2007-04-29 19:32:06 UTC (rev 171)
+++ tuxtype/trunk/tuxtype/data/images/Makefile.am 2007-04-29 19:49:58 UTC (rev 172)
@@ -32,7 +32,7 @@
kcas3_4.jpg\
left.png\
line2.png\
-main_bkg.jpg\
+main_bkg.png\
num_0.png\
nosound.png\
num_1.png\
@@ -44,7 +44,7 @@
num_7.png\
num_8.png\
num_9.png\
-pract.jpg\
+pract.png\
right.png\
splat0.png\
sound.png\
@@ -110,7 +110,7 @@
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images
$(INSTALL_DATA) $(srcdir)/line2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/line2.png
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images
- $(INSTALL_DATA) $(srcdir)/main_bkg.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/main_bkg.jpg
+ $(INSTALL_DATA) $(srcdir)/main_bkg.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/main_bkg.png
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images
$(INSTALL_DATA) $(srcdir)/num_0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_0.png
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images
@@ -134,7 +134,7 @@
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images
$(INSTALL_DATA) $(srcdir)/num_9.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_9.png
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images
- $(INSTALL_DATA) $(srcdir)/pract.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/pract.jpg
+ $(INSTALL_DATA) $(srcdir)/pract.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/pract.png
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images
$(INSTALL_DATA) $(srcdir)/right.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/right.png
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images
@@ -192,7 +192,7 @@
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas3_4.jpg
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/left.png
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/line2.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/main_bkg.jpg
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/main_bkg.png
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_0.png
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/nosound.png
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_1.png
@@ -204,7 +204,7 @@
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_7.png
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_8.png
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_9.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/pract.jpg
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/pract.png
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/right.png
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/splat0.png
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/sound.png
Modified: tuxtype/trunk/tuxtype/data/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/Makefile.in 2007-04-29 19:32:06 UTC (rev 171)
+++ tuxtype/trunk/tuxtype/data/images/Makefile.in 2007-04-29 19:49:58 UTC (rev 172)
@@ -193,7 +193,7 @@
kcas3_4.jpg\
left.png\
line2.png\
-main_bkg.jpg\
+main_bkg.png\
num_0.png\
nosound.png\
num_1.png\
@@ -205,7 +205,7 @@
num_7.png\
num_8.png\
num_9.png\
-pract.jpg\
+pract.png\
right.png\
splat0.png\
sound.png\
@@ -570,7 +570,7 @@
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images
$(INSTALL_DATA) $(srcdir)/line2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/line2.png
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images
- $(INSTALL_DATA) $(srcdir)/main_bkg.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/main_bkg.jpg
+ $(INSTALL_DATA) $(srcdir)/main_bkg.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/main_bkg.png
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images
$(INSTALL_DATA) $(srcdir)/num_0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_0.png
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images
@@ -594,7 +594,7 @@
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images
$(INSTALL_DATA) $(srcdir)/num_9.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_9.png
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images
- $(INSTALL_DATA) $(srcdir)/pract.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/pract.jpg
+ $(INSTALL_DATA) $(srcdir)/pract.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/pract.png
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images
$(INSTALL_DATA) $(srcdir)/right.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/right.png
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images
@@ -652,7 +652,7 @@
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas3_4.jpg
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/left.png
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/line2.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/main_bkg.jpg
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/main_bkg.png
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_0.png
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/nosound.png
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_1.png
@@ -664,7 +664,7 @@
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_7.png
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_8.png
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_9.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/pract.jpg
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/pract.png
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/right.png
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/splat0.png
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/sound.png
Deleted: tuxtype/trunk/tuxtype/data/images/main_bkg.jpg
===================================================================
(Binary files differ)
Copied: tuxtype/trunk/tuxtype/data/images/main_bkg.png (from rev 164, tuxtype/trunk/tuxtype/data/images/main_bkg.png)
Deleted: tuxtype/trunk/tuxtype/data/images/pract.jpg
===================================================================
(Binary files differ)
Copied: tuxtype/trunk/tuxtype/data/images/pract.png (from rev 164, tuxtype/trunk/tuxtype/data/images/pract.png)
Modified: tuxtype/trunk/tuxtype/playgame.c
===================================================================
--- tuxtype/trunk/tuxtype/playgame.c 2007-04-29 19:32:06 UTC (rev 171)
+++ tuxtype/trunk/tuxtype/playgame.c 2007-04-29 19:49:58 UTC (rev 172)
@@ -1088,7 +1088,7 @@
}
if (diflevel == INF_PRACT)
- sprintf(filename, "pract.jpg");
+ sprintf(filename, "pract.png");
else
sprintf(filename, "kcas%i_%i.jpg", diflevel+1, curlevel+1);
Modified: tuxtype/trunk/tuxtype/practice.c
===================================================================
--- tuxtype/trunk/tuxtype/practice.c 2007-04-29 19:32:06 UTC (rev 171)
+++ tuxtype/trunk/tuxtype/practice.c 2007-04-29 19:49:58 UTC (rev 172)
@@ -47,7 +47,7 @@
hand_loc.w = (hand[0]->w);
hand_loc.h = (hand[0]->h);
- bkg = LoadImage("main_bkg.jpg", IMG_ALPHA);
+ bkg = LoadImage("main_bkg.png", IMG_ALPHA);
font = LoadFont( ttf_font, 32 );
Modified: tuxtype/trunk/tuxtype/scripting.c
===================================================================
--- tuxtype/trunk/tuxtype/scripting.c 2007-04-29 19:32:06 UTC (rev 171)
+++ tuxtype/trunk/tuxtype/scripting.c 2007-04-29 19:49:58 UTC (rev 172)
@@ -743,7 +743,7 @@
// FILE *tempFile;
pointer = LoadImage( "right.png", IMG_ALPHA );
- bkg = LoadImage( "main_bkg.jpg", IMG_REGULAR );
+ bkg = LoadImage( "main_bkg.png", IMG_REGULAR );
SDL_ShowCursor(0);
Modified: tuxtype/trunk/tuxtype/theme.c
===================================================================
--- tuxtype/trunk/tuxtype/theme.c 2007-04-29 19:32:06 UTC (rev 171)
+++ tuxtype/trunk/tuxtype/theme.c 2007-04-29 19:49:58 UTC (rev 172)
@@ -183,7 +183,7 @@
useEnglish = old_useEnglish;
- bkg = LoadImage("main_bkg.jpg", IMG_REGULAR);
+ bkg = LoadImage("main_bkg.png", IMG_REGULAR);
left = LoadImage("left.png", IMG_ALPHA);
leftRect.w = left->w; leftRect.h = left->h;
Modified: tuxtype/trunk/tuxtype/titlescreen.c
===================================================================
--- tuxtype/trunk/tuxtype/titlescreen.c 2007-04-29 19:32:06 UTC (rev 171)
+++ tuxtype/trunk/tuxtype/titlescreen.c 2007-04-29 19:49:58 UTC (rev 172)
@@ -170,7 +170,7 @@
title = LoadImage( "title1.png", IMG_ALPHA );
speaker = LoadImage( "sound.png", IMG_ALPHA );
speakeroff = LoadImage( "nosound.png", IMG_ALPHA );
- bkg = LoadImage( "main_bkg.jpg", IMG_REGULAR );
+ bkg = LoadImage( "main_bkg.png", IMG_REGULAR );
sel = LoadSprite("menu/sel", IMG_ALPHA);
reg = LoadSprite("menu/reg", IMG_ALPHA);
@@ -1096,7 +1096,7 @@
}
SDL_FreeSurface(bkg);
- bkg = LoadImage("main_bkg.jpg", IMG_REGULAR);
+ bkg = LoadImage("main_bkg.png", IMG_REGULAR);
left = LoadImage("left.png", IMG_ALPHA);
leftRect.w = left->w; leftRect.h = left->h;
More information about the Tux4kids-commits
mailing list