Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9238/include Modified Files: bitmaps.h data.h defs.h proto.h Log Message: First attempt at reimport of beeplite into NetrekXP. Unresolved issue: improper text clearing on TTS beeplite messages. Still to add: saving of beeplite settings in save_options. Index: defs.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/defs.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- defs.h 12 Apr 2006 04:20:03 -0000 1.2 +++ defs.h 18 Apr 2006 13:41:48 -0000 1.3 @@ -421,6 +421,16 @@ #define S_LINE_VERTICAL 2 #endif +#ifdef BEEPLITE +#define LITE_PLAYERS_MAP 0x01 +#define LITE_PLAYERS_LOCAL 0x02 +#define LITE_SELF 0x04 +#define LITE_PLANETS 0x08 +#define LITE_SOUNDS 0x10 +#define LITE_COLOR 0x20 +#define LITE_TTS 0x40 +#endif + #ifdef WARP_DEAD #define DEADPACKETS 3 #endif Index: bitmaps.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/bitmaps.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- bitmaps.h 12 Apr 2006 04:20:03 -0000 1.2 +++ bitmaps.h 18 Apr 2006 13:41:48 -0000 1.3 @@ -1,4 +1,5 @@ #include "config.h" + // Ships // ----- Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- data.h 15 Apr 2006 01:04:32 -0000 1.3 +++ data.h 18 Apr 2006 13:41:48 -0000 1.4 @@ -366,6 +366,40 @@ extern struct dmacro_list dist_prefered[]; extern int sizedist; +#ifdef BEEPLITE +extern char *distlite[]; +extern int useLite; +extern int defLite; +extern int emph_planet_seq_n[]; +extern int emph_player_seq_n[]; +extern W_Icon emph_planet_seq[]; +extern W_Icon emph_player_seq[]; +extern W_Icon emph_player_seql[]; + +#define emph_planet_seq_frames 5 +#define emph_planet_seq_width 24 +#define emph_planet_seq_height 24 +#define emph_player_seq_frames 3 +#define emph_player_seq_width 24 +#define emph_player_seq_height 24 +#define emph_player_seql_frames 3 +#define emph_player_seql_width 30 +#define emph_player_seql_height 30 +extern int beep_lite_cycle_time_player; +extern int beep_lite_cycle_time_planet; +extern int liteflag; +extern char F_beeplite_flags; + +extern int tts_len; +extern int tts_max_len; +extern int tts_width; +extern int tts_timer; +extern int tts_time; +extern int tts_pos; +extern char lastIn[100]; + +#endif /* BEEPLITE */ + #ifdef RCM extern struct dmacro_list rcm_msg[]; Index: proto.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- proto.h 16 Apr 2006 14:18:19 -0000 1.3 +++ proto.h 18 Apr 2006 13:41:48 -0000 1.4 @@ -21,6 +21,15 @@ #include <sys/types.h> /******************************************************************************/ +/*** beeplite.c ***/ +/******************************************************************************/ +rcdlite (struct distress *dist); +litedefaults (void); +liteplanet (struct planet *l); +liteplayer (struct player *j); +makelite (struct distress * dist, char *pm); + +/******************************************************************************/ /*** check.c ***/ /******************************************************************************/ void check (void); @@ -677,6 +686,18 @@ int y, W_Icon icon, W_Color color); +void W_EraseTTSText (W_Window window, + int max_width, + int y, + int width); +void W_WriteTTSText (W_Window window, + int max_width, + int y, + int width, + char *str, + int len); +int W_TTSTextWidth (char *s, + int len); void W_SetWindowName (W_Window window, char *name); inline void ResetSysColors (void);