diff -urN xpilot-4.1.0/Local.config xpilot-4.U.4tc99b/Local.config --- xpilot-4.1.0/Local.config Fri Oct 30 13:35:18 1998 +++ xpilot-4.U.4tc99b/Local.config Wed Sep 22 20:44:48 1999 @@ -172,11 +172,11 @@ * or contains the word "beta" or "alpha". */ VERSION_MAJOR = 4 - VERSION_MINOR = 1 - VERSION_PATCHLEVEL = 0 + VERSION_MINOR = U + VERSION_PATCHLEVEL = 4 VERSION_WINDOWS = 13 - VERSION_STATUS = - RELEASEDATE = Oct 30th, 1998 + VERSION_STATUS = TC99b + RELEASEDATE = Aug 30th, 1999 /* diff -urN xpilot-4.1.0/src/client/client.c xpilot-4.U.4tc99b/src/client/client.c --- xpilot-4.1.0/src/client/client.c Wed Sep 16 20:35:40 1998 +++ xpilot-4.U.4tc99b/src/client/client.c Mon Aug 30 00:58:49 1999 @@ -56,6 +56,8 @@ #define MAX_CHECKPOINT 26 +char *fast_msgs[N_MSGS]; + int scoresChanged = 0; int RadarHeight = 0; diff -urN xpilot-4.1.0/src/client/client.h xpilot-4.U.4tc99b/src/client/client.h --- xpilot-4.1.0/src/client/client.h Wed Sep 16 20:35:40 1998 +++ xpilot-4.U.4tc99b/src/client/client.h Mon Aug 30 00:58:50 1999 @@ -252,6 +252,8 @@ extern int maxVolume; /* maximum volume (in percent) */ #endif /* SOUND */ +extern int snoopEyesId; /* client's view of game */ + int Fuel_by_pos(int x, int y); int Target_alive(int x, int y, int *damage); int Target_by_index(int ind, int *xp, int *yp, int *dead_time, int *damage); diff -urN xpilot-4.1.0/src/client/colors.c xpilot-4.U.4tc99b/src/client/colors.c --- xpilot-4.1.0/src/client/colors.c Fri Oct 2 20:39:21 1998 +++ xpilot-4.U.4tc99b/src/client/colors.c Mon Aug 30 00:58:50 1999 @@ -502,15 +502,18 @@ * planes at once. */ for (p=0; p<2; p++) { + int num=0; + dpl_1[p] = dpl_2[p] = 0; for (i=0; i<32; i++) { if (!((1<masks[p])) { - if (dpl_1[p]) { - dpl_2[p] |= 1< num_spark_colors) { debris_colors = num_spark_colors; } - if (view_width != draw_width || view_height != draw_height) { + if (view_width != (int)(draw_width*scaleFactor) || + view_height != (int)(draw_height*scaleFactor)) { Send_display(); } Game_over_action(stat); @@ -2408,6 +2409,336 @@ return 0; } +#define TEAM_PLAY (1<<8) /* defined in rules.h */ +#define LIMITED_LIVES (1<<3) /* defined in rules.h */ +#define MSG_PARSED_FIELD_LEN 20 + +/* Returns a pointer to the first character after the fields */ +char *Fields_info (char *buf, int *n_fields) +{ + int end_found = 0, level = 0; + + *n_fields = 0; + while (!end_found) + { + switch (*buf) + { + case START_DELIMITER: + if (level++ == 0) + (*n_fields)++; + break; + case MIDDLE_DELIMITER: + if (level == 1) + (*n_fields)++; + break; + case END_DELIMITER: + level--; + if (level == 0) + end_found = 1; + else if (level < 0) + return NULL; + break; + case '\0': + return NULL; + break; + default: + break; + } + buf++; + } + return buf; +} + +/* Returns a string pointer to the wanted_field + * This pointer must be freed after using it + */ +char *Field_get (char *buf, int wanted_field) +{ + int finished = 0, level = 0, field = 0, len; + char *field_ptr, *start_ptr = NULL, *end_ptr = NULL; + + while (!finished) + { + switch (*buf) + { + case START_DELIMITER: + if (level == 0) + { + field++; + if (field == wanted_field) + start_ptr = buf + 1; + } + level++; + break; + case MIDDLE_DELIMITER: + if (level == 1) + { + field++; + if (field == wanted_field) + start_ptr = buf + 1; + else if (field == wanted_field + 1) + { + end_ptr = buf; + finished = 1; + } + } + break; + case END_DELIMITER: + level--; + if (level == 0) + { + if (field == wanted_field) + end_ptr = buf; + finished = 1; + } + else if (level < 0) + return NULL; + break; + case '\0': + return NULL; + break; + default: + break; + } + buf++; + + } + len = end_ptr - start_ptr; + field_ptr = (char *) malloc (len + 1); + strncpy (field_ptr, start_ptr, len); + field_ptr[len] = '\0'; + return field_ptr; +} + +int Net_talk_parsed(char *str) +{ + /* Comment: sizeof talk_str === MAX_CHARS */ + if (str == NULL) + return 1; + + if (Parse (talk_str, str, 0L, MAX_CHARS) > 0) + { + talk_pending = ++talk_sequence_num; + talk_last_send = last_loops - TALK_RETRY; + } + return 0; +} + +int Parse(char *outbuf, char *inbuf, long pos, long max) +{ + FILE *fp; + char c; + long fsize; + int i, n_fields; + char *tmpptr, *tmpptr1, *tmpptr2, *tmpptr3, *nextpos, *filename; + other_t *player=NULL; + + + while ((c = *inbuf++) != '\0') + { + if (pos >= max - 2) + { + if (outbuf == talk_str) /* parsing to the talk buffer */ + { + outbuf[pos] = '\0'; + talk_pending = ++talk_sequence_num; + if (Packet_printf(&wbuf, "%c%ld%s", PKT_TALK, + talk_pending, outbuf) == -1) + return -1; + pos = 0; + } + else + goto done; + } + if (player != NULL) + { + switch (c) + { + case 'l': + if (BIT(Setup->mode, LIMITED_LIVES)) + outbuf[pos++] = player->life + '0'; + break; + case 'n': + tmpptr = player->name; + for (i = 0; tmpptr[i] != '\0' && pos < max - 2; ++i) + outbuf[pos++] = tmpptr[i]; + break; + case 's': + if (pos < max - 1 - 6) /* short - "-16535" max no of chars */ + pos += sprintf (outbuf+pos, "%d", player->score); + break; + case 't': + if (BIT(Setup->mode, TEAM_PLAY)) + outbuf[pos++] = player->team + '0'; + break; + default: + break; + } + player = NULL; + } + else + { + switch (c) + { + case SPECIAL_TALK_CHAR: + if ((c = *inbuf++) == '\0') + goto done; + switch (c) { + case '=': /* String comparison */ + nextpos = Fields_info (inbuf, &n_fields); + if (n_fields < 3 || n_fields > 4 || nextpos == NULL) + break; + /* parse field 1 */ + if ((tmpptr = Field_get (inbuf, 1)) == NULL) + { + printf ("Field_get (1) error!...\n"); + break; + } + tmpptr1 = (char *)malloc (MSG_PARSED_FIELD_LEN); + Parse (tmpptr1, tmpptr, 0, MSG_PARSED_FIELD_LEN); + free (tmpptr); + /* parse field 2 */ + if ((tmpptr = Field_get (inbuf, 2)) == NULL) + { + printf ("Field_get (2) error!...\n"); + break; + } + tmpptr2 = (char *)malloc (MSG_PARSED_FIELD_LEN); + Parse (tmpptr2, tmpptr, 0, MSG_PARSED_FIELD_LEN); + free (tmpptr); + if (!strcmp(tmpptr1, tmpptr2)) + { + /* True */ + if ((tmpptr3 = Field_get (inbuf, 3)) == NULL) + { + printf ("Field_get (3) error!...\n"); + free (tmpptr1); + free (tmpptr2); + break; + } + pos = Parse (outbuf, tmpptr3, pos, max); + } + else if (n_fields == 4) + { + /* False */ + if ((tmpptr3 = Field_get (inbuf, 4)) == NULL) + { + printf ("Field_get (4) error!...\n"); + free (tmpptr1); + free (tmpptr2); + break; + } + pos = Parse (outbuf, tmpptr3, pos, max); + } + inbuf = nextpos; + free (tmpptr); + free (tmpptr1); + free (tmpptr2); + free (tmpptr3); + break; + case 'f': + nextpos = Fields_info (inbuf, &n_fields); + if (n_fields != 1 || nextpos == NULL) + break; + if ((tmpptr = Field_get (inbuf, 1)) == NULL) + { + printf ("Field_get error!...\n"); + break; + } + inbuf = nextpos; + filename = (char *)malloc (MSG_FNLEN); + Parse (filename, tmpptr, 0, MSG_FNLEN); + free (tmpptr); + if ((fp = fopen (filename, "r")) == NULL) + { + printf ("Couldn't open file %s\n", tmpptr); + free (filename); + break; + } + free (filename); + + /* Get filesize */ + fseek (fp, 0L, SEEK_END); + fsize = ftell (fp); + rewind (fp); + + if ((tmpptr = (char *)malloc(fsize+1)) == NULL) + { + fclose (fp); + break; + } + fread (tmpptr, 1, fsize, fp); + tmpptr[fsize] = '\0'; + fclose (fp); + pos = Parse (outbuf, tmpptr, pos, max); + free (tmpptr); + break; + case 'h': + tmpptr = getenv ("HOME"); + while (*tmpptr != '\0' && pos < max - 2) + outbuf[pos++] = *tmpptr++; + break; + case 'r': + nextpos = Fields_info (inbuf, &n_fields); + if (n_fields <= 0 || nextpos == NULL) + break; + if ((tmpptr = Field_get (inbuf, rand() % n_fields + 1)) + == NULL) + { + printf ("Field_get error (random) \n"); + break; + } + inbuf = nextpos; + pos = Parse (outbuf, tmpptr, pos, max); + free (tmpptr); + break; + case 'n': + outbuf[pos] = '\0'; + talk_pending = ++talk_sequence_num; + if (Packet_printf(&wbuf, "%c%ld%s", PKT_TALK, + talk_pending, outbuf) == -1) + return -1; + pos = 0; + break; + case 'l': + if ( Other_by_id(snoopEyesId) == self + || Other_by_id(snoopEyesId) == NULL ){ + if ((player = Other_by_id(lock_id)) == NULL) { + pos = 0; + goto done; + } + } else { + if ((player = Other_by_id(snoopEyesId)) == NULL) { + pos = 0; + goto done; + } + } + break; + case 's': + player = self; + break; + case 't': + if (BIT(Setup->mode, TEAM_PLAY)) + outbuf[pos++] = self->team + '0'; + break; + case SPECIAL_TALK_CHAR: + outbuf[pos++] = c; + break; + default: + break; + } + case '\n': + break; + default: + outbuf[pos++] = c; + break; + } + } + } +done: + outbuf[pos] = '\0'; + return pos; +} int Send_talk(void) { @@ -2433,8 +2764,6 @@ draw_width, draw_height, num_spark_colors, spark_rand) == -1) { #else (int)(draw_width*scaleFactor), (int)(draw_height*scaleFactor), num_spark_colors, spark_rand) == -1) { - draw_width = (int)(draw_width*scaleFactor); - draw_height = (int)(draw_height*scaleFactor); #endif return -1; } diff -urN xpilot-4.1.0/src/client/netclient.h xpilot-4.U.4tc99b/src/client/netclient.h --- xpilot-4.1.0/src/client/netclient.h Thu Apr 16 19:39:29 1998 +++ xpilot-4.U.4tc99b/src/client/netclient.h Mon Aug 30 00:58:50 1999 @@ -113,5 +113,7 @@ int Send_audio_request(int onoff); int Send_fps_request(int fps); int Receive_loseitem(void); +int Net_talk_parsed(char *str); +int Parse(char *outbuf, char *inbuf, long pos, long max); #endif diff -urN xpilot-4.1.0/src/client/paint.h xpilot-4.U.4tc99b/src/client/paint.h --- xpilot-4.1.0/src/client/paint.h Thu Apr 16 19:39:31 1998 +++ xpilot-4.U.4tc99b/src/client/paint.h Mon Aug 30 00:58:50 1999 @@ -182,6 +182,7 @@ extern int targetRadarColor; /* Color index for targets on radar */ extern int decorColor; /* Color index for decoration drawing */ extern int decorRadarColor; /* Color index for decorations on radar */ +extern int oldTextColor; /* Color index for old text */ extern bool gotFocus; extern bool talk_mapped; extern short view_width, view_height; /* Visible area from server */ diff -urN xpilot-4.1.0/src/client/painthud.c xpilot-4.U.4tc99b/src/client/painthud.c --- xpilot-4.1.0/src/client/painthud.c Wed Sep 16 20:35:41 1998 +++ xpilot-4.U.4tc99b/src/client/painthud.c Mon Aug 30 00:58:50 1999 @@ -72,6 +72,7 @@ int hudColor; /* Color index for HUD drawing */ int hudLockColor; /* Color index for lock on HUD drawing */ +int oldTextColor; /* Color index for old text */ DFLOAT charsPerTick = 0.0; /* Output speed of messages */ message_t *TalkMsg[MAX_MSGS], *GameMsg[MAX_MSGS]; @@ -680,7 +681,7 @@ if (msg->life > MSG_FLASH) XSetForeground(dpy, messageGC, colors[RED].pixel); else - XSetForeground(dpy, messageGC, colors[WHITE].pixel); + XSetForeground(dpy, messageGC, colors[oldTextColor].pixel); len = (int)(charsPerTick * (MSG_DURATION - msg->life)); len = MIN(msg->len, len); rd.drawString(dpy, p_draw, messageGC, diff -urN xpilot-4.1.0/src/client/paintobjects.c xpilot-4.U.4tc99b/src/client/paintobjects.c --- xpilot-4.1.0/src/client/paintobjects.c Wed Sep 16 20:35:41 1998 +++ xpilot-4.U.4tc99b/src/client/paintobjects.c Mon Aug 30 00:58:50 1999 @@ -651,6 +651,7 @@ } if (num_ship > 0) { + snoopEyesId = -1; for (i = 0; i < num_ship; i++) { x = ship_ptr[i].x; y = ship_ptr[i].y; @@ -665,6 +666,14 @@ points[cnt].y = WINSCALE(Y(y + ship->pts[cnt][dir].y)); } points[cnt++] = points[0]; + + /* + * ship in the center? (svenska-hack) + */ + if ( abs(X(x)-view_width/2) <=1 && abs(Y(y)-view_height/2) <=1 + && Other_by_id(ship_ptr[i].id) != NULL ){ + snoopEyesId = ship_ptr[i].id; + } /* * Determine if the name of the player should be drawn below diff -urN xpilot-4.1.0/src/client/paintradar.c xpilot-4.U.4tc99b/src/client/paintradar.c --- xpilot-4.1.0/src/client/paintradar.c Wed Sep 23 21:42:43 1998 +++ xpilot-4.U.4tc99b/src/client/paintradar.c Mon Aug 30 00:58:50 1999 @@ -145,8 +145,19 @@ } for (i = 0; i= 0x80) { /* from the same team */ + if (maxColors == 4) + XSetForeground(dpy, radarGC, colors[RED].pixel); + /* RED doesn't work with color switching, */ + /* default maxColors changed to 8 */ + else + XSetForeground(dpy, radarGC, colors[4].pixel); + s-=0x80; + } + if (s == 0) + s = 1; x = (int)(radar_ptr[i].x * xf + 0.5) - s / 2; y = RadarHeight - (int)(radar_ptr[i].y * yf + 0.5) - 1 - s / 2; (*radarPlayerRectFN)(dpy, p_radar, radarGC, x, y, s, s); @@ -168,6 +179,7 @@ } } } + XSetForeground(dpy, radarGC, colors[WHITE].pixel); } if (num_radar) { RELEASE(radar_ptr, num_radar, max_radar); diff -urN xpilot-4.1.0/src/client/xevent.c xpilot-4.U.4tc99b/src/client/xevent.c --- xpilot-4.1.0/src/client/xevent.c Tue Oct 6 16:52:19 1998 +++ xpilot-4.U.4tc99b/src/client/xevent.c Mon Aug 30 00:58:50 1999 @@ -57,6 +57,8 @@ char xevent_version[] = VERSION; +extern char *fast_msgs[]; + extern setup_t *Setup; static BITV_DECL(keyv, NUM_KEYS); @@ -283,6 +285,9 @@ static bool Key_press(keys_t key) { + if (key >= KEY_MSG_1 && key < KEY_MSG_1 + N_MSGS) + Net_talk_parsed (fast_msgs[key - KEY_MSG_1]); + switch (key) { case KEY_ID_MODE: showRealName = showRealName ? false : true; diff -urN xpilot-4.1.0/src/client/xinit.c xpilot-4.U.4tc99b/src/client/xinit.c --- xpilot-4.1.0/src/client/xinit.c Fri Oct 2 20:39:22 1998 +++ xpilot-4.U.4tc99b/src/client/xinit.c Mon Aug 30 00:58:50 1999 @@ -469,6 +469,8 @@ || ((targetRadarColor & 1) && colorSwitch)) { targetRadarColor = BLUE; } + if (oldTextColor >= maxColors || oldTextColor < 0) + oldTextColor = WHITE; if (decorColor >= maxColors || decorColor <= 0) { decorColor = RED; } diff -urN xpilot-4.1.0/src/client/xpilot.c xpilot-4.U.4tc99b/src/client/xpilot.c --- xpilot-4.1.0/src/client/xpilot.c Thu Apr 16 19:39:56 1998 +++ xpilot-4.U.4tc99b/src/client/xpilot.c Mon Aug 30 00:58:50 1999 @@ -96,6 +96,8 @@ char **Argv; int Argc; +int snoopEyesId = -1; + static void Check_client_versions(void); diff -urN xpilot-4.1.0/src/common/config.h xpilot-4.U.4tc99b/src/common/config.h --- xpilot-4.1.0/src/common/config.h Fri Apr 17 13:40:51 1998 +++ xpilot-4.U.4tc99b/src/common/config.h Mon Aug 30 01:03:12 1999 @@ -36,9 +36,9 @@ #ifndef DEFAULT_MAP # ifdef _WINDOWS -# define DEFAULT_MAP "default.xp" +# define DEFAULT_MAP "tc99.xp" # else -# define DEFAULT_MAP "globe.xp" +# define DEFAULT_MAP "tc99.xp" # endif #endif diff -urN xpilot-4.1.0/src/common/const.h xpilot-4.U.4tc99b/src/common/const.h --- xpilot-4.1.0/src/common/const.h Sat Aug 29 21:49:53 1998 +++ xpilot-4.U.4tc99b/src/common/const.h Sat Sep 18 20:31:15 1999 @@ -293,7 +293,7 @@ #define GRAVS_POWER 2.7 -#define SHIP_SZ 14 /* Size (pixels) of radius for legal HIT! */ +#define SHIP_SZ 16 /* Size (pixels) of radius for legal HIT! */ #define VISIBILITY_DISTANCE 1000.0 #define WARNING_DISTANCE (VISIBILITY_DISTANCE*0.8) @@ -404,5 +404,13 @@ /* STDRUP_OBJ should be uncomented in Makefile also */ extern char* strdup(const char*); #endif + +#define N_MSGS 20 +#define FAST_MSG_SIZE 400 +#define MSG_FNLEN 100 +#define START_DELIMITER '[' +#define END_DELIMITER ']' +#define MIDDLE_DELIMITER '|' +#define SPECIAL_TALK_CHAR '#' #endif diff -urN xpilot-4.1.0/src/common/keys.h xpilot-4.U.4tc99b/src/common/keys.h --- xpilot-4.1.0/src/common/keys.h Thu Apr 16 19:40:42 1998 +++ xpilot-4.U.4tc99b/src/common/keys.h Mon Aug 30 00:58:51 1999 @@ -116,6 +116,27 @@ * retaining compatibility. Change this at the next major cleanup. */ , + KEY_MSG_1, + KEY_MSG_2, + KEY_MSG_3, + KEY_MSG_4, + KEY_MSG_5, + KEY_MSG_6, + KEY_MSG_7, + KEY_MSG_8, + KEY_MSG_9, + KEY_MSG_10, + KEY_MSG_11, + KEY_MSG_12, + KEY_MSG_13, + KEY_MSG_14, + KEY_MSG_15, + KEY_MSG_16, + KEY_MSG_17, + KEY_MSG_18, + KEY_MSG_19, + KEY_MSG_20, + KEY_ID_MODE, KEY_TOGGLE_OWNED_ITEMS, KEY_TOGGLE_MESSAGES, diff -urN xpilot-4.1.0/src/common/pack.h xpilot-4.U.4tc99b/src/common/pack.h --- xpilot-4.1.0/src/common/pack.h Sun Aug 30 17:40:54 1998 +++ xpilot-4.U.4tc99b/src/common/pack.h Mon Aug 30 00:58:51 1999 @@ -90,7 +90,7 @@ * 3.8.0.0: new items (deflector, hyperjump, phasing), keyboardsize and rounddelay. * 4.1.0.0: new item (mirror). */ -#define MAGIC 0x4100F4ED +#define MAGIC 0x4101F4ED #define MAGIC2VERSION(M) (((M) >> 16) & 0xFFFF) #define VERSION2MAGIC(V) ((((V) & 0xFFFF) << 16) | (MAGIC & 0xFFFF)) diff -urN xpilot-4.1.0/src/common/version.h xpilot-4.U.4tc99b/src/common/version.h --- xpilot-4.1.0/src/common/version.h Fri Oct 30 13:36:46 1998 +++ xpilot-4.U.4tc99b/src/common/version.h Wed Sep 22 20:44:48 1999 @@ -28,15 +28,15 @@ #if defined(__hpux) # pragma COPYRIGHT_DATE "1991-1998" # pragma COPYRIGHT "Bjørn Stabell, Ken Ronny Schouten, Bert Gijsbers & Dick Balaska" -# pragma VERSIONID "XPilot 4.1.0" +# pragma VERSIONID "XPilot 4.U.4TC99b" #endif -#define VERSION "4.1.0" +#define VERSION "4.U.4TC99b" #ifdef _WINDOWS -#define TITLE "4.1.0-NT13" +#define TITLE "4.U.4TC99b-NT13" #define VERSION_WINDOWS "13" #else -#define TITLE "XPilot 4.1.0" +#define TITLE "XPilot 4.U.4TC99b" #endif #define AUTHORS "Bjørn Stabell, Ken Ronny Schouten, Bert Gijsbers & Dick Balaska" #define COPYRIGHT "Copyright © 1991-1998 by Bjørn Stabell, Ken Ronny Schouten, Bert Gijsbers & Dick Balaska" diff -urN xpilot-4.1.0/src/replay/xp-replay.c xpilot-4.U.4tc99b/src/replay/xp-replay.c --- xpilot-4.1.0/src/replay/xp-replay.c Sat Apr 18 14:53:08 1998 +++ xpilot-4.U.4tc99b/src/replay/xp-replay.c Mon Aug 30 00:58:51 1999 @@ -88,6 +88,7 @@ #include "items/itemTractorBeam.xbm" #include "items/itemAutopilot.xbm" #include "items/itemEmergencyShield.xbm" +#include "items/itemMirror.xbm" #include "tools/eject.xbm" #include "tools/fastf.xbm" @@ -1386,7 +1387,8 @@ itemEmergencyShield_bits, itemDeflector_bits, itemHyperJump_bits, - itemPhasingDevice_bits + itemPhasingDevice_bits, + itemMirror_bits }; static XFontStruct *loadQueryFont(const char *fontName, GC gc) diff -urN xpilot-4.1.0/src/server/cannon.c xpilot-4.U.4tc99b/src/server/cannon.c --- xpilot-4.1.0/src/server/cannon.c Sat Sep 5 04:44:51 1998 +++ xpilot-4.U.4tc99b/src/server/cannon.c Mon Aug 30 00:58:51 1999 @@ -136,7 +136,7 @@ obj->acc.x = 0; obj->acc.y = 0; obj->mass = 10; - obj->life = 1500 + (rand() & 511); + obj->life = (1500 + (rand() & 511))*FPSMultiplier; obj->count = amount; obj->pl_range = ITEM_SIZE / 2; obj->pl_radius = ITEM_SIZE / 2; @@ -458,7 +458,7 @@ /* smarter cannons use tractors more often and also push/pull longer */ c->tractor_is_pressor = (rand() % (cannonSmartness + 1) == 0); c->tractor_target = pl->id; - c->tractor_count = 11 + rand() % ((3 * cannonSmartness) + 1); + c->tractor_count = (11 + rand() % ((3 * cannonSmartness) + 1))*FPSMultiplier; IFSOUND(sound = -1;) break; case CW_TRANSPORTER: @@ -492,7 +492,7 @@ /* dir */ dir - 4 * (4 - cannonSmartness), dir + 4 * (4 - cannonSmartness), /* speed */ 0.1, speed * 4, - /* life */ 3, 20); + /* life */ 3*FPSMultiplier, 20*FPSMultiplier); c->item[ITEM_EMERGENCY_THRUST]--; } else { Make_debris( @@ -509,7 +509,7 @@ /* dir */ dir - 3 * (4 - cannonSmartness), dir + 3 * (4 - cannonSmartness), /* speed */ 0.1, speed * 2, - /* life */ 3, 20); + /* life */ 3*FPSMultiplier, 20*FPSMultiplier); } c->item[ITEM_FUEL]--; IFSOUND(sound = THRUST_SOUND;) diff -urN xpilot-4.1.0/src/server/cmdline.c xpilot-4.U.4tc99b/src/server/cmdline.c --- xpilot-4.1.0/src/server/cmdline.c Tue Sep 1 20:08:40 1998 +++ xpilot-4.U.4tc99b/src/server/cmdline.c Wed Sep 22 20:45:18 1999 @@ -40,6 +40,7 @@ #include "defaults.h" #include "error.h" #include "portability.h" +#include "status.h" char cmdline_version[] = VERSION; @@ -232,6 +233,21 @@ bool pLockServer; /* Is server swappable out of memory? */ +int FPSMultiplier; /* slow everything by this factor */ +bool useWreckage; /* create wreckage or not? */ +bool ignore20MaxFPS; /* ignore client maxFPS request if it is 20 */ +int timerResolution; /* OS timer resolution (times/s) */ +char *password; /* password for operator status */ +int numberOfRounds; /* how many rounds to play */ +int playerLimit; /* allow less players than bases */ +/* BEGIN - TEAMCUP */ +bool teamcup; /* Is this a teamcup match? */ +char *statServer; /* Status server to report to */ +int statPort; /* Port to use on the status server */ +int matchNumber; /* The number of the match */ +/* END - TEAMCUP */ + + const char default_map[] = DEFAULT_MAP; @@ -2272,6 +2288,104 @@ tuner_plock, "Whether the server is prevented from being swapped out of memory.\n" }, + { + "FPSMultiplier", + "FPSMultiplier", + "1", + &FPSMultiplier, + valInt, + tuner_none, + "Everything is slowed by this factor. Allows using higher FPS\n" "without making the game too fast.\n" + }, + { + "wreckage", + "wreckage", + "true", + &useWreckage, + valBool, + tuner_dummy, + "Do destroyed ships leave wreckage?\n" + }, + { "ignore20MaxFPS", + "ignore20MaxFPS", + "true", + &ignore20MaxFPS, + valBool, + tuner_dummy, + "Ignore client maxFPS request if it is 20 (the default setting).\n" + }, + { + "timerResolution", + "timerResolution", + "0", + &timerResolution, + valInt, + tuner_none, + "If set to nonzero, xpilots will requests signals from the OS at\n" + "1/timerResolution second intervals. Server will then compute a new\n" + "frame FPS times out of every timerResolution signals.\n" + }, + { + "password", + "password", + NULL, + &password, + valString, + tuner_dummy, + "The password needed to get operator privileges.\n" + }, + { "numberOfRounds", + "numRounds", + "0", + &numberOfRounds, + valInt, + tuner_dummy, + "The number of rounds to play. If 0, unlimited.\n" + }, + { + "playerLimit", + "playerLimit", + "0", + &playerLimit, + valInt, + tuner_dummy, + "Allow only (number of bases)-playerLimit players to enter.\n" + } + /* BEGIN - TEAMCUP */ + , + { "teamcup", + "teamcup", + false, + &teamcup, + valBool, + tuner_dummy, + "Is this a teamcup match?.\n" + }, + { "statServer", + "statServer", + "rubin.e.kth.se", + &statServer, + valString, + tuner_dummy, + "Status server to report to.\n" + }, + { "statPort", + "statPort", + STATUS_PORTSTR, + &statPort, + valInt, + tuner_dummy, + "Port of the status server.\n" + }, + { "match", + "match", + "-1", + &matchNumber, + valInt, + tuner_dummy, + "The number of the match.\n" + } + /* END - TEAMCUP */ }; @@ -2440,7 +2554,7 @@ void Parser(int argc, char **argv) { - int i, j; + int i, j, gotmatch = 0; char *fname; @@ -2470,6 +2584,9 @@ puts(TITLE); IFNWINDOWS( exit(0); ) } + if (strcmp("-match", argv[i]) == 0 && i + 1 != argc) { + gotmatch = 1; + } if (argv[i][0] == '-' || argv[i][0] == '+') { for (j = 0; j < NELEM(options); j++) { @@ -2501,6 +2618,12 @@ errno = 0; error("Unknown option '%s'", argv[i]); } + if (!gotmatch) { + xpprintf("\n\n" + "!!! You must use the '-match' option to start this server.\n" + "!!! To practise you may use '-match 0'.\n\n\n"); + End_game(); + } /* * Read map file if map data not found yet. @@ -2530,6 +2653,8 @@ for (j = 0; j < NELEM(options); j++) addOption(options[j].name, options[j].defaultValue, 0, &options[j]); parseOptions(); + fireRepeatRate *= FPSMultiplier; /* might not want to do this */ + ShotsLife *= FPSMultiplier; Grok_map(); } diff -urN xpilot-4.1.0/src/server/collision.c xpilot-4.U.4tc99b/src/server/collision.c --- xpilot-4.1.0/src/server/collision.c Fri Oct 30 11:49:29 1998 +++ xpilot-4.U.4tc99b/src/server/collision.c Mon Aug 30 00:58:51 1999 @@ -655,6 +655,8 @@ not the team the ball belongs to. the latter is found through the ball's treasure */ ball->team = pl->team; + if (ball->owner == -1) + ball->life=LONG_MAX; /* for frame counter */ ball->owner = pl->id; ball->length = distance; SET_BIT(ball->status, GRAVITY); @@ -671,11 +673,13 @@ * We want a separate list of balls to avoid searching * the object list for balls. */ + + int mindist=BALL_STRING_LENGTH,dist; for (j = 0; j < NumObjs; j++) { if (BIT(Obj[j]->type, OBJ_BALL) && Obj[j]->id == -1) { - if (Wrap_length(pl->pos.x - Obj[j]->pos.x, - pl->pos.y - Obj[j]->pos.y) - < BALL_STRING_LENGTH) { + if ((dist=Wrap_length(pl->pos.x - Obj[j]->pos.x, + pl->pos.y - Obj[j]->pos.y)) + < mindist) { object *ball = Obj[j]; int bteam = -1; @@ -683,18 +687,18 @@ bteam = World.treasures[ball->treasure].team; /* - * If the treasure's team cannot connect before - * other non-team members wait until somebody has - * else has owned the ball before allowing a - * connection. This was done to stop team members + * The treasure's team cannot connect before + * somebody else has owned the ball. + * This was done to stop team members * taking and hiding with the ball... this was * considered bad gamesmanship. */ if (ball->owner != -1 || ( pl->team != TEAM_NOT_SET - && pl->team != bteam)) + && pl->team != bteam)) { pl->ball = Obj[j]; - break; + mindist=dist; + } } } } @@ -1472,8 +1476,8 @@ obj = Obj[objnum]; } - pulse->pos.x += tcos(pulse->dir) * PULSE_SPEED; - pulse->pos.y += tsin(pulse->dir) * PULSE_SPEED; + pulse->pos.x += tcos(pulse->dir) * PULSE_SPEED/FPSMultiplier; + pulse->pos.y += tsin(pulse->dir) * PULSE_SPEED/FPSMultiplier; if (BIT(World.rules->mode, WRAP_PLAY)) { if (pulse->pos.x < 0) { pulse->pos.x += World.width; @@ -1584,11 +1588,14 @@ Object_position_init_pixels(obj, x1, y1); for (i = hits = 0; i <= max; i += PULSE_SAMPLE_DISTANCE) { - x = x1 + (i * dx) / max; y = y1 + (i * dy) / max; - obj->vel.x = x - obj->pos.x; - obj->vel.y = y - obj->pos.y; + obj->vel.x = (x - CLICK_TO_FLOAT(obj->pos.cx))*FPSMultiplier; + obj->vel.y = (y - CLICK_TO_FLOAT(obj->pos.cy))*FPSMultiplier; + /* changed from = x - obj->pos.x to make lasers disappear + less frequently when wrapping. There's still a small + chance of it happening though. Didn't bother to really + fix the code to completely prevent that. */ Move_object(objnum); if (obj->life == 0) { break; diff -urN xpilot-4.1.0/src/server/contact.c xpilot-4.U.4tc99b/src/server/contact.c --- xpilot-4.1.0/src/server/contact.c Sat Aug 29 21:49:54 1998 +++ xpilot-4.U.4tc99b/src/server/contact.c Mon Aug 30 00:58:51 1999 @@ -736,7 +736,7 @@ /* * Is the game full? */ - if (NumPlayers - NumPseudoPlayers + login_in_progress + NumQueuedPlayers >= World.NumBases) { + if (NumPlayers - NumPseudoPlayers + login_in_progress + NumQueuedPlayers >= World.NumBases - playerLimit) { if (NumQueuedPlayers > 0) { return E_GAME_FULL; } @@ -745,7 +745,7 @@ return E_GAME_FULL; } } - if (NumPlayers - NumPseudoPlayers + login_in_progress + NumQueuedPlayers >= World.NumBases) { + if (NumPlayers - NumPseudoPlayers + login_in_progress + NumQueuedPlayers >= World.NumBases - playerLimit) { return E_GAME_FULL; } } @@ -825,7 +825,7 @@ long last_ack_recv; }; -static struct queued_player *qp_list; +struct queued_player *qp_list; static void Queue_remove(struct queued_player *qp, struct queued_player *prev) { @@ -902,11 +902,11 @@ if (last_unqueued_loops + 2 + (FPS >> 2) < main_loops) { /* is there a homebase available? */ - if (NumPlayers - NumPseudoPlayers + login_in_progress < World.NumBases + if (NumPlayers - NumPseudoPlayers + login_in_progress < World.NumBases - playerLimit || (Kick_robot_players(TEAM_NOT_SET) - && NumPlayers - NumPseudoPlayers + login_in_progress < World.NumBases) + && NumPlayers - NumPseudoPlayers + login_in_progress < World.NumBases - playerLimit) || (Kick_paused_players(TEAM_NOT_SET) - && NumPlayers - NumPseudoPlayers + login_in_progress < World.NumBases)) { + && NumPlayers - NumPseudoPlayers + login_in_progress < World.NumBases - playerLimit)) { /* find a team for this fellow. */ if (BIT(World.rules->mode, TEAM_PLAY)) { diff -urN xpilot-4.1.0/src/server/event.c xpilot-4.U.4tc99b/src/server/event.c --- xpilot-4.1.0/src/server/event.c Fri Oct 2 20:39:26 1998 +++ xpilot-4.U.4tc99b/src/server/event.c Sat Sep 18 20:31:16 1999 @@ -192,7 +192,8 @@ for (i = 0; i < NumPlayers; i++) { if (i == lock || (BIT(Players[i]->status, PLAYING|PAUSE|GAME_OVER) != PLAYING) - || !Player_lock_allowed(ind, i)) { + || !Player_lock_allowed(ind, i) + || TEAM(ind,i)) { continue; } l = Wrap_length(Players[i]->pos.x - pl->pos.x, @@ -219,6 +220,7 @@ int i; if (onoff != 0 && !BIT(pl->status, PAUSE)) { /* Turn pause mode on */ + Swappers[pl->team]=-1; pl->count = 10*FPS; pl->updateVisibility = 1; CLR_BIT(pl->status, SELF_DESTRUCT|PLAYING); @@ -295,7 +297,8 @@ } pressed = BITV_ISSET(pl->last_keyv, key) != 0; BITV_TOGGLE(pl->prev_keyv, key); - pl->frame_last_busy = frame_loops; + if (key != KEY_SHIELD) /* Client might automatically */ + pl->frame_last_busy = frame_loops; /* keep shields up */ /* * Allow these functions before a round has started. @@ -478,7 +481,7 @@ if (i == j) break; } while (i == ind - || BIT(Players[i]->status, GAME_OVER) + || BIT(Players[i]->status, GAME_OVER|PAUSE) || !Player_lock_allowed(ind, i)); if (i == ind) { CLR_BIT(pl->lock.tagged, LOCK_PLAYER); @@ -715,7 +718,8 @@ *l = pl->lock.pl_id; } } else { - if (Player_lock_allowed(ind, *l)) { + if ((*l!=NOT_CONNECTED) + && Player_lock_allowed(ind, GetInd[*l])) { pl->lock.pl_id = *l; SET_BIT(pl->lock.tagged, LOCK_PLAYER); } @@ -766,7 +770,7 @@ case KEY_SELF_DESTRUCT: TOGGLE_BIT(pl->status, SELF_DESTRUCT); if (BIT(pl->status, SELF_DESTRUCT)) - pl->count = 150; + pl->count = 150*FPSMultiplier; break; case KEY_PAUSE: diff -urN xpilot-4.1.0/src/server/frame.c xpilot-4.U.4tc99b/src/server/frame.c --- xpilot-4.1.0/src/server/frame.c Sat Sep 5 04:44:52 1998 +++ xpilot-4.U.4tc99b/src/server/frame.c Mon Aug 30 00:59:46 1999 @@ -341,7 +341,7 @@ pl->emergency_shield_left, pl->emergency_shield_max); if (BIT(pl->status, SELF_DESTRUCT) && pl->count > 0) { - Send_destruct(conn, pl->count); + Send_destruct(conn, pl->count/FPSMultiplier); } if (BIT(pl->used, OBJ_PHASING_DEVICE)) Send_phasingtime(conn, @@ -462,15 +462,15 @@ if (debris_colors >= 3) { if (debris_colors > 4) { if (color == BLUE) { - color = (shot->life >> 1); + color = (shot->life/FPSMultiplier >> 1); } else { - color = (shot->life >> 2); + color = (shot->life/FPSMultiplier >> 2); } } else { if (color == BLUE) { - color = (shot->life >> 2); + color = (shot->life/FPSMultiplier >> 2); } else { - color = (shot->life >> 3); + color = (shot->life/FPSMultiplier >> 3); } } if (color >= debris_colors) { @@ -819,7 +819,7 @@ && frame_loops % 5 >= 3) { continue; } - Send_radar(conn, (int)x, (int)y, 3); + Send_radar(conn, (int)x, (int)y, TEAM(i,ind) ? 3+0x80:3); } } } @@ -994,6 +994,9 @@ } else { msg = message; } + /* BEGIN - TEAMCUP */ + teamcup_log(" %s\n", message); + /* END - TEAMCUP */ for (i = 0; i < NumPlayers; i++) { pl = Players[i]; if (pl->conn != NOT_CONNECTED) { diff -urN xpilot-4.1.0/src/server/global.h xpilot-4.U.4tc99b/src/server/global.h --- xpilot-4.1.0/src/server/global.h Tue Sep 1 20:08:43 1998 +++ xpilot-4.U.4tc99b/src/server/global.h Wed Sep 22 20:45:18 1999 @@ -51,6 +51,7 @@ */ #ifdef SERVER #define FPS framesPerSecond +extern int Swappers[MAX_TEAMS]; /* person swapping to a team */ extern player **Players; extern object *Obj[]; extern pulse_t *Pulses[]; @@ -58,6 +59,7 @@ extern trans_t *Transporters[]; extern long frame_loops; extern int NumPlayers; +extern int NumOperators; extern int NumPseudoPlayers; extern int NumQueuedPlayers; extern int NumObjs; @@ -243,6 +245,40 @@ extern int maxRoundTime; extern int roundtime; +extern int FPSMultiplier; +extern bool useWreckage; +extern bool ignore20MaxFPS; +extern int timerResolution; +extern char *password; +extern int numberOfRounds; +extern int playerLimit; +extern char *statServer; +extern int statPort; +extern int matchNumber; + +/* BEGIN - TEAMCUP */ +extern FILE *teamcup_score_file; +extern bool teamcup; +#if !defined(STDVA) +# if defined(__STDC__) && !defined(__sun__) || defined(__cplusplus) +# define STDVA 1 /* has ANSI stdarg stuff */ +# else +# define STDVA 0 /* nope, still the K&R way */ +# endif +#endif +#if STDVA +void teamcup_log(const char *fmt, ...); +#else +void teamcup_log(); +#endif +void teamcup_round_start(); +void teamcup_round_end(int winning_team); +void teamcup_open_score_file(); +void teamcup_close_score_file(); + +extern int teamcup_match_inited; +extern int teamcup_status_fd; +/* END - TEAMCUP */ #endif #endif /* GLOBAL_H */ diff -urN xpilot-4.1.0/src/server/netserver.c xpilot-4.U.4tc99b/src/server/netserver.c --- xpilot-4.1.0/src/server/netserver.c Sun Aug 30 17:40:50 1998 +++ xpilot-4.U.4tc99b/src/server/netserver.c Wed Sep 22 20:44:48 1999 @@ -1776,7 +1776,9 @@ { connection_t *connp = &Conn[ind]; - return Packet_printf(&connp->w, "%c%hd%hd%c", PKT_RADAR, x, y, size); + if (connp->version < 0x4101 && size >= 0x80) + size-=0x80; /* friends and enemies look the same to old clients */ + return Packet_printf(&connp->w, "%c%hd%hd%c", PKT_RADAR, x, y, size); } int Send_damaged(int ind, int damaged) @@ -2022,9 +2024,11 @@ pl->turnspeed_s = power; break; case PKT_TURNRESISTANCE: + if (!BIT(pl->used, OBJ_AUTOPILOT) && !BIT(pl->status, HOVERPAUSE)) pl->turnresistance = power; break; case PKT_TURNRESISTANCE_S: + if (!BIT(pl->used, OBJ_AUTOPILOT) && !BIT(pl->status, HOVERPAUSE)) pl->turnresistance_s = power; break; default: @@ -2390,6 +2394,41 @@ return 1; } +static int Ind_by_name(char *name) +{ + int i,j,len; + + if (!name) + return -1; + + if (isdigit(*name)) { /* Id given directly */ + i=atoi(name); + if (i>0 && i<=NUM_IDS && (j=GetInd[i]) >= 0 && jid==i) + return j; + else + return -1; + } + + /* first look for an exact match on player nickname. */ + for (i = 0; i < NumPlayers; i++) { + if (strcasecmp(Players[i]->name, name) == 0) { + return i; + } + } + + + /* now look for a partial match on both nick and realname. */ + len=strlen(name); + for (j = -1, i = 0; i < NumPlayers; i++) { + if (strncasecmp(Players[i]->name, name, len) == 0 + || strncasecmp(Players[i]->realname, name, len) == 0) + j = (j == -1) ? i : -2; + } + + return j; +} + /* * If a message contains a colon then everything before that colon is * either a unique player name prefix, or a team number with players. @@ -2451,22 +2490,7 @@ } } else { /* Player message */ - sent = -1; - /* first look for an exact match on player nickname. */ - for (i = 0; i < NumPlayers; i++) { - if (strcasecmp(Players[i]->name, str) == 0) { - sent = i; - break; - } - } - if (sent == -1) { - /* now look for a partial match on both nick and realname. */ - for (sent = -1, i = 0; i < NumPlayers; i++) { - if (strncasecmp(Players[i]->name, str, len) == 0 - || strncasecmp(Players[i]->realname, str, len) == 0) - sent = (sent == -1) ? i : -2; - } - } + sent=Ind_by_name(str); switch (sent) { case -2: sprintf(msg, "Message not sent, %s matches more than one player!", @@ -2489,6 +2513,490 @@ } } +int Swappers[MAX_TEAMS]={-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}; /* fix this */ + +static void Send_all_info(player *pl) +{ + int i; + + for (i=0;iconn != NOT_CONNECTED) { + Send_player(Players[i]->conn,pl->id); + Send_score(Players[i]->conn,pl->id,pl->score,pl->life, + pl->mychar); + Send_base(Players[i]->conn,pl->id,pl->home_base); + } +} + +static void Swap_team(int ind, char *args) +{ + int i,team; + player *pl=Players[ind]; + char msg[MSG_LEN*2]; + + for (i=0;iid) + Swappers[i]=-1; + + if (!args) + sprintf(msg,"Not swapping to any team."); + else { + team=atoi(args); + if (pl->team >= MAX_TEAMS) + sprintf(msg,"You do not currently have a team. Swapping doesn't work."); + else if (team<0 || team>=MAX_TEAMS || World.teams[team].NumBases == 0) + sprintf(msg,"There are no bases for team %d on this map.",team); + else if (reserveRobotTeam && team==robotTeam) + sprintf(msg,"You cannot join the robot team on this server."); + else if (team == pl->team) + sprintf(msg,"You already are on team %d.",team); + else if (World.teams[team].NumBases - World.teams[team].NumMembers > 0) { + sprintf(msg,"%s has swapped to team %d.",pl->name,team); + Set_message(msg); + if (BIT(pl->have, OBJ_BALL)) + Detach_ball(ind, -1); + World.teams[pl->team].NumMembers--; + pl->team=team; + World.teams[pl->team].NumMembers++; + if (BIT(pl->mode, LIMITED_LIVES)) + for (i = 0; i < NumPlayers; i++) + if (!TEAM(ind, i) && !BIT(Players[i]->status,PAUSE)) { + if (pl->mychar == ' ') + pl->mychar = 'W'; + pl->prev_life = pl->life = 0; + SET_BIT(pl->status, GAME_OVER|PLAYING); + CLR_BIT(pl->status, SELF_DESTRUCT); + pl->count=-1; + break; + } + Pick_startpos(GetInd[pl->id]); + Send_all_info(pl); + return; + } else { + i=Swappers[pl->team]; + while (i != -1) + if ( (i=Players[GetInd[i]]->team) != team) + i=Swappers[i]; + else { + int xbase=pl->home_base, xteam=pl->team,xbase2,xteam2; + player *pl2=pl; + + do { + pl2=Players[GetInd[Swappers[xteam]]]; + Swappers[xteam]=-1; + xbase2=pl2->home_base; + xteam2=pl2->team; + if (BIT(pl2->have, OBJ_BALL)) + Detach_ball(GetInd[pl2->id], -1); + pl2->team=xteam; + pl2->home_base=xbase; + if (pl2->mychar == ' ') + pl2->mychar = 'W'; + pl2->prev_life = pl2->life = 0; + SET_BIT(pl2->status, GAME_OVER|PLAYING); + CLR_BIT(pl2->status, SELF_DESTRUCT); + pl2->count=-1; + Go_home(GetInd[pl2->id]); + Send_all_info(pl2); + /* This can send a huge amount of data if several players swap. + Unfortunately all player data, even shipshape, has to be + resent to change the team of a player. This should probably + be changed somehow to prevent disturbing other players. */ + xbase=xbase2; + xteam=xteam2; + } while (xteam != team); + if (BIT(pl->have, OBJ_BALL)) + Detach_ball(ind, -1); + pl->team=team; + pl->home_base=xbase; + if (pl->mychar == ' ') + pl->mychar = 'W'; + pl->prev_life = pl->life = 0; + SET_BIT(pl->status, GAME_OVER|PLAYING); + CLR_BIT(pl->status, SELF_DESTRUCT); + pl->count=-1; + Go_home(ind); + Send_all_info(pl); + sprintf(msg,"Some players swapped teams."); + Set_message(msg); + return; + } + + for (i = NumPlayers - 1; i >= 0; i--) + if (Players[i]->conn != NOT_CONNECTED + && BIT(Players[i]->status, PAUSE) + && (Players[i]->team == team)) { + sprintf(msg,"%s has swapped with paused %s.",pl->name, + Players[i]->name); + Set_message(msg); + if (BIT(pl->have, OBJ_BALL)) + Detach_ball(GetInd[pl->id], -1); + Players[i]->team=pl->team; + pl->team=team; + team=Players[i]->home_base; + Players[i]->home_base=pl->home_base; + Go_home(i); + pl->home_base=team; + Send_all_info(Players[i]); + if (BIT(pl->mode, LIMITED_LIVES)) + for (i = 0; i < NumPlayers; i++) + if (!TEAM(ind, i) && !BIT(Players[i]->status,PAUSE)) { + if (pl->mychar == ' ') + pl->mychar = 'W'; + pl->prev_life = pl->life = 0; + SET_BIT(pl->status, GAME_OVER|PLAYING); + CLR_BIT(pl->status, SELF_DESTRUCT); + pl->count=-1; + Go_home(ind); + break; + } + Send_all_info(pl); + return; + } + sprintf(msg,"You are queued for swap to team %d.",team); + Swappers[team]=pl->id; + } + } + sprintf(msg+strlen(msg)," [*Server reply*]"); + Set_player_message(pl,msg); + return; +} + +extern int game_lock; + +extern void Reset_all_players(void); + +extern int roundCounter; + +struct queued_player { + struct queued_player *next; + char real_name[MAX_CHARS]; + char nick_name[MAX_CHARS]; + char disp_name[MAX_CHARS]; + char host_name[MAX_CHARS]; + char host_addr[24]; + int port; + int team; + unsigned version; + int login_port; + long last_ack_sent; + long last_ack_recv; +}; + +extern struct queued_player *qp_list; + +enum Command { + KICK_CMD, VERSION_CMD, HELP_CMD, RESET_CMD, TEAM_CMD, + PASSWORD_CMD, LOCK_CMD, SET_CMD, PAUSE_CMD, SHOW_CMD, + ADVANCE_CMD, NO_CMD +}; + +typedef struct { + const char *name; + const char *help; + int operOnly; + enum Command number; +} commandInfo; + +static commandInfo commands[] = { + { + "help", + "Without arguments, prints command list. /help gives more info.", + 0, + HELP_CMD + }, + { + "team", + "/team swaps you to given team. " + "Can be used with full teams too.", + 0, + TEAM_CMD + }, + { + "version", + "Print server version.", + 0, + VERSION_CMD + }, + { + "lock", + "Just /lock tells lock status. /lock 1 locks, /lock 0 unlocks. (operator)", + 0, /* checked in the function */ + LOCK_CMD + }, + { + "password", + "/password . If string matches -password option, " + "gives operator status.", + 0, + PASSWORD_CMD + }, + { + "pause", + "/pause . Pauses player. (operator)", + 1, + PAUSE_CMD + }, + { + "reset", + "Just /reset starts a new round." + "/reset all also sets scores to 0. (operator)", + 1, + RESET_CMD + }, + { + "set", + "/set