[netrek-cvs] client/netrekxp/src beeplite.c, 1.11, 1.12 local.c, 1.53, 1.54 map.c, 1.22, 1.23

[Bill Balcerski]

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25805/src

Modified Files:
	beeplite.c local.c map.c 
Log Message:
FPS support for beeplite and TTS messaging.

Index: beeplite.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/beeplite.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- beeplite.c	11 Jun 2006 09:36:25 -0000	1.11
+++ beeplite.c	22 Feb 2007 17:59:00 -0000	1.12
@@ -58,6 +58,7 @@
 
 void liteplanet(struct planet *l)
 {
+    beep_lite_cycle_time_planet = 10 * fps / 10;
     emph_planet_seq_n[l->pl_no] = beep_lite_cycle_time_planet;
     l->pl_flags |= PLREDRAW;			 /* Leave redraw on until * * 
 						  * done highlighting */
@@ -72,6 +73,7 @@
 
     redrawPlayer[j->p_no] = 1;
 
+    beep_lite_cycle_time_player = 10 * fps / 10;
     emph_player_seq_n[j->p_no] = beep_lite_cycle_time_player;
 }
 
@@ -296,7 +298,7 @@
 		    for (tts_len = 0; (*pm != '|' && tts_len < tts_max_len); tts_len++)
 		      lastIn[tts_len] = *pm++;
 		    lastIn[tts_len] = '\0';
-		    tts_timer = tts_time;
+		    tts_timer = tts_time * fps / 10;
 		}
 	        break;
 

Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- local.c	22 Feb 2007 17:44:34 -0000	1.53
+++ local.c	22 Feb 2007 17:59:00 -0000	1.54
@@ -1036,7 +1036,7 @@
 	    if ((useLite && emph_player_seq_n[j->p_no] > 0)
 	      && (liteflag & LITE_PLAYERS_LOCAL))
 	    {
-	        int seq_n = emph_player_seq_n[j->p_no] % emph_player_seql_frames;
+	        int seq_n = (emph_player_seq_n[j->p_no] * 10 / fps) % emph_player_seql_frames;
 	        W_WriteBitmap (dx - (emph_player_seql_width / 2),
 			       dy - (emph_player_seql_height / 2),
 			       emph_player_seql[seq_n],

Index: map.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- map.c	20 Sep 2006 17:08:31 -0000	1.22
+++ map.c	22 Feb 2007 17:59:00 -0000	1.23
@@ -484,7 +484,7 @@
 #ifdef BEEPLITE
         if (useLite && emph_planet_seq_n[l->pl_no] > 0)
 	{
-	    int seq_n = emph_planet_seq_n[l->pl_no] % emph_planet_seq_frames;
+	    int seq_n = (emph_planet_seq_n[l->pl_no] * 10 / fps) % emph_planet_seq_frames;
             
             if (planetBitmapGalaxy == 3)
             {
@@ -903,7 +903,7 @@
         if ((useLite && emph_player_seq_n[i] > 0)
 	  && (liteflag & LITE_PLAYERS_MAP))
 	{
-	    int seq_n = emph_player_seq_n[i] % emph_player_seq_frames;
+	    int seq_n = (emph_player_seq_n[i] * 10 / fps) % emph_player_seq_frames;
 
 	    W_WriteBitmap(dx - (emph_player_seq_width / 2 - 1),
 			  dy - (emph_player_seq_height / 2 + 1),