Update of /cvsroot/netrek/server/Vanilla/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26876/include
Modified Files:
defs.h proto.h struct.h
Log Message:
bays
Index: defs.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/defs.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- defs.h 28 Sep 2005 12:14:05 -0000 1.3
+++ defs.h 10 Apr 2006 10:56:31 -0000 1.4
@@ -134,7 +134,7 @@
#define DOCKDIST 600
#define DOCKSPEED 2 /* If base is moving, there will be some
finesse involved to dock */
-#define NUMPORTS 4
+#define NUMBAYS 4 /* number of docking bays a starbase has */
#define SBFUELMIN 10000 /* If starbase's fuel is less than this, it will not
refuel docked vessels */
#define TRACTDIST 6000 /* maximum effective tractor beam range */
Index: struct.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/struct.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- struct.h 10 Apr 2006 04:24:51 -0000 1.3
+++ struct.h 10 Apr 2006 10:56:31 -0000 1.4
@@ -370,9 +370,14 @@
short p_planets; /* planets taken this game */
short p_armsbomb; /* armies bombed this game */
int p_ghostbuster;
- int p_docked; /* If starbase, # docked to, else pno base host */
- int p_port[4]; /* If starbase, pno of ship docked to that port,
- else p_port[0] = port # docked to on host. */
+
+ /* for starbases, if PFDOCKOK set */
+ int p_bays[NUMBAYS]; /* p_no of each docked ship, or VACANT */
+
+ /* for ships other than starbases, if p_flags PFDOCK set */
+ int p_dock_with; /* p_no of starbase we are docked with */
+ int p_dock_bay; /* bay of starbase we are docked with */
+
short p_tractor; /* What player is in tractor lock */
int p_pos; /* My position in the player file */
int w_queue; /* Waitqueue of my team */
Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/proto.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- proto.h 15 Jun 2005 22:55:25 -0000 1.3
+++ proto.h 10 Apr 2006 10:56:31 -0000 1.4
@@ -6,6 +6,15 @@
#ifndef __INCLUDED_proto_h__
#define __INCLUDED_proto_h__
+/* bay.c */
+void bay_consistency_check(struct player *base);
+struct player *bay_owner(struct player *me);
+void bay_claim(struct player *base, struct player *me, int bay_no);
+void bay_release(struct player *me);
+void bay_release_all(struct player *base);
+void bay_init(struct player *me);
+int bay_closest(struct player *base, LONG dx, LONG dy);
+
/* cluecheck.c */
void clue_check(void);