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

Modified Files:
	data.h defs.h proto.h struct.h 
Log Message:
Some bitmap modifications (with new art)
Added timer/clock back to text dashboard
Added torp count to LAB dashboard
-Added new status line to KRP, COW and LAB dashboard. In order of priority, it shows the following:
  1) time left in declare war delay
  2) time left in refit delay
  3) time left to fully repair (if you are at warp 0 in repair mode)
  4) time left in grace period after T mode drops to still take planets (15 second timer)
  5) whether you are in transwarp
  6) whether you are under impulse power (default)

Index: defs.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/defs.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- defs.h	14 May 2006 02:14:54 -0000	1.7
+++ defs.h	18 May 2006 07:15:35 -0000	1.8
@@ -135,7 +135,15 @@
                                  * a warning on the screen */
 #define MESSTIME 30             /* Number of updates to have
                                  * a message on the screen */
-
+                                 
+/* These are server defined times */
+#define REFITTIME 5             /* Number of seconds it takes
+                                 * to refit */
+#define DECLARETIME 10          /* Number of seconds it takes
+                                 * to declare war */
+#define TOURNEXTENDTIME 15      /* Number of seconds after T-mode ends
+                                   in which it's still considered T-mode for
+                                   planet taking purposes */
 #define TARG_PLAYER	0x1     /* Flags for gettarget */
 #define TARG_PLANET	0x2
 #define TARG_CLOAK	0x4     /* Include cloaked ships in

Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- data.h	16 May 2006 05:10:13 -0000	1.15
+++ data.h	18 May 2006 07:15:35 -0000	1.16
@@ -60,8 +60,9 @@
 extern int lastcount;
 extern int mdisplayed;
 extern int lastm;
-extern int delay;
-extern int rdelay;
+extern time_t delay;
+extern time_t rdelay;
+extern time_t tdelay;
 extern int showPlanetNames;
 extern int warnShields;
 extern int showStats;

Index: struct.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/struct.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- struct.h	14 May 2006 02:14:54 -0000	1.7
+++ struct.h	18 May 2006 07:15:35 -0000	1.8
@@ -174,6 +174,7 @@
     short s_type;
     int s_torpspeed;
     int s_phaserfuse;
+    int s_repair;
 };
 
 struct stats

Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- proto.h	16 May 2006 05:10:13 -0000	1.15
+++ proto.h	18 May 2006 07:15:35 -0000	1.16
@@ -67,6 +67,7 @@
 void db_redraw_krp (int fr);
 void db_redraw_COW (int fr);
 void db_redraw (int fr);
+int repair_time (void);
 
 /******************************************************************************/
 /***  dashboard3.c                                                          ***/