[Tux4kids-commits] r1225 - in tuxmath/branches/lan: data/images/sprites server src

[akash gangil]

Author: gangil-guest
Date: 2009-07-17 21:31:03 +0000 (Fri, 17 Jul 2009)
New Revision: 1225

Modified:
   tuxmath/branches/lan/data/images/sprites/Makefile.am
   tuxmath/branches/lan/server/server.c
   tuxmath/branches/lan/src/titlescreen.c
Log:
Adding sprite for the LAN option in the main menu

Modified: tuxmath/branches/lan/data/images/sprites/Makefile.am
===================================================================
--- tuxmath/branches/lan/data/images/sprites/Makefile.am	2009-07-17 19:53:28 UTC (rev 1224)
+++ tuxmath/branches/lan/data/images/sprites/Makefile.am	2009-07-17 21:31:03 UTC (rev 1225)
@@ -47,6 +47,11 @@
   help2.png \
   help3.png \
   helpd.png \
+  lan0.png \
+  lan1.png \
+  lan2.png \
+  lan3.png \
+  land.png \
   lesson0.png \
   lesson1.png \
   lesson2.png \

Modified: tuxmath/branches/lan/server/server.c
===================================================================
--- tuxmath/branches/lan/server/server.c	2009-07-17 19:53:28 UTC (rev 1224)
+++ tuxmath/branches/lan/server/server.c	2009-07-17 21:31:03 UTC (rev 1225)
@@ -508,16 +508,8 @@
   //send the next question to everyone:
   game_msg_next_question();
 
-  if(!MC_TotalQuestionsLeft())
-  {
-    if(!no_questions_left())
-    printf(" no_questions_left() failed..\n"); 
-  }
-  if (MC_MissionAccomplished())
-  {
-    if(!mission_accomplished())
-    printf(" mission_accomplished() failed..\n");  
-  }
+    if(!send_counter_updates())
+    printf("the function send_counter_updates() failed..\n");
 }
 
 
@@ -538,16 +530,8 @@
   //send the next question to everyone:
   game_msg_next_question();
 
-  if(!MC_TotalQuestionsLeft())
-  {
-    if(!no_questions_left())
-    printf(" no_questions_left() failed..\n"); 
-  }
-  if (MC_MissionAccomplished())
-  {
-    if(!mission_accomplished())
-    printf(" mission_accomplished() failed..\n");  
-  }
+  if(!send_counter_updates())
+    printf("the function send_counter_updates() failed..\n");
 }
 
 
@@ -760,6 +744,7 @@
     snprintf(buf, NET_BUF_LEN, "%s\t%d", "TOTAL_QUESTIONS", total_questions);
     transmit_all(buf);
   }
+  return 1;
 }
 
 

Modified: tuxmath/branches/lan/src/titlescreen.c
===================================================================
--- tuxmath/branches/lan/src/titlescreen.c	2009-07-17 19:53:28 UTC (rev 1224)
+++ tuxmath/branches/lan/src/titlescreen.c	2009-07-17 21:31:03 UTC (rev 1225)
@@ -93,6 +93,7 @@
   SPRITE_TROPHY,
   SPRITE_CREDITS,
   SPRITE_ALONE,
+  SPRITE_LAN,
   SPRITE_FRIENDS,
   SPRITE_FACTOROIDS,
   SPRITE_FACTORS,
@@ -123,6 +124,7 @@
   "trophy",
   "credits",
   "alone", 
+  "lan",
   "friends", 
   "factoroids",
   "factors",
@@ -664,6 +666,7 @@
 
   // Set up the sprites
   sprites[0] = sprite_list[SPRITE_ALONE];
+  sprites[1] = sprite_list[SPRITE_LAN];
   sprites[2] = sprite_list[SPRITE_FRIENDS];
   sprites[3] = sprite_list[SPRITE_FACTOROIDS];
   sprites[4] = sprite_list[SPRITE_HELP];