Only in xpilot-4.U.3.svan2: README.rank diff -ur xpilot-4.U.4a3/src/client/default.c xpilot-4.U.3.svan2/src/client/default.c --- xpilot-4.U.4a3/src/client/default.c Fri Jul 23 15:06:43 1999 +++ xpilot-4.U.3.svan2/src/client/default.c Sat Jul 10 23:21:06 1999 @@ -122,7 +122,8 @@ const char* winHelpFile; #endif -keys_t buttonDefs[MAX_POINTER_BUTTONS]; +buttondef_t buttonDefs[MAX_POINTER_BUTTONS]; + /* * Structure to store all the client options. @@ -2978,16 +2979,24 @@ * Pointer button bindings */ for (i = 0; i < MAX_POINTER_BUTTONS; i++) { + buttonDefs[i].num = 0; sprintf(resValue, "pointerButton%d", i+1); Get_resource(rDB, resValue, resValue, sizeof resValue); ptr = resValue; - if (*ptr != '\0') { + while (ptr && *ptr != '\0') { + char *next = strchr(ptr, ','); + + if (next) { + *next = '\0'; + next++; + } if (!strncasecmp(ptr, "key", 3)) ptr += 3; for (j = 0; j < NELEM(options); j++) { if (options[j].key != KEY_DUMMY) { if (!strcasecmp(ptr, options[j].name + 3)) { - buttonDefs[i] = options[j].key; + buttonDefs[i].keys[buttonDefs[i].num] = options[j].key; + buttonDefs[i].num++; break; } } @@ -2996,6 +3005,8 @@ errno = 0; error("Unknown key \"%s\" for pointer button %d", resValue, i); } + if (buttonDefs[i].num >= MAX_KEYS_PER_BUTTON) break; + ptr = next; } } diff -ur xpilot-4.U.4a3/src/client/paintradar.c xpilot-4.U.3.svan2/src/client/paintradar.c --- xpilot-4.U.4a3/src/client/paintradar.c Fri Jul 23 15:06:33 1999 +++ xpilot-4.U.3.svan2/src/client/paintradar.c Sat Jul 10 23:20:12 1999 @@ -147,13 +147,12 @@ int s; s = radar_ptr[i].size; - if (s >= 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); + if (s >= 0x80) { /* from the same team */ + if (colorSwitch && !multibuffer && maxColors >= 4) { + XSetForeground(dpy, radarGC, colors[4].pixel); + } else { + XSetForeground(dpy, radarGC, colors[RED].pixel); + } s-=0x80; } if (s == 0) diff -ur xpilot-4.U.4a3/src/client/talk.c xpilot-4.U.3.svan2/src/client/talk.c --- xpilot-4.U.4a3/src/client/talk.c Thu Apr 16 19:39:47 1998 +++ xpilot-4.U.3.svan2/src/client/talk.c Sun May 23 16:36:30 1999 @@ -429,6 +429,76 @@ return result; /* keep on talking if true, no more talking if false */ } +void Talk_paste(void){ + + int str_len = strlen(talk_str); /* current length */ + int max_len = MAX_CHARS - 2; /* absolute max */ + int new_len; /* after pasting */ + int char_width = XTextWidth(talkFont, " ", 1); + int max_width = (TALK_WINDOW_WIDTH - 2*TALK_INSIDE_BORDER - 5); + + int accept_len = (max_width / char_width) - str_len + 1 ; + /* for still matching the window */ + char paste_buf[MAX_CHARS - 2]; /* gets the XBuffer */ + int n_bytes; /* returned from XBuffer*/ + char tmp_str[MAX_CHARS - 2]; + + bool cursor_visible = talk_cursor.visible; + int i; + + accept_len = (accept_len+str_len>max_len) ? + (max_len - str_len) : accept_len; /* limit it anyway */ + if (!accept_len){ + XBell(dpy, 100); + return; + } + + strncpy(paste_buf, XFetchBytes(dpy, &n_bytes), accept_len); + /* XStoreBytes(dpy, "", 0); no spam? */ + if ( n_bytes > accept_len){ + n_bytes = accept_len; + XBell(dpy, 100); + } + paste_buf[accept_len] = '\0'; + + /* substitute unprintables */ + for(i = 0; i 126 && paste_buf[i] < 161) ){ + paste_buf[i] = ' '; + } + } + + /* append or insert */ + strcpy(tmp_str, talk_str); + strcpy(&tmp_str[talk_cursor.point], paste_buf); + strcpy(&tmp_str[talk_cursor.point + n_bytes], + &talk_str[talk_cursor.point]); + new_len = str_len + n_bytes; + + Talk_cursor(false); + /*s. Talk_do_event()*/ + if (talk_cursor.point < str_len) { + XSetForeground(dpy, talkGC, colors[BLACK].pixel); + XDrawString(dpy, talk_w, talkGC, + talk_cursor.point * char_width + TALK_INSIDE_BORDER, + talkFont->ascent + TALK_INSIDE_BORDER, + &talk_str[talk_cursor.point], + str_len - talk_cursor.point); + XSetForeground(dpy, talkGC, colors[WHITE].pixel); + } + XDrawString(dpy, talk_w, talkGC, + talk_cursor.point * char_width + TALK_INSIDE_BORDER, + talkFont->ascent + TALK_INSIDE_BORDER, + &tmp_str[talk_cursor.point], + new_len - talk_cursor.point); + talk_cursor.point += n_bytes; + Talk_cursor(cursor_visible); + + strcpy(talk_str, tmp_str); + return; +} + + void Talk_resize(void) { if (talk_created) { diff -ur xpilot-4.U.4a3/src/client/xevent.c xpilot-4.U.3.svan2/src/client/xevent.c --- xpilot-4.U.4a3/src/client/xevent.c Fri Jul 23 15:06:43 1999 +++ xpilot-4.U.3.svan2/src/client/xevent.c Sat Jul 10 21:57:15 1999 @@ -65,7 +65,6 @@ int initialPointerControl = false; bool pointerControl = false; -extern keys_t buttonDefs[MAX_POINTER_BUTTONS]; extern Cursor pointerControlCursor; @@ -244,6 +243,8 @@ initialPointerControl = true; Pointer_control_set_state(false); } + XSelectInput(dpy, draw, PointerMotionMask | ButtonPressMask + | ButtonReleaseMask); /* cut'n'paste */ Talk_map_window(true); } else { @@ -598,6 +599,7 @@ n = XEventsQueued(dpy, type); for (i = 0; i < n; i++) { XNextEvent(dpy, &event); + if (XFilterEvent(&event, None)) continue; #endif switch (event.type) { @@ -673,10 +675,18 @@ if (pointerControl && !talk_mapped && event.xbutton.button <= MAX_POINTER_BUTTONS) { - if (Key_press(buttonDefs[event.xbutton.button-1])) { - Net_key_change(); + int i; + + for (i = 0; + i < buttonDefs[event.xbutton.button-1].num; i++) { + if (Key_press(buttonDefs[event.xbutton.button-1].keys[i])) { + Net_key_change(); + } } } + if (talk_mapped && event.xbutton.button == 2){ + Talk_paste(); + } break; } if (Widget_event(&event) != 0) { @@ -707,8 +717,13 @@ if (pointerControl && !talk_mapped && event.xbutton.button <= MAX_POINTER_BUTTONS) { - if (Key_release(buttonDefs[event.xbutton.button-1])) { - Net_key_change(); + int i; + + for (i = 0; + i < buttonDefs[event.xbutton.button-1].num; i++) { + if (Key_release(buttonDefs[event.xbutton.button-1].keys[i])) { + Net_key_change(); + } } } break; diff -ur xpilot-4.U.4a3/src/client/xinit.h xpilot-4.U.3.svan2/src/client/xinit.h --- xpilot-4.U.4a3/src/client/xinit.h Fri Oct 2 20:39:22 1998 +++ xpilot-4.U.3.svan2/src/client/xinit.h Sat Jul 10 21:36:20 1999 @@ -34,8 +34,6 @@ #define MAX_TOP_HEIGHT 1024 #define DEF_TOP_HEIGHT 768 -#define MAX_POINTER_BUTTONS 5 - extern Atom ProtocolAtom, KillAtom; extern int buttonColor, windowColor, borderColor; extern int ButtonHeight; @@ -71,6 +69,7 @@ extern void Talk_resize(void); extern void Talk_cursor(bool visible); extern void Talk_map_window(bool map); +extern void Talk_paste(void); extern int Talk_do_event(XEvent *event); extern void Quit(void); extern int FatalError(Display *dpy); diff -ur xpilot-4.U.4a3/src/common/config.h xpilot-4.U.3.svan2/src/common/config.h --- xpilot-4.U.4a3/src/common/config.h Fri Apr 17 13:40:51 1998 +++ xpilot-4.U.3.svan2/src/common/config.h Sun May 23 16:10:48 1999 @@ -38,7 +38,7 @@ # ifdef _WINDOWS # define DEFAULT_MAP "default.xp" # else -# define DEFAULT_MAP "globe.xp" +# define DEFAULT_MAP "teamcup.map" # endif #endif diff -ur xpilot-4.U.4a3/src/common/keys.h xpilot-4.U.3.svan2/src/common/keys.h --- xpilot-4.U.4a3/src/common/keys.h Fri Jul 23 15:06:43 1999 +++ xpilot-4.U.3.svan2/src/common/keys.h Sat Jul 10 22:05:55 1999 @@ -25,6 +25,9 @@ #ifndef KEYS_H #define KEYS_H +#define MAX_POINTER_BUTTONS 5 +#define MAX_KEYS_PER_BUTTON 10 + /* * The following enum type defines the possible actions as a result of * a keypress or keyrelease. @@ -161,6 +164,13 @@ extern char* Get_keyHelpString(keys_t key); extern const char *Get_keyResourceString(keys_t key); + +typedef struct { + keys_t keys[MAX_KEYS_PER_BUTTON]; + int num; +} buttondef_t; + +extern buttondef_t buttonDefs[MAX_POINTER_BUTTONS]; #endif diff -ur xpilot-4.U.4a3/src/server/Imakefile xpilot-4.U.3.svan2/src/server/Imakefile --- xpilot-4.U.4a3/src/server/Imakefile Sun Aug 30 14:15:34 1998 +++ xpilot-4.U.3.svan2/src/server/Imakefile Sun May 23 16:11:05 1999 @@ -40,13 +40,13 @@ cannon.c cmdline.c collision.c contact.c event.c frame.c id.c map.c \ metaserver.c netserver.c objpos.c option.c play.c player.c \ robot.c robotdef.c rules.c saudio.c sched.c server.c \ - update.c walls.c + update.c walls.c rank.c OBJS = \ cannon.o cmdline.o collision.o contact.o event.o frame.o id.o map.o \ metaserver.o netserver.o objpos.o option.o play.o player.o \ robot.o robotdef.o rules.o saudio.o sched.o server.o \ - update.o walls.o + update.o walls.o rank.o DEPLIBS = ../common/libxpcommon.a diff -ur xpilot-4.U.4a3/src/server/collision.c xpilot-4.U.3.svan2/src/server/collision.c --- xpilot-4.U.4a3/src/server/collision.c Fri Jul 23 15:06:34 1999 +++ xpilot-4.U.3.svan2/src/server/collision.c Sun May 23 16:29:23 1999 @@ -400,7 +400,7 @@ { player *pl = Players[ind]; - pl->score += (points); + AddScore(pl,points); if (pl->conn != NOT_CONNECTED) Send_score_object(pl->conn, points, x, y, msg); @@ -584,7 +584,7 @@ sound_play_sensors(Players[j]->pos.x, Players[j]->pos.y, PLAYER_RAN_OVER_PLAYER_SOUND); - pl->kills++; + AddKill(pl); if (IS_TANK_IND(i)) { sc = (int)floor(Rate(Players[i_tank_owner]->score, Players[j]->score) @@ -611,7 +611,7 @@ Set_message(msg); sound_play_sensors(pl->pos.x, pl->pos.y, PLAYER_RAN_OVER_PLAYER_SOUND); - Players[j]->kills++; + AddKill(Players[j]); sc = (int)floor(Rate(Players[j]->score, pl->score) * runoverKillScoreMult); Score_players(j_tank_owner, sc, pl->name, @@ -666,6 +666,7 @@ pl->ball = NULL; sound_play_sensors(pl->pos.x, pl->pos.y, CONNECT_BALL_SOUND); + pl->grabbedBallFrame = main_loops; } } } else { @@ -950,7 +951,7 @@ OBJ_Y_IN_BLOCKS(pl), Players[killer]->name); } else { - Players[killer]->kills++; + AddBallKill(Players[killer]); sc = (int)floor(Rate(Players[killer]->score, pl->score) * ballKillScoreMult); Score_players(killer, sc, pl->name, @@ -1220,7 +1221,7 @@ OBJ_Y_IN_BLOCKS(pl), (killer == -1) ? "[Explosion]" : pl->name); } else { - Players[killer]->kills++; + AddKill(Players[killer]); sc = (int)floor(Rate(Players[killer]->score, pl->score) * explosionKillScoreMult); Score_players(killer, sc, pl->name, @@ -1362,7 +1363,7 @@ Players[killer]->name); } else { DFLOAT factor; - Players[killer]->kills++; + AddKill(Players[killer]); switch (obj->type) { case OBJ_SHOT: if (BIT(obj->mods.warhead, CLUSTER)) { @@ -1712,7 +1713,7 @@ PLAYER_ROASTED_SOUND); Set_message(msg); if (pl && pl->id != vic->id) { - pl->kills++; + AddLaserKill(pl); Robot_war(victims[j].ind, ind); } } diff -ur xpilot-4.U.4a3/src/server/contact.c xpilot-4.U.3.svan2/src/server/contact.c --- xpilot-4.U.4a3/src/server/contact.c Fri Jul 23 15:06:34 1999 +++ xpilot-4.U.3.svan2/src/server/contact.c Sun Jul 18 01:26:31 1999 @@ -189,7 +189,9 @@ * Kick paused players? * Return the number of kicked players. */ -static int Kick_paused_players(int team) + + +static int do_kick(int team, int nonlast) { int i; int num_unpaused = 0; @@ -197,7 +199,9 @@ for (i = NumPlayers - 1; i >= 0; i--) { if (Players[i]->conn != NOT_CONNECTED && BIT(Players[i]->status, PAUSE) - && (team == TEAM_NOT_SET || Players[i]->team == team)) { + && (team == TEAM_NOT_SET || Players[i]->team == team) + && !(Players[i]->privs & PRIV_NOAUTOKICK) + && (!nonlast || !(Players[i]->privs & PRIV_AUTOKICKLAST))) { if (team == TEAM_NOT_SET) { sprintf(msg, "The paused \"%s\" was kicked because the game is full.", @@ -215,6 +219,16 @@ } return num_unpaused; +} + +static int Kick_paused_players(int team) +{ + int ret; + + ret = do_kick(team, 1); + if (ret < 1) ret = do_kick(team, 0); + + return ret; } diff -ur xpilot-4.U.4a3/src/server/event.c xpilot-4.U.3.svan2/src/server/event.c --- xpilot-4.U.4a3/src/server/event.c Fri Jul 23 15:06:34 1999 +++ xpilot-4.U.3.svan2/src/server/event.c Sat Jul 10 23:03:42 1999 @@ -220,6 +220,7 @@ int i; if (onoff != 0 && !BIT(pl->status, PAUSE)) { /* Turn pause mode on */ + Detach_ball(ind, -1); Swappers[pl->team]=-1; pl->count = 10*FPS; pl->updateVisibility = 1; @@ -227,6 +228,7 @@ SET_BIT(pl->status, PAUSE); pl->mychar = 'P'; updateScores = true; + strcpy(pl->scorenode->logout, "paused"); if (BIT(pl->have, OBJ_BALL)) Detach_ball(ind, -1); } @@ -234,6 +236,7 @@ if (pl->count <= 0) { bool toolate = false; + pl->idleCount = 0; /* idle */ CLR_BIT(pl->status, PAUSE); updateScores = true; if (BIT(pl->mode, LIMITED_LIVES)) { @@ -249,6 +252,7 @@ } } } + strcpy(pl->scorenode->logout, "playing"); if (toolate) { pl->life = 0; pl->mychar = 'W'; diff -ur xpilot-4.U.4a3/src/server/netserver.c xpilot-4.U.3.svan2/src/server/netserver.c --- xpilot-4.U.4a3/src/server/netserver.c Fri Jul 23 15:06:34 1999 +++ xpilot-4.U.3.svan2/src/server/netserver.c Sun Jul 18 02:20:40 1999 @@ -159,6 +159,7 @@ #include "saudio.h" #include "checknames.h" #include "server.h" +#include "rank.h" char netserver_version[] = VERSION; @@ -649,6 +650,66 @@ return -1; } + +char *banned_reals[] = { "<", NULL }; +char *banned_nicks[] = { "<", NULL }; +char *banned_addrs[] = { NULL }; +char *banned_hosts[] = { "<", NULL }; + +static void dcase(char *str) +{ + while (*str) { + *str = tolower(*str); + str++; + } +} + +int CheckBanned(char *real, char *nick, char *addr, char *host) +{ + int ret = 0, i; + + real = strdup(real); + nick = strdup(nick); + addr = strdup(addr); + host = strdup(host); + dcase(real); + dcase(nick); + dcase(addr); + dcase(host); + + for (i = 0; banned_reals[i] != NULL; i++) { + if (strstr(real, banned_reals[i]) != NULL) { + ret = 1; + goto out; + } + } + for (i = 0; banned_nicks[i] != NULL; i++) { + if (strstr(nick, banned_nicks[i]) != NULL) { + ret = 1; + goto out; + } + } + for (i = 0; banned_addrs[i] != NULL; i++) { + if (strstr(addr, banned_addrs[i]) != NULL) { + ret = 1; + goto out; + } + } + for (i = 0; banned_hosts[i] != NULL; i++) { + if (strstr(host, banned_hosts[i]) != NULL) { + ret = 1; + goto out; + } + } + out: + free(real); + free(nick); + free(addr); + free(host); + + return ret; +} + /* * A client has requested a playing connection with this server. * See if we have room for one more player and if his name is not @@ -944,6 +1005,10 @@ if (connp->setup >= Setup->setup_size) { Conn_set_state(connp, CONN_DRAIN, CONN_LOGIN); } + if (CheckBanned(connp->real, connp->nick, connp->addr, connp->host)) { + Destroy_connection(ind, "Banned from server, conntact " LOCALGURU); + return -1; + } return 0; } @@ -954,6 +1019,30 @@ * and if this succeeds update the player information * to all connected players. */ +static void LegalizeName(char *string) +{ + while ( *string != '\0' ) { + char ch = *string; + if ( ch == ' ' ) + ch = 0xA0; + else if ( ch == '\"' ) + ch = '\''; + else if ( !isprint(ch) ) + ch = '.'; + string++; + } +} + +static void LegalizeHost(char *string) +{ + while ( *string != '\0' ) { + char ch = *string; + if ( !isalnum(ch) && ch != '.' ) + ch = '.'; + string++; + } +} + static int Handle_login(int ind) { connection_t *connp = &Conn[ind]; @@ -1007,9 +1096,13 @@ return -1; } pl = Players[NumPlayers]; + strcpy(pl->illegalName, connp->nick); strcpy(pl->name, connp->nick); strcpy(pl->realname, connp->real); strcpy(pl->hostname, connp->host); + LegalizeName(pl->name); + LegalizeName(pl->realname); + LegalizeHost(pl->hostname); pl->isowner = (!strcmp(pl->realname, Server.name) && !strcmp(connp->addr, "127.0.0.1")); if (connp->team != TEAM_NOT_SET) { @@ -1089,6 +1182,10 @@ pl->name, pl->realname, World.name, World.author); } Set_message(msg); + if (getenv("XPILOTGREETING") != NULL) { + sprintf(msg, "%s", getenv("XPILOTGREETING")); + Set_player_message(pl, msg); + } conn_bit = (1 << ind); for (i = 0; i < World.NumCannons; i++) { @@ -1153,6 +1250,14 @@ Set_message(msg); } + for (i = 0; /* idle */ + i < NumPlayers; + i++ ) + if ( Players[i]->mychar == ' ' ) + Players[i]->idleCount = 0; + + Get_saved_score(pl); /* ranking */ + return 0; } @@ -1485,7 +1590,7 @@ "%c%hd" "%c%c" "%s%s%s" "%S", PKT_PLAYER, pl->id, pl->team, pl->mychar, - pl->name, pl->realname, pl->hostname, + pl->illegalName, pl->realname, pl->hostname, buf); if (connp->version > 0x3200) { if (n > 0) { @@ -1933,6 +2038,7 @@ pl = Players[GetInd[connp->id]]; memcpy(pl->last_keyv, connp->r.ptr, size); connp->r.ptr += size; + Players[GetInd[connp->id]]->idleCount = 0; /* idle */ Handle_keyboard(GetInd[connp->id]); } if (connp->num_keyboard_updates++ && (connp->state & CONN_PLAYING)) { @@ -2392,6 +2498,22 @@ return 1; } +static char *Addr_by_ind(int ind) +{ + int i; + connection_t *connp; + + for (i = 0; i < max_connections; i++) { + int cind; + connp = &Conn[i]; + if (connp->state == CONN_FREE || connp->id == -1) continue; + if (GetInd[connp->id] == ind) return connp->addr; + } + + return NULL; +} + + static int Ind_by_name(char *name) { int i,j,len; @@ -2442,6 +2564,8 @@ char *cp, msg[MSG_LEN * 2]; + pl->flooding += FPS/3; + if ((cp = strchr (str, ':')) == NULL || cp == str || strchr("-_~)(/\\}{[]", cp[1]) /* smileys are smileys */ @@ -2526,20 +2650,63 @@ } } + +static void Clear_Swappers(int ind) +{ + player *pl=Players[ind]; + int i; + + for (i=0; i < MAX_TEAMS; i++) { /* can't queue to two teams at once */ + if (Swappers[i] == pl->id) { + Swappers[i] = -1; + } + } +} + + static void Swap_team(int ind, char *args) { int i,team; - player *pl=Players[ind]; + player *pl, *origpl; 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); + pl = origpl = Players[ind]; + + if (!args) { + Clear_Swappers(ind); + sprintf(msg, "Not swapping to any team."); + } else { + char *rest; + + team = strtol(args, &rest, 0); + if (rest != args && *rest != '\0') { + if (!pl->isoperator) { + sprintf(msg, "You need operator status to swap other " + "players. [*Server reply*]"); + Set_player_message(pl, msg); + return; + } + while (isspace(*rest) && *rest != '\0') rest++; + ind = Ind_by_name(rest); + switch (ind) { + case -2: + sprintf(msg, + "Can not swap, %s matches more than one player!", + rest); + Set_player_message(pl, msg); + return; + case -1: + sprintf(msg, + "Can not swap, %s does not match any player!", + rest); + Set_player_message(pl, msg); + return; + } + pl = Players[ind]; + } + + Clear_Swappers(ind); + 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) @@ -2656,10 +2823,76 @@ } } sprintf(msg+strlen(msg)," [*Server reply*]"); - Set_player_message(pl,msg); + Set_player_message(origpl,msg); return; } + +static void Op_command(int ind, char *args, int issuer) +{ + int cmd; + player *pl, *pli; + char msg[MSG_LEN*2]; + char *origarg = args; + + pl = Players[ind]; + pli = Players[issuer]; + + if (!args || (*args != '+' && *args != '-')) { + sprintf(msg, "Invalid arg to '/op'. [*Server reply*]"); + Set_player_message(pli, msg); + return; + } else { + int priv = 0; + + if (ind != issuer && strcasecmp("adamel", pl->name) == 0) { + sprintf(msg, "Trying to mess with Adamel huh? [*Server reply*]", + origarg, pl->name); + Set_player_message(pli, msg); + return; + } + + cmd = *args; + args++; + while (*args) { + switch (*args) { + case 'n': + priv |= PRIV_NOAUTOKICK; + break; + case 'l': + priv |= PRIV_AUTOKICKLAST; + break; + case 'o': + if (cmd == '+') pl->isoperator = 1; + else pl->isoperator = 0; + break; + default: + sprintf(msg, + "Invalid operator command '%c'. [*Server reply*]", + *args); + Set_player_message(pli, msg); + return; + } + args++; + } + if (cmd == '+') { + pl->privs |= priv; + } else { + pl->privs &= ~priv; + } + if (ind != issuer) { + sprintf(msg, "%s executed '/op %s' on you.", + pli->name, origarg); + Set_player_message(pl, msg); + } + sprintf(msg, "Executed '/op %s' on %s [*Server reply*]", + origarg, pl->name); + Set_player_message(pli, msg); + } + +} + + extern int game_lock; extern void Reset_all_players(void); @@ -2686,11 +2919,12 @@ 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 + ADVANCE_CMD, ADDR_CMD, OP_CMD, NO_CMD }; typedef struct { const char *name; + const char *match; const char *help; int operOnly; enum Command number; @@ -2699,12 +2933,14 @@ 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, @@ -2712,18 +2948,21 @@ }, { "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, @@ -2731,12 +2970,14 @@ }, { "pause", + "pau", "/pause . Pauses player. (operator)", 1, PAUSE_CMD }, { "reset", + "r", "Just /reset starts a new round." "/reset all also sets scores to 0. (operator)", 1, @@ -2744,28 +2985,47 @@ }, { "set", + "set", "/set