Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30185/include
Modified Files:
data.h defs.h proto.h wlib.h
Log Message:
Added "showArmy: (on)/off" to show army count of planet you are orbiting. Can be changed
in game via planets menu
Added "detCircle: on/(off)" to show det circle on tactical. Can be changed in game via
ship menu
Pushing transwarp key will automatically lock you onto your team's base, and send the practice
robot request that starts transwarp, if your team has a base, and if you aren't locked onto
any player already. For games with multiple bases on the same team (i.e. chaos), you will
have to lock onto the base of your choice, otherwise it will send you to the first base on
your team's player list.
First attempt at fixing color cycling of colorful phasers.
Fix to rank message.
Index: wlib.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/wlib.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- wlib.h 21 May 2006 09:56:38 -0000 1.7
+++ wlib.h 22 May 2006 08:27:52 -0000 1.8
@@ -192,6 +192,11 @@
int,
int,
W_Color);
+extern void W_WriteCircle (W_Window,
+ int,
+ int,
+ int,
+ W_Color);
extern void W_WriteTriangle (W_Window,
int,
int,
@@ -218,12 +223,6 @@
W_Icon,
W_Color,
W_Window);
-extern void W_WriteTriangle (W_Window,
- int,
- int,
- int,
- int,
- W_Color);
#define W_EV_EXPOSE 1
#define W_EV_KEY 2
Index: defs.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/defs.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- defs.h 18 May 2006 07:15:35 -0000 1.8
+++ defs.h 22 May 2006 08:27:52 -0000 1.9
@@ -56,7 +56,7 @@
* for 20 spaces */
#define EXPDIST 350 /* At this range a torp will
* explode */
-#define DETDIST 1600 /* At this range a player
+#define DETDIST 1700 /* At this range a player
* can detonate a torp */
#define PHASEDIST 6000 /* At this range a player
@@ -152,7 +152,6 @@
#define TARG_ENEMY 0x10
#define TARG_FRIEND 0x20
-
#define DEFAULT_PORT 2592
/* Other stuff that Ed added */
Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- data.h 21 May 2006 18:53:03 -0000 1.20
+++ data.h 22 May 2006 08:27:52 -0000 1.21
@@ -165,6 +165,8 @@
extern int dynamicBitmaps;
extern int colorWeapons;
extern int newDashboard, old_db;
+extern int detCircle;
+extern int showArmy;
extern int niftyNewMessages;
extern int fastQuit;
extern char *shipnos;
@@ -363,6 +365,7 @@
extern LONG packets_received; /* # all packets received */
extern W_Window pStats;
+extern char rankmessage[80];
extern char deathmessage[80];
extern char outmessage[];
extern char *xdisplay_name;
Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- proto.h 21 May 2006 18:53:03 -0000 1.21
+++ proto.h 22 May 2006 08:27:52 -0000 1.22
@@ -592,6 +592,11 @@
int x1,
int y1,
W_Color color);
+void W_WriteCircle (W_Window window,
+ int x,
+ int y,
+ int r,
+ W_Color color);
void W_WriteTriangle (W_Window window,
int x,
int y,