Update of /cvsroot/netrek/client/netrekxp/src
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10133
Modified Files:
beeplite.c local.c short.c socket.c
Log Message:
Restore explosions (ships, torp, plasma) animation to original design
which is full animation over 1 second. Changing from 5->10 updates/sec
altered the animation speed of these events.
Also changed beeplite animation length in a similiar manner. Animation
speed for beeplite was not changed.
Index: short.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/short.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- short.c 9 Jun 2009 00:08:04 -0000 1.31
+++ short.c 24 Jun 2009 00:52:22 -0000 1.32
@@ -1100,7 +1100,7 @@
{
/* Fuse requires minimum value of 2 to ensure a redraw, fuse decremented
before drawing torp in local.c */
- thetorp->t_fuse = MAX(2, BMP_TORPDET_FRAMES * server_ups / 10);
+ thetorp->t_fuse = MAX(2, BMP_TORPDET_FRAMES * server_ups / 5);
}
}
} /* if */
Index: beeplite.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/beeplite.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- beeplite.c 8 Jun 2009 22:26:07 -0000 1.18
+++ beeplite.c 24 Jun 2009 00:52:22 -0000 1.19
@@ -55,7 +55,7 @@
void liteplanet(struct planet *l)
{
- beep_lite_cycle_time_planet = 10 * server_ups / 10;
+ beep_lite_cycle_time_planet = 10 * server_ups / 5;
emph_planet_seq_n[l->pl_no] = beep_lite_cycle_time_planet;
l->pl_flags |= PLREDRAW; /* Leave redraw on until * *
* done highlighting */
@@ -68,7 +68,7 @@
redrawPlayer[j->p_no] = 1;
- beep_lite_cycle_time_player = 10 * server_ups / 10;
+ beep_lite_cycle_time_player = 10 * server_ups / 5;
emph_player_seq_n[j->p_no] = beep_lite_cycle_time_player;
}
@@ -243,7 +243,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 * server_ups / 10;
+ tts_timer = tts_time * server_ups / 5;
}
break;
Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- local.c 23 Jun 2009 22:18:03 -0000 1.122
+++ local.c 24 Jun 2009 00:52:22 -0000 1.123
@@ -1651,7 +1651,7 @@
{
int i;
- i = j->p_explode * 10 / server_ups;
+ i = j->p_explode * 5 / server_ups;
#ifdef SOUND
if (j->p_explode == 1)
@@ -2148,7 +2148,7 @@
else
{
/* Leave the torp to explode on its own */
- k->t_updateFuse = BMP_TORPDET_FRAMES * server_ups / 10;
+ k->t_updateFuse = BMP_TORPDET_FRAMES * server_ups / 5;
k->t_clear = 1;
}
}
@@ -2180,7 +2180,7 @@
if (k->t_status == TEXPLODE)
{
k->t_fuse--;
- frame = k->t_fuse * 10 / server_ups;
+ frame = k->t_fuse * 5 / server_ups;
if (k->t_fuse < 0)
{
@@ -2193,7 +2193,7 @@
frame = BMP_TORPDET_FRAMES - 1;
#ifdef SOUND
- if (k->t_fuse == (MAX(2, BMP_TORPDET_FRAMES * server_ups / 10) - 1))
+ if (k->t_fuse == (MAX(2, BMP_TORPDET_FRAMES * server_ups / 5) - 1))
{
SetDistAngle(dx, dy);
// At short distances, don't use angular sound
@@ -2254,7 +2254,7 @@
{
k->t_fuse++;
- frame = k->t_fuse * 10 / server_ups;
+ frame = k->t_fuse * 5 / server_ups;
if ((frame > BMP_TORP_FRAMES - 1) || (frame < 0))
{
@@ -2376,7 +2376,7 @@
else
{
/* Leave the plasma to explode on its own */
- pt->pt_updateFuse = BMP_TORPDET_FRAMES * server_ups / 10;
+ pt->pt_updateFuse = BMP_TORPDET_FRAMES * server_ups / 5;
pt->pt_clear = 1;
}
}
@@ -2408,7 +2408,7 @@
if (pt->pt_status == PTEXPLODE)
{
pt->pt_fuse--;
- frame = pt->pt_fuse * 10 / server_ups;
+ frame = pt->pt_fuse * 5 / server_ups;
if (pt->pt_fuse < 0)
{
@@ -2420,7 +2420,7 @@
frame = BMP_TORPDET_FRAMES - 1;
#ifdef SOUND
- if (pt->pt_fuse == (MAX(2, BMP_TORPDET_FRAMES * server_ups / 10) - 1))
+ if (pt->pt_fuse == (MAX(2, BMP_TORPDET_FRAMES * server_ups / 5) - 1))
{
SetDistAngle(dx, dy);
// At short distances, don't use angular sound
@@ -2483,7 +2483,7 @@
{
pt->pt_fuse++;
- frame = pt->pt_fuse * 10 / server_ups;
+ frame = pt->pt_fuse * 5 / server_ups;
if ((frame > BMP_TORP_FRAMES - 1) || (frame < 0))
{
@@ -2651,7 +2651,7 @@
break;
case SHP_FBOOM:
k->t_fuse--;
- frame = k->t_fuse * 10 / server_ups;
+ frame = k->t_fuse * 5 / server_ups;
if (k->t_fuse < 0)
{
@@ -2663,7 +2663,7 @@
frame = BMP_FIGHTERDET_FRAMES - 1;
#ifdef SOUND
- if (k->t_fuse == (MAX(2, BMP_FIGHTERDET_FRAMES * server_ups / 10) - 1))
+ if (k->t_fuse == (MAX(2, BMP_FIGHTERDET_FRAMES * server_ups / 5) - 1))
{
SetDistAngle(dx, dy);
// At short distances, don't use angular sound
@@ -2693,7 +2693,7 @@
case SHP_PBOOM:
case SHP_DBOOM:
k->t_fuse--;
- frame = k->t_fuse * 10 / server_ups;
+ frame = k->t_fuse * 5 / server_ups;
if (k->t_fuse < 0)
{
@@ -2705,7 +2705,7 @@
frame = BMP_DRONEDET_FRAMES - 1;
#ifdef SOUND
- if (k->t_fuse == (MAX(2, BMP_DRONEDET_FRAMES * server_ups / 10) - 1))
+ if (k->t_fuse == (MAX(2, BMP_DRONEDET_FRAMES * server_ups / 5) - 1))
{
SetDistAngle(dx, dy);
// At short distances, don't use angular sound
Index: socket.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/socket.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- socket.c 23 Jun 2009 22:18:03 -0000 1.76
+++ socket.c 24 Jun 2009 00:52:22 -0000 1.77
@@ -1315,7 +1315,7 @@
{
/* Fuse requires minimum value of 2 to ensure a redraw, fuse decremented
before drawing torp in local.c */
- thetorp->t_fuse = MAX(2, BMP_TORPDET_FRAMES * server_ups / 10);
+ thetorp->t_fuse = MAX(2, BMP_TORPDET_FRAMES * server_ups / 5);
}
}
}
@@ -1991,7 +1991,7 @@
{
/* Fuse requires minimum value of 2 to ensure a redraw, fuse decremented
before drawing torp in local.c */
- thetorp->pt_fuse = MAX(2, BMP_TORPDET_FRAMES * server_ups / 10);
+ thetorp->pt_fuse = MAX(2, BMP_TORPDET_FRAMES * server_ups / 5);
}
}
}
@@ -3426,12 +3426,12 @@
if(thetorp->t_shape == SHP_FIGHTER)
{
shape = SHP_FBOOM;
- thetorp->t_fuse = MAX(2, BMP_DRONEDET_FRAMES * server_ups / 10);
+ thetorp->t_fuse = MAX(2, BMP_DRONEDET_FRAMES * server_ups / 5);
}
if(thetorp->t_shape == SHP_MISSILE)
{
shape = SHP_DBOOM;
- thetorp->t_fuse = MAX(2, BMP_DRONEDET_FRAMES * server_ups / 10);
+ thetorp->t_fuse = MAX(2, BMP_DRONEDET_FRAMES * server_ups / 5);
}
}
thetorp->t_shape = shape;