Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14821/include
Modified Files:
bitmaps.h data.h defs.h proto.h struct.h version.h wlib.h
xclrs.h
Log Message:
Update to version 4.4.0.3
Index: bitmaps.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/bitmaps.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- bitmaps.h 21 Jan 2003 21:27:54 -0000 1.1.1.1
+++ bitmaps.h 12 Apr 2006 04:20:03 -0000 1.2
@@ -97,7 +97,6 @@
#define BMP_SB_EXPLOSION 1
#define BMP_CLOCK 13
#define BMP_CLOAK 14
-#define BMP_ICON 15
#define BMP_SHIELD 16
#define BMP_VSHIELD 17
#define BMP_STIPPLE 22
@@ -114,8 +113,6 @@
#define BMP_CLOCK_HEIGHT 48
#define BMP_CLOAK_WIDTH 20
#define BMP_CLOAK_HEIGHT 20
-#define BMP_ICON_WIDTH 112
-#define BMP_ICON_HEIGHT 80
#define BMP_SHIELD_WIDTH 20
#define BMP_SHIELD_HEIGHT 20
#define BMP_STIPPLE_WIDTH 16
Index: defs.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/defs.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- defs.h 21 Jan 2003 21:27:54 -0000 1.1.1.1
+++ defs.h 12 Apr 2006 04:20:03 -0000 1.2
@@ -13,7 +13,7 @@
#define ADDRLEN 10
#ifdef NBT
-#define MAX_MACRO 75
+#define MAX_MACRO 500
#endif
#ifndef MAXPLAYER
@@ -235,37 +235,37 @@
#endif
#ifndef ROTATERACE
-#define sendTorpReq(dir) sendShortPacket(CP_TORP, dir)
-#define sendPhaserReq(dir) sendShortPacket(CP_PHASER, dir)
-#define sendDirReq(dir) sendShortPacket(CP_DIRECTION, dir)
-#define sendPlasmaReq(dir) sendShortPacket(CP_PLASMA, dir)
+#define sendTorpReq(dir) sendShortPacket(CP_TORP, (char) dir)
+#define sendPhaserReq(dir) sendShortPacket(CP_PHASER, (char) dir)
+#define sendDirReq(dir) sendShortPacket(CP_DIRECTION, (char) dir)
+#define sendPlasmaReq(dir) sendShortPacket(CP_PLASMA, (char) dir)
#else
-#define sendTorpReq(dir) sendShortPacket(CP_TORP, RotateDirSend(dir))
-#define sendPhaserReq(dir) sendShortPacket(CP_PHASER, RotateDirSend(dir))
-#define sendDirReq(dir) sendShortPacket(CP_DIRECTION, RotateDirSend(dir))
-#define sendPlasmaReq(dir) sendShortPacket(CP_PLASMA, RotateDirSend(dir))
+#define sendTorpReq(dir) sendShortPacket(CP_TORP, (char) RotateDirSend(dir))
+#define sendPhaserReq(dir) sendShortPacket(CP_PHASER, (char) RotateDirSend(dir))
+#define sendDirReq(dir) sendShortPacket(CP_DIRECTION, (char) RotateDirSend(dir))
+#define sendPlasmaReq(dir) sendShortPacket(CP_PLASMA, (char) RotateDirSend(dir))
#endif /* ROTATERACE */
-#define sendSpeedReq(speed) sendShortPacket(CP_SPEED, speed)
-#define sendShieldReq(state) sendShortPacket(CP_SHIELD, state)
-#define sendOrbitReq(state) sendShortPacket(CP_ORBIT, state)
-#define sendRepairReq(state) sendShortPacket(CP_REPAIR, state)
-#define sendBeamReq(state) sendShortPacket(CP_BEAM, state)
-#define sendCopilotReq(state) sendShortPacket(CP_COPILOT, state)
+#define sendSpeedReq(speed) sendShortPacket(CP_SPEED, (char) speed)
+#define sendShieldReq(state) sendShortPacket(CP_SHIELD, (char) state)
+#define sendOrbitReq(state) sendShortPacket(CP_ORBIT, (char) state)
+#define sendRepairReq(state) sendShortPacket(CP_REPAIR, (char) state)
+#define sendBeamReq(state) sendShortPacket(CP_BEAM, (char) state)
+#define sendCopilotReq(state) sendShortPacket(CP_COPILOT, (char) state)
#define sendDetonateReq() sendShortPacket(CP_DET_TORPS, 0)
-#define sendCloakReq(state) sendShortPacket(CP_CLOAK, state)
-#define sendBombReq(state) sendShortPacket(CP_BOMB, state)
+#define sendCloakReq(state) sendShortPacket(CP_CLOAK, (char) state)
+#define sendBombReq(state) sendShortPacket(CP_BOMB, (char) state)
#define sendPractrReq() sendShortPacket(CP_PRACTR, 0)
-#define sendWarReq(mask) sendShortPacket(CP_WAR, mask)
-#define sendRefitReq(ship) {sendShortPacket(CP_REFIT, ship); shipchange(ship);}
-#define sendPlaylockReq(pnum) sendShortPacket(CP_PLAYLOCK, pnum)
-#define sendPlanlockReq(pnum) sendShortPacket(CP_PLANLOCK, pnum)
+#define sendWarReq(mask) sendShortPacket(CP_WAR, (char) mask)
+#define sendRefitReq(ship) {sendShortPacket(CP_REFIT, (char) ship); shipchange(ship);}
+#define sendPlaylockReq(pnum) sendShortPacket(CP_PLAYLOCK, (char) pnum)
+#define sendPlanlockReq(pnum) sendShortPacket(CP_PLANLOCK, (char) pnum)
#define sendCoupReq() sendShortPacket(CP_COUP, 0)
#define sendQuitReq() sendShortPacket(CP_QUIT, 0)
#define sendByeReq() sendShortPacket(CP_BYE, 0)
-#define sendDockingReq(state) sendShortPacket(CP_DOCKPERM, state)
-#define sendResetStatsReq(verify) sendShortPacket(CP_RESETSTATS, verify)
-#define sendScanReq(who) sendShortPacket(CP_SCAN, who) /* ATM */
+#define sendDockingReq(state) sendShortPacket(CP_DOCKPERM, (char) state)
+#define sendResetStatsReq(verify) sendShortPacket(CP_RESETSTATS, (char) verify)
+#define sendScanReq(who) sendShortPacket(CP_SCAN, (char) who) /* ATM */
#ifdef SHORT_PACKETS
/* #define sendShortReq(state) sendShortPacket(CP_S_REQ, state) */
@@ -425,4 +425,21 @@
#define DEADPACKETS 3
#endif
+/* Server type definitions */
+#define ST_UNKNOWN 0
+#define ST_PARADISE 1
+#define ST_BRONCO 2
+#define ST_CHAOS 3
+#define ST_INL 4
+#define ST_STURGEON 5
+#define ST_HOCKEY 6
+#define ST_DOGFIGHT 7
+
+#define T_NONE 0 /* no timer */
+#define T_DAY 1 /* time of day */
+#define T_SERVER 2 /* time on server */
+#define T_SHIP 3 /* time in ship */
+#define T_USER 4 /* user reset timer */
+#define T_TOTAL 5 /* number of T_ defs */
+
#endif /* _h_defs */
Index: version.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/version.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- version.h 21 Jan 2003 21:27:55 -0000 1.1.1.1
+++ version.h 12 Apr 2006 04:20:03 -0000 1.2
@@ -2,22 +2,5 @@
/* store the version info here */
-#ifdef STABLE
-static char mvers[] = "2.02";
-static char version[] = "COW 2.02";
-
-#define LIBMAJOR 2
-#define LIBMINOR 2
-
-#else
-static char mvers[] = "3.00";
-static char version[] = "Netrek 2000";
-
-#define LIBMAJOR 3
-#define LIBMINOR 0
-
-#if 1
-#define ALPHACODER "Caesar"
-#define ALPHAREF "0"
-#endif
-#endif
+static char mvers[] = "4.4.0.3";
+static char version[] = "Netrek XP Mod";
\ No newline at end of file
Index: xclrs.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/xclrs.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- xclrs.h 21 Jan 2003 21:27:55 -0000 1.1.1.1
+++ xclrs.h 12 Apr 2006 04:20:03 -0000 1.2
@@ -6,7 +6,7 @@
}
xclrs[] =
{
-"snow", 255, 250, 250,
+ "snow", 255, 250, 250,
"GhostWhite", 248, 248, 255,
"WhiteSmoke", 245, 245, 245,
"gainsboro", 220, 220, 220,
@@ -654,7 +654,9 @@
"gray99", 252, 252, 252,
"grey99", 252, 252, 252,
"gray100", 255, 255, 255,
- "grey100", 255, 255, 255, "grey100", 255, 255, 255};
+ "grey100", 255, 255, 255,
+ "grey100", 255, 255, 255
+};
#define XCLRS (sizeof(xclrs) / sizeof(xclrs[0]))
Index: struct.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/struct.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- struct.h 21 Jan 2003 21:27:56 -0000 1.1.1.1
+++ struct.h 12 Apr 2006 04:20:03 -0000 1.2
@@ -117,16 +117,17 @@
* for war */
#define PFPRACTR 0x40000 /* practice type robot (no
* kills) */
-#define PFDOCK 0x80000 /* true if docked to a
+#define PFDOCK 0x80000 /* true if docked to a
* starbase */
-#define PFREFIT 0x100000 /* true if about to refit */
+#define PFREFIT 0x100000 /* true if about to refit */
#define PFREFITTING 0x200000 /* true if currently
* refitting */
#define PFTRACT 0x400000 /* tractor beam activated */
#define PFPRESS 0x800000 /* pressor beam activated */
#define PFDOCKOK 0x1000000 /* docking permission */
-#define PFSEEN 0x2000000 /* seen by enemy on galactic map? */
+#define PFSEEN 0x2000000 /* seen by enemy on galactic map? */
#define PFOBSERV 0x8000000 /* for observers */
+#define PFTWARP 0x40000000 /* transwarping to base */
#define KQUIT 0x01 /* Player quit */
#define KTORP 0x02 /* killed by torp */
@@ -196,7 +197,7 @@
int st_flags; /* Misc option flags */
#ifdef MOUSE_AS_SHIFT
- unsigned char st_keymap[480]; /* keymap for this player */
+ unsigned char st_keymap[672]; /* keymap for this player */
#else
unsigned char st_keymap[96]; /* keymap for this player */
#endif
@@ -596,6 +597,14 @@
};
#endif
+/* Window Allowed Messages types */
+#define WAM_NONE 0x00
+#define WAM_INDIV 0x01
+#define WAM_TEAM 0x02
+#define WAM_KILL 0x04
+#define WAM_ALL 0x08
+#define WAM_PHASER 0x10
+
typedef struct tagWindow
{
HWND hwnd;
@@ -617,6 +626,13 @@
W_Callback HandleKeyup;
W_Callback HandleButton;
W_Callback HandleExpose;
+ struct tagWindow *parent;
+ char name[32];
+ int orig_x;
+ int orig_y;
+ int orig_width;
+ int orig_height;
+ int wam; /* Window Allowed Messages */
}
Window;
@@ -633,10 +649,28 @@
char *desc[100];
};
-#endif /* _h_struct */
-
struct tractor
{
int sx, sy, dx, dy, d1x, d1y, d2x, d2y; /* source (x,y) dest (x1,y1) (x2,y2) */
struct tractor *next;
-};
\ No newline at end of file
+};
+
+struct stringlist
+{
+ char *string;
+ char *value;
+ struct stringlist *next;
+};
+
+/* DoubleBuffering */
+typedef struct _sdbuffer
+{
+ W_Window window; /* window for current buffer */
+ HDC win_dc; /* window device context */
+ HDC mem_dc; /* memory device context */
+ RECT wr; /* window rectangle */
+ HBITMAP mem_bmp; /* memory to handle bitmap */
+ HBITMAP old_bmp; /* saved bitmap */
+}SDBUFFER;
+
+#endif /* _h_struct */
Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- proto.h 21 Jan 2003 21:27:56 -0000 1.1.1.1
+++ proto.h 12 Apr 2006 04:20:03 -0000 1.2
@@ -47,6 +47,7 @@
//static void db_box(int x, int y, int w, int h, int f, int color);
//static void db_bar(char *lab, int x, int y, int value, int tmpmax, int max, int digits, int color);
//static void db_flags(int fr);
+void db_timer (int fr, int xloc, int yloc);
void db_redraw_krp (int fr);
void db_redraw_COW (int fr);
void db_redraw (int fr);
@@ -72,6 +73,8 @@
void initDefaults (char *deffile);
void saveOptions (void);
char *getdefault (char *str);
+char *getServerNick (char *srvName);
+int getServerType (char *srvName);
#ifndef __BORLANDC__
strncmpi (char *str1, char *str2, int max);
#endif
@@ -196,6 +199,16 @@
void fillhelp (void);
void update_Help_to_Keymap (char *helpmessage);
void pbfillhelp (void); /* Help window for playback */
+void helpaction (W_Event * data);
+
+/******************************************************************************/
+/*** hintwin.c
+/******************************************************************************/
+void fillhint (void);
+void inithints (void);
+void showhint (int);
+void hintaction (W_Event * data);
+void hintshow (W_Event * data);
/******************************************************************************/
/*** inform.c
@@ -385,13 +398,14 @@
/******************************************************************************/
/*** local.c
/******************************************************************************/
+void initStars (void);
//static void DrawPlanets(void);
//static void DrawShips(void);
//static void DrawTorps(void);
void DrawPlasmaTorps (void);
//static void DrawMisc(void);
inline void local (void);
-inline void clearLocal(void);
+inline void clearLocal (void);
/******************************************************************************/
/*** macrowin.c
@@ -463,6 +477,7 @@
int height,
W_Window parent,
int border);
+void W_ResizeMenuToNumItems (W_Window window, int numitems);
void W_ChangeBorder (W_Window window,
W_Color color);
void W_MapWindow (W_Window window);
@@ -484,7 +499,6 @@
int y,
int width,
int height);
-void W_FlushClearAreaCache (W_Window window);
void W_ClearAreas (W_Window window,
int *xs,
int *ys,
@@ -522,6 +536,14 @@
int *y1,
int num,
W_Color color);
+void W_MakePoint (W_Window window,
+ int x0,
+ int y0,
+ W_Color color);
+void W_CachePoint(W_Window window,
+ int x0,
+ int y0,
+ W_Color color);
void W_MakeTractLine (W_Window window,
int x0,
int y0,
@@ -592,8 +614,6 @@
int W_WindowHeight (W_Window window);
int W_Socket ();
void W_Beep ();
-void W_SetIconWindow (W_Window main,
- W_Window icon);
void W_DestroyWindow (W_Window window);
void RedrawMenu (Window * win,
HDC hdc);
@@ -640,7 +660,6 @@
int height,
int outwidth,
int outheight);
-void W_Flush ();
void W_ResizeWindow (W_Window window,
int neww,
int newh);
@@ -662,6 +681,38 @@
char *name);
inline void ResetSysColors (void);
inline void SetTrekSysColors (void);
+void updateWindowsGeometry (W_Window win);
+void W_MessageAllowedWindows (int messtype,
+ int x,
+ int y,
+ W_Color color,
+ char *str,
+ int len,
+ W_Font font);
+void W_SetWAM (W_Window win);
+/* DoubleBuffering */
+SDBUFFER * W_InitSDB (W_Window window);
+void W_Win2Mem (SDBUFFER * sdb);
+void W_Mem2Win (SDBUFFER * sdb);
+void W_ChangeBorderDB (SDBUFFER * sdb, W_Color color);
+void W_FillAreaDB (SDBUFFER * sdb, int x, int y, int width, int height, int color);
+void W_ClearAreaDB (SDBUFFER * sdb, int x, int y, int width, int height);
+void W_CacheClearAreaDB (SDBUFFER * sdb, int x, int y, int width, int height);
+void W_ClearAreasDB (SDBUFFER * sdb, int *xs, int *ys, int *widths, int *heights, int num);
+void W_ClearWindowDB (SDBUFFER * sdb);
+void W_MakeLineDB (SDBUFFER * sdb, int x0, int y0, int x1, int y1, W_Color color);
+void W_CacheLineDB (SDBUFFER * sdb, int x0, int y0, int x1, int y1, W_Color color);
+void W_MakePointDB (SDBUFFER * sdb, int x0, int y0, W_Color color);
+void W_CachePointDB (SDBUFFER * sdb, int x0, int y0, W_Color color);
+void W_MakeLinesDB (SDBUFFER * sdb, int *x0, int *y0, int *x1, int *y1, int num, W_Color color);
+void W_MakeTractLineDB (SDBUFFER * sdb, int x0, int y0, int x1, int y1, W_Color color);
+void W_MakePhaserLineDB (SDBUFFER * sdb, int x0, int y0, int x1, int y1, W_Color color);
+void W_WriteTriangleDB (SDBUFFER * sdb, int x, int y, int s, int t, W_Color color);
+void W_WriteTextDB (SDBUFFER * sdb, int x, int y, W_Color color, char *str, int len, W_Font font);
+void W_MaskTextDB (SDBUFFER * sdb, int x, int y, W_Color color, char *str, int len, W_Font font);
+void W_WriteBitmapDB (SDBUFFER * sdb, int x, int y, W_Icon icon, W_Color color);
+void W_WriteBitmapGreyDB (SDBUFFER * sdb, int x, int y, W_Icon icon, W_Color color);
+void W_OverlayBitmapDB (SDBUFFER * sdb, int x, int y, W_Icon icon, W_Color color);
/******************************************************************************/
/*** newwin.c
@@ -688,7 +739,6 @@
int teamNo,
int *lastnum);
redrawQuit (void);
-void drawIcon (void);
showTimeLeft (time_t time, time_t max);
void W_DefineFedCursor (W_Window window);
void W_DefineRomCursor (W_Window window);
@@ -726,6 +776,9 @@
//static void metadone(void);
void metaaction (W_Event * data);
void metainput (void);
+#ifdef METAPING
+DWORD WINAPI metaPing_thread(void);
+#endif
/******************************************************************************/
/*** ping.c
@@ -762,6 +815,7 @@
inline int ckRecordPacket (char packet);
int pb_dopacket (char *buf);
int readFromFile ();
+void pb_framectr(int xloc, int yloc); /* show frame counter on dashboard */
#ifdef REVERSE_PLAYBACK
void rpb_init (void);
void rpb_insert (int diskpos,
@@ -845,13 +899,9 @@
/******************************************************************************/
/*** senddist.c
/******************************************************************************/
-struct distress *loaddistress (enum dist_type i,
- W_Event * data);
-emergency (enum dist_type i,
- W_Event * data);
-pmacro (int mnum,
- char who,
- W_Event * data);
+struct distress *loaddistress (enum dist_type i, W_Event * data);
+void emergency (enum dist_type i, W_Event * data);
+pmacro (int mnum, char who, W_Event * data);
/******************************************************************************/
/*** short.c
@@ -880,10 +930,6 @@
/*** smessage.c
/******************************************************************************/
void DisplayMessage ();
-void AddChar (char *twochar);
-void BlankChar (int HUDoffsetcol,
- int len);
-void DrawCursor (int col);
void smessage (char ichar);
pmessage (char *str,
short recip,
@@ -980,18 +1026,16 @@
#endif
recvUdpConn (void);
closeUdpConn (void);
- void printUdpInfo (void);
- void handleSequence (struct sequence_spacket *packet);
- void Log_Packet (char type,
- int act_size);
- void Log_OPacket (int tpe,
- int size);
+void printUdpInfo (void);
+void handleSequence (struct sequence_spacket *packet);
+void Log_Packet (char type, int act_size);
+void Log_OPacket (int tpe, int size);
Dump_Packet_Log_Info (void);
- char *strcpyp_return (register char *s1,
- register char *s2,
- register int length);
- char *strcpy_return (register char *s1,
- register char *s2);
+char *strcpyp_return (register char *s1,
+ register char *s2,
+ register int length);
+char *strcpy_return (register char *s1,
+ register char *s2);
/******************************************************************************/
/*** sound.c
@@ -1068,6 +1112,7 @@
int y,
int targtype);
troop_capacity (void);
+void setObserverMode (int);
/******************************************************************************/
/*** war.c
@@ -1105,6 +1150,8 @@
struct timeval *timeout);
#endif
char *GetExeDir ();
+ void HideConsoleWindow (void);
+ BOOL CALLBACK EnumWindowsProc (HWND hwnd, LPARAM lparam);
/******************************************************************************/
/*** winsndlib.c
Index: wlib.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/wlib.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- wlib.h 21 Jan 2003 21:27:55 -0000 1.1.1.1
+++ wlib.h 12 Apr 2006 04:20:03 -0000 1.2
@@ -163,8 +163,6 @@
extern int W_WindowHeight (W_Window window);
extern int W_Socket (void);
extern void W_ClearWindow (W_Window window);
-extern void W_SetIconWindow (W_Window main,
- W_Window icon);
extern void W_CacheLine (W_Window,
int,
int,
@@ -194,8 +192,6 @@
int,
int,
int);
-extern void W_FlushClearAreaCache (W_Window);
-extern void W_FlushLineCaches (W_Window);
extern void W_OverlayBitmap (int,
int,
W_Icon,
@@ -223,26 +219,38 @@
#define W_EV_CM_BUTTON 5
#endif
-#define W_LBUTTON 1
-#define W_MBUTTON 2
-#define W_RBUTTON 3
+#define W_LBUTTON 1
+#define W_MBUTTON 2
+#define W_RBUTTON 3
+
+/* Microsoft XButtons support */
+#define W_XBUTTON1 4
+#define W_XBUTTON2 5
+
+/* Wheel Mouse support */
+#define W_WHEELUP 6
+#define W_WHEELDOWN 7
#ifdef SHIFTED_MOUSE
-#define W_LBUTTON2 4
-#define W_MBUTTON2 5
-#define W_RBUTTON2 6
+#define W_LBUTTON2 8
+#define W_MBUTTON2 9
+#define W_RBUTTON2 10
+#define W_XBUTTON1_2 11
+#define W_XBUTTON2_2 12
-#define W_LBUTTON3 7
-#define W_MBUTTON3 8
-#define W_RBUTTON3 9
+#define W_LBUTTON3 13
+#define W_MBUTTON3 14
+#define W_RBUTTON3 15
+#define W_XBUTTON1_3 16
+#define W_XBUTTON2_3 17
-#define W_LBUTTON4 10
-#define W_MBUTTON4 11
-#define W_RBUTTON4 12
+#define W_LBUTTON4 18
+#define W_MBUTTON4 19
+#define W_RBUTTON4 20
+#define W_XBUTTON1_4 21
+#define W_XBUTTON2_4 22
#endif
#define W_BoldFont W_HighlightFont
-
-
#endif /* _h_Wlib */
Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- data.h 21 Jan 2003 21:27:56 -0000 1.1.1.1
+++ data.h 12 Apr 2006 04:20:03 -0000 1.2
@@ -19,8 +19,6 @@
#define shield_height 20
#define cloak_width 20
#define cloak_height 20
-#define icon_width 112
-#define icon_height 80
#ifndef COLORIZE
#define etorp_width 3
@@ -69,6 +67,7 @@
extern int showPlanetNames;
extern int warnShields;
extern int showStats;
+extern int showHints;
#ifdef RECORDGAME
extern FILE *recordFile; /* recorder */
extern int playback;
@@ -108,8 +107,13 @@
#ifdef META
extern char *metaServer;
+extern char *metaServer1;
+extern char *metaServer2;
+extern char *metaServer3;
extern int metaPort;
-
+#ifdef METAPING
+extern int metaPing;
+#endif
#endif
#define NUM_DIST 27 /* Number of distress macros */
@@ -177,6 +181,7 @@
extern int tournMask;
extern int nextSocket;
extern char *serverName;
+extern char *serverNick;
extern char defaultsFile[80];
extern int loggedIn;
extern int reinitPlanets;
@@ -189,6 +194,7 @@
extern int phaserStats;
extern int phaserStatTry;
extern int phaserStatHit;
+extern unsigned long phaserStatDamage;
#endif
extern int scanplayer;
@@ -217,7 +223,6 @@
extern int showTractorPressor;
extern int showAllTractorPressor;
extern int showLock;
-extern int phaserMsg;
extern int planetBitmap;
extern int logging;
extern int continueTractor;
@@ -232,7 +237,7 @@
extern double Sin[], Cos[];
-extern W_Icon stipple, clockpic, icon;
+extern W_Icon stipple, clockpic;
extern W_Icon base_expview;
extern W_Icon expview[BMP_SHIPEXPL_FRAMES];
@@ -293,10 +298,10 @@
extern struct rank ranks[NUMRANKS];
-extern W_Window messagew, w, mapw, statwin, baseWin, infow, iconWin, tstatw,
+extern W_Window messagew, w, mapw, statwin, baseWin, infow, tstatw,
war, warnw, helpWin, teamWin[4], qwin, messwa, messwt, messwi,
messwk, planetw, rankw, playerw, optionWin, reviewWin;
-extern W_Window scanw, scanwin, udpWin, phaserwin;
+extern W_Window scanw, scanwin, udpWin, phaserwin, hintWin;
#ifdef SHORT_PACKETS
extern W_Window spWin;
@@ -337,6 +342,7 @@
extern int showIND;
extern int newPlist;
+extern int playerListHack;
extern struct dmacro_list *distmacro;
@@ -359,6 +365,7 @@
#ifdef MOTION_MOUSE
extern int continuousMouse;
+extern int continuousMouseFix;
extern int motionThresh;
extern int motion_mouse_enablable;
extern int motion_mouse_steering;
@@ -377,6 +384,8 @@
extern int b1_as_shift;
extern int b2_as_shift;
extern int b3_as_shift;
+extern int b4_as_shift;
+extern int b5_as_shift;
#endif
@@ -496,16 +505,55 @@
extern int mungScrollbarColors;
extern int showMotd;
-extern char *saveFile;
-extern int saveBig;
-extern int saveMacro;
-extern int saveRCD;
-extern int saveRCM;
+extern char *saveFile; /* file name to save options to */
+extern int saveBig; /* save options with comments */
+extern int saveMacro; /* save options with macros */
+extern int saveRCD; /* save options with RCD */
+extern int saveRCM; /* save options with RCM */
-extern int tpDotDist;
+extern int tpDotDist; /* distance between tractor/pressor dots */
extern struct tractor *tractcurrent;
extern struct tractor *tractrunner;
extern struct tractor *tracthead;
+extern int agriCAPS; /* show agri names in caps on map */
+extern int agriColor; /* agri planets font color on map */
+
+extern int windowMove; /* allow moving of internal windows */
+extern int mainResizeable; /* allow resize of netrek window */
+extern int playerListMessaging; /* allow message zoom when clicking on player list */
+extern int observerMode; /* set observer mode variable */
+extern int observerPorts[]; /* predefined list of observer ports */
+extern int showHockeyScore; /* show hockey score on map */
+
+extern char pigcall[]; /* pigcall string */
+extern char cowid[]; /* cowid string */
+
+extern int serverType; /* server type variable */
+extern int beepOnPrivateMessage; /* beep if private message was received */
+extern W_Window wam_windows[]; /* window allowed messages types */
+
+extern int showStars; /* show background stars on local */
+extern int warpStreaks; /* show warp streaks */
+
+/* time client connected to server */
+extern time_t timeStart; /* time when client connected to server */
+
+/* timer data */
+extern int timerType; /* type of dashboard timer */
+extern time_t timeBank[]; /* different kind of times to store for different timer types */
+
+extern int omitTeamLetter; /* don't show team letter on map */
+
+extern int viewBox; /* show local window box on map */
+
+extern struct stringlist *defaults; /* pointer to defaults list */
+
+/* DoubleBufering */
+extern SDBUFFER *localSDB; /* double buffer for local window */
+extern SDBUFFER *mapSDB; /* double buffer for map window */
+
+extern int disableWinkey; /* disable WinKey + ContextKey during the game */
+
#endif /* _h_data */