[Tux4kids-commits] r647 - in tuxtype/trunk: . src
sreyas-guest at alioth.debian.org
sreyas-guest at alioth.debian.org
Mon Aug 18 07:05:06 UTC 2008
Author: sreyas-guest
Date: 2008-08-18 07:05:04 +0000 (Mon, 18 Aug 2008)
New Revision: 647
Modified:
tuxtype/trunk/ChangeLog
tuxtype/trunk/ChangeLog~
tuxtype/trunk/src/practice.c
tuxtype/trunk/src/titlescreen.c
Log:
In practice pressing the down arrow presents the next phrase for practice and the escape key quits from the game
Modified: tuxtype/trunk/ChangeLog
===================================================================
--- tuxtype/trunk/ChangeLog 2008-08-18 06:17:26 UTC (rev 646)
+++ tuxtype/trunk/ChangeLog 2008-08-18 07:05:04 UTC (rev 647)
@@ -1,3 +1,7 @@
+18 Aug 2008 - svn revision 647
+[ Sreyas Kurumanghat <k.sreyas at gmail.com ]
+ - Added features to practice game. Now pressing the down arrow presents the next phrase for practice and the escape key quits from the game.
+
18 Aug 2008 - svn revision 646
[ Sreyas Kurumanghat <k.sreyas at gmail.com ]
- Added pango support and rendering to practice game.
Modified: tuxtype/trunk/ChangeLog~
===================================================================
--- tuxtype/trunk/ChangeLog~ 2008-08-18 06:17:26 UTC (rev 646)
+++ tuxtype/trunk/ChangeLog~ 2008-08-18 07:05:04 UTC (rev 647)
@@ -1,12 +1,18 @@
-<<<<<<< .working
+18 Aug 2008 - svn revision 646
+[ Sreyas Kurumanghat <k.sreyas at gmail.com ]
+ - Added features to practice game. Now pressing the down arrow presents the next phrase for practice and the escape key quits from the game.
+
+18 Aug 2008 - svn revision 646
+[ Sreyas Kurumanghat <k.sreyas at gmail.com ]
+ - Added pango support and rendering to practice game.
+
3 Aug 2008 - svn revision 599
[ Sreyas Kurumanghat <k.sreyas at gmail.com ]
- Added keypress details for wrong key pressed in practice.
-=======
+
2008-07-09 gettextize <bug-gnu-gettext at gnu.org>
->>>>>>> .merge-right.r618
-<<<<<<< .working
+
3 Aug 2008 - svn revision 580
[ Sreyas Kurumanghat <k.sreyas at gmail.com ]
- Added automatic keyboard layout generation in practice.c.
@@ -16,14 +22,6 @@
- finger|char|latin character
- Features added so that the information about the keyboard gets updated each time the game is run.
-=======
- * Makefile.am (SUBDIRS): Add po.
- (ACLOCAL_AMFLAGS): New variable.
- (EXTRA_DIST): Add config.rpath, m4/ChangeLog.
- * configure.ac (AC_CONFIG_FILES): Add po/Makefile.in.
-
-
->>>>>>> .merge-right.r618
13 Apr 2008 - svn revision 460
[ David Bruce <dbruce at tampabay.rr.com> ]
- fixed small typo bug in alphabet.c (thanks Patrick Winnertz)
Modified: tuxtype/trunk/src/practice.c
===================================================================
--- tuxtype/trunk/src/practice.c 2008-08-18 06:17:26 UTC (rev 646)
+++ tuxtype/trunk/src/practice.c 2008-08-18 07:05:04 UTC (rev 647)
@@ -235,11 +235,11 @@
if (event.key.keysym.sym == SDLK_ESCAPE)
quit = 1;
-
+ else
if (event.key.keysym.sym == SDLK_DOWN)
{
//practice next phase in list
- //a=a;
+ quit = 2;
}
else
{
@@ -443,7 +443,7 @@
if (c==wp+2){
//c++;
dst.x=40;
- dst.y=140;
+ dst.y=dst.y+dst.h;
mydest.y=dst.y;
mydest.h=screen->h-mydest.y;
next_line=1;
@@ -472,7 +472,7 @@
SDL_Flip(screen);
SDL_Delay(2500);
next_line=0;
- quit=1;
+ quit=2;
}
}
else
@@ -499,7 +499,7 @@
practice_unload_media();
- return 1;
+ return quit;
}
Modified: tuxtype/trunk/src/titlescreen.c
===================================================================
--- tuxtype/trunk/src/titlescreen.c 2008-08-18 06:17:26 UTC (rev 646)
+++ tuxtype/trunk/src/titlescreen.c 2008-08-18 07:05:04 UTC (rev 647)
@@ -726,12 +726,14 @@
{
fscanf( fp, "%[^\n]\n", str);
ConvertFromUTF8(phrase, str);
- Phrases( phrase );
+ if(Phrases( phrase )==1)
+ break;
//Practice();
- load_media();
- redraw = 1;
- } while (0);
+
+ } while (!feof(fp));
fclose(fp);
+ load_media();
+ redraw = 1;
//Phrases( phrase );
//Practice();
//load_media();
More information about the Tux4kids-commits
mailing list