From 02833f246646ed2ecbe26d884f67daab8aa39a6f Mon Sep 17 00:00:00 2001 From: Bukz Date: Thu, 21 Feb 2013 10:11:45 +0000 Subject: [PATCH] documentation fixes git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7247 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/admin.cfg | 2 +- config/docs.cfg | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/config/admin.cfg b/config/admin.cfg index b9e65d98..abe992d3 100644 --- a/config/admin.cfg +++ b/config/admin.cfg @@ -6,7 +6,7 @@ const removebans [ callvote 2 $arg1 ] const mastermode [ callvote 3 $arg1 ] const autoteam [ callvote 4 $arg1 ] const forceteam [ callvote 5 $arg1 $arg2 ] -const forceme [ forceteam (player1 cn) $arg1 ] +const forceme [ if $numargs [ forceteam (player1 cn) $arg1 ] [ if (checkrange (player1 team) 0 1) [ forceteam (player1 cn) (! (player1 team)) ] ] ] const giveadmin [ callvote 6 $arg1 ] const map [ callvote 7 $arg1 $arg2 ] const recorddemo [ callvote 8 1 ] diff --git a/config/docs.cfg b/config/docs.cfg index 1b95bee5..2fb03c7e 100644 --- a/config/docs.cfg +++ b/config/docs.cfg @@ -701,8 +701,12 @@ docremark [If I is 4 you get a string representing the current state of the peer docremark [FIXME:TODO: 5=SERVERNAME, 6,7=description, 8=serverbrowser-line -- these are to be handled with caution, sometimes empty, #8 will be outdated w/o serverbrowser open.]; docexample [echo [I am (curserver 4) to (curserver 2)]] [Output: I am connected to ctf-only.assault-servers.net]; docexample [last_server = "" remember_server = [ if (strcmp (curserver 4) "connected") [ last_server = (curserver 0) echo "I'm remembering:" $last_server ] [ echo "you are not 'connected' - you" (concatword "are '" (curserver 4) "' !") ] ] bind PRINT [ if (strcmp $last_server "") [ remember_server ] [ say (concat "^L2I was just ^Lfon^L3" $last_server) last_server = "" ] ]] [This will either remember or retrieve the last server you pressed the PrintScreen-key on.]; -docident [curteam] [Returns 1 if the local player is on the RVSF team, 0 if on CLA. If the player is in SPECTATOR it returns 2.]; +docident [curteam] [Returns an integer indicating what team a client is currently on.]; docargument [C] [optional argument: client number] [returns the specified client's team instead] [0]; +docremark [Returns 0 for CLA, 1 for RVSF.]; +docremark [Returns 2 for CLA-spectator, 3 for RVSF-spectator.]; +docremark [Returns 4 for spectator.]; +docremark [By default this command returns what team *you* (player1) are currently on.]; docident [curweapon] [Returns the weapon-index the local player is currently holding.]; docident [demo] [Plays a recorded demo.]; docargument [S] [the demo name] [] [0]; @@ -1834,9 +1838,12 @@ docremark [This command is wrapped by aliases for better usability and is used t docident [cleardemos] [Clears all demos currently in memory on the server.]; docident [deleteservermap] [Deletes a map from the current server.]; docargument [A] [map name] [] [0]; -docident [forceme] [Calls a vote to forceteam yourself to the enemy team.]; -docident [forceteam] [Forces the specified player to join the enemy team.]; -docargument [CN] [The player to assign to a team] [Client number] [0]; +docident [forceme] [Calls a vote to forceteam yourself to the specified team.]; +docargument [T] [optional, the team to force yourself to] [0-4] [0]; +docremark [By default, if you are on team CLA or RVSF, this command will force you to the enemy team, no arguments necessary.]; +docident [forceteam] [Calls a vote to force the specified player to switch to the specified team.]; +docargument [C] [client number of player] [integer] [0]; +docargument [T] [the team to force to] [0-4] [0]; docident [giveadmin] [Gives admin state to the specified player.]; docargument [CN] [The player to become admin] [Client number] [0]; docremark [Requires admin state. The admin will lose his admin state after successfully issuing this command.];