diff -urN xpilot-4.2.0.orig/Local.config xpilot-4.2.0dc2000a1/Local.config --- xpilot-4.2.0.orig/Local.config Mon Mar 13 20:11:16 2000 +++ xpilot-4.2.0dc2000a1/Local.config Sun Mar 19 04:53:42 2000 @@ -178,8 +178,8 @@ VERSION_MINOR = 2 VERSION_PATCHLEVEL = 0 VERSION_WINDOWS = 13 - VERSION_STATUS = - RELEASEDATE = Mar 13th, 2000 + VERSION_STATUS = DC2000a1 + RELEASEDATE = Mar 19th, 2000 /* diff -urN xpilot-4.2.0.orig/src/common/config.c xpilot-4.2.0dc2000a1/src/common/config.c --- xpilot-4.2.0.orig/src/common/config.c Sat Mar 18 14:26:42 2000 +++ xpilot-4.2.0dc2000a1/src/common/config.c Sun Mar 19 04:53:42 2000 @@ -46,9 +46,9 @@ #ifndef DEFAULT_MAP # ifdef _WINDOWS -# define DEFAULT_MAP "default.xp" +# define DEFAULT_MAP "dc2000.xp" # else -# define DEFAULT_MAP "globe.xp" +# define DEFAULT_MAP "dc2000.xp" # endif #endif diff -urN xpilot-4.2.0.orig/src/common/version.h xpilot-4.2.0dc2000a1/src/common/version.h --- xpilot-4.2.0.orig/src/common/version.h Sat Mar 18 14:26:45 2000 +++ xpilot-4.2.0dc2000a1/src/common/version.h Sun Mar 19 04:53:42 2000 @@ -28,15 +28,15 @@ #if defined(__hpux) # pragma COPYRIGHT_DATE "1991-2000" # pragma COPYRIGHT "Bjørn Stabell, Ken Ronny Schouten, Bert Gijsbers & Dick Balaska" -# pragma VERSIONID "XPilot 4.2.0" +# pragma VERSIONID "XPilot 4.2.0-DC2000a1" #endif -#define VERSION "4.2.0" +#define VERSION "4.2.0-DC2000a1" #ifdef _WINDOWS -#define TITLE "4.2.0-NT13" +#define TITLE "4.2.0-DC2000a1-NT13" #define VERSION_WINDOWS "13" #else -#define TITLE "XPilot 4.2.0" +#define TITLE "XPilot 4.2.0-DC2000a1" #endif #define AUTHORS "Bjørn Stabell, Ken Ronny Schouten, Bert Gijsbers & Dick Balaska" #define COPYRIGHT "Copyright © 1991-2000 by Bjørn Stabell, Ken Ronny Schouten, Bert Gijsbers & Dick Balaska" diff -urN xpilot-4.2.0.orig/src/server/cmdline.c xpilot-4.2.0dc2000a1/src/server/cmdline.c --- xpilot-4.2.0.orig/src/server/cmdline.c Sat Mar 18 14:26:52 2000 +++ xpilot-4.2.0dc2000a1/src/server/cmdline.c Sun Mar 19 04:53:42 2000 @@ -40,6 +40,7 @@ #include "defaults.h" #include "error.h" #include "portability.h" +#include "status.h" char cmdline_version[] = VERSION; @@ -234,6 +235,17 @@ bool ignore20MaxFPS; /* ignore client maxFPS request if it is 20 */ +bool useWreckage; /* create wreckage or not? */ +int timerResolution; /* OS timer resolution (times/s) */ +char *password; /* password for operator status */ +int numberOfRounds; /* how many rounds to play */ +/* 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 */ + extern char conf_default_map_string[]; /* from common/config.c */ extern char conf_robotfile_string[]; /* from common/config.c */ @@ -2538,7 +2550,90 @@ "Whether the server is prevented from being swapped out of memory.\n", MAP("General") }, - + { + "wreckage", + "wreckage", + "true", + &useWreckage, + valBool, + tuner_dummy, + "Do destroyed ships leave wreckage?\n", + MAP(NULL) + }, + { + "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", + MAP(NULL) + }, + { + "password", + "password", + NULL, + &password, + valString, + tuner_dummy, + "The password needed to get operator privileges.\n", + MAP(NULL) + }, + { + "numberOfRounds", + "numRounds", + "0", + &numberOfRounds, + valInt, + tuner_dummy, + "The number of rounds to play. If 0, unlimited.\n", + MAP(NULL) + }, + /* BEGIN - TEAMCUP */ + { + "teamcup", + "teamcup", + false, + &teamcup, + valBool, + tuner_dummy, + "Is this a teamcup match?.\n", + MAP(NULL) + }, + { + "statServer", + "statServer", + "shell.e.kth.se", + &statServer, + valString, + tuner_dummy, + "Status server to report to.\n", + MAP(NULL) + }, + { + "statPort", + "statPort", + STATUS_PORTSTR, + &statPort, + valInt, + tuner_dummy, + "Port of the status server.\n", + MAP(NULL) + }, + { + "match", + "match", + "-1", + &matchNumber, + valInt, + tuner_dummy, + "The number of the match.\n", + MAP(NULL) + } + /* END - TEAMCUP */ }; @@ -2712,7 +2807,7 @@ int Parser(int argc, char **argv) { - int i, j; + int i, j, gotmatch = 0; char *fname; @@ -2742,6 +2837,9 @@ puts(TITLE); return(FALSE); } + 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++) { @@ -2772,6 +2870,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"); + return(FALSE); } /* diff -urN xpilot-4.2.0.orig/src/server/contact.c xpilot-4.2.0dc2000a1/src/server/contact.c --- xpilot-4.2.0.orig/src/server/contact.c Sat Mar 18 14:26:53 2000 +++ xpilot-4.2.0dc2000a1/src/server/contact.c Sun Mar 19 04:53:43 2000 @@ -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) { diff -urN xpilot-4.2.0.orig/src/server/event.c xpilot-4.2.0dc2000a1/src/server/event.c --- xpilot-4.2.0.orig/src/server/event.c Sat Mar 18 14:26:53 2000 +++ xpilot-4.2.0dc2000a1/src/server/event.c Sun Mar 19 04:53:43 2000 @@ -236,6 +236,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); diff -urN xpilot-4.2.0.orig/src/server/frame.c xpilot-4.2.0dc2000a1/src/server/frame.c --- xpilot-4.2.0.orig/src/server/frame.c Sat Mar 18 14:26:53 2000 +++ xpilot-4.2.0dc2000a1/src/server/frame.c Sun Mar 19 04:53:43 2000 @@ -954,7 +954,7 @@ && frame_loops % 5 >= 3) { continue; } - Frame_radar_buffer_add((int)x, (int)y, 3); + Frame_radar_buffer_add((int)x, (int)y, TEAM(i, ind) ? 3+0x80 : 3); } } } @@ -1135,6 +1135,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.2.0.orig/src/server/global.h xpilot-4.2.0dc2000a1/src/server/global.h --- xpilot-4.2.0.orig/src/server/global.h Sat Mar 18 14:26:53 2000 +++ xpilot-4.2.0dc2000a1/src/server/global.h Sun Mar 19 04:53:43 2000 @@ -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; @@ -245,6 +247,37 @@ extern bool useWreckage; extern bool ignore20MaxFPS; + +extern int timerResolution; +extern char *password; +extern int numberOfRounds; + +/* BEGIN - TEAMCUP */ +extern char *statServer; +extern int statPort; +extern int matchNumber; +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 diff -urN xpilot-4.2.0.orig/src/server/netserver.c xpilot-4.2.0dc2000a1/src/server/netserver.c --- xpilot-4.2.0.orig/src/server/netserver.c Sat Mar 18 14:26:54 2000 +++ xpilot-4.2.0dc2000a1/src/server/netserver.c Sun Mar 19 04:53:43 2000 @@ -1888,6 +1888,10 @@ { connection_t *connp = &Conn[ind]; + if (connp->version < 0x4101 && size >= 0x80) { + /* Friends and enemies look the same to old clients. */ + size -= 0x80; + } return Packet_printf(&connp->w, "%c%hd%hd%c", PKT_RADAR, x, y, size); } @@ -2517,6 +2521,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 && j < NumPlayers + && Players[j]->id == 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. @@ -2578,22 +2617,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!", @@ -2616,6 +2640,522 @@ } } +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 *sname; + const char *help; + int operOnly; + enum Command number; +} commandInfo; + +static commandInfo commands[] = { + { + "help", + "h", + "Without arguments, prints command list. /help gives more info.", + 0, + HELP_CMD + }, + { + "team", + "t", + "/team swaps you to given team. " + "Can be used with full teams too.", + 0, + TEAM_CMD + }, + { + "version", + "v", + "Print server version.", + 0, + VERSION_CMD + }, + { + "lock", + "l", + "Just /lock tells lock status. /lock 1 locks, /lock 0 unlocks. (operator)", + 0, /* checked in the function */ + LOCK_CMD + }, + { + "password", + "pas", + "/password . If string matches -password option, " + "gives operator status.", + 0, + PASSWORD_CMD + }, + { + "pause", + "pau", + "/pause . Pauses player. (operator)", + 1, + PAUSE_CMD + }, + { + "reset", + "r", + "Just /reset re-starts the round. " + "/reset all also sets scores to 0. (operator)", + 1, + RESET_CMD + }, + { + "set", + "set", + "/set