From 6b9976d10cdf607e04ae9f03bfc0c231ced320e9 Mon Sep 17 00:00:00 2001 From: esteel Date: Thu, 15 Mar 2007 17:49:07 +0000 Subject: [PATCH] merged from trunk: removed clientcommand and reworded FAQ git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2232 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- Docs/FAQ.aft | 47 +++++++++++++++-------------- Docs/FAQ.html | 47 +++++++++++++++-------------- data/default.cfg | 7 ----- data/qcsrc/server/clientcommands.qc | 45 ++------------------------- data/qcsrc/server/defs.qh | 3 -- 5 files changed, 50 insertions(+), 99 deletions(-) diff --git a/Docs/FAQ.aft b/Docs/FAQ.aft index 39ede788e..bf772b0cf 100644 --- a/Docs/FAQ.aft +++ b/Docs/FAQ.aft @@ -3,7 +3,7 @@ #--- use AFT v5.096 or later (http://www.maplefish.com/todd/aft.html) #---SET nexversion=2.2.3 -#---SET zipname=nexuiz-VERSION.zip +#---SET zipname=nexuiz-.zip *Title: Nexuiz %nexversion% FAQ http://nexuiz.com http://alientrap.org @@ -17,7 +17,7 @@ * Troubleshooting ** How do I install Nexuiz? -Just unzip the |%zipname%| file. You can do this with any archive program (like [7zip (http://7zip.org)]). It's very important to remain the directory structure while unpacking (in WinZip this option is called "Use folder names"). The directory structure should look like this afterwards: +Just unzip the |%zipname%| file. You can do this with any archive program (like [7zip (http://7zip.org)]). It's very important to keep the directory structure while unpacking (in WinZip this option is called "Use folder names"). The directory structure should look like this afterwards: ^<< Nexuiz |-- Docs @@ -30,55 +30,56 @@ Nexuiz `-- nexuiz-linux-* ^>> -** When I start Nexuiz all I see is a black screen with some checkered squares -This happens when the engine can't load the data*.pk3 file. The reasons could be: +** When I start Nexuiz all I see is a black screen or a black screen with some checkered squares +This happens when the engine can't load the data*.pk3 file or has trouble to initialize OpenGL. The reasons could be: 1. you unpacked the zip file without folder names (see [How do I install Nexuiz?]) - 2. on Linux: the current directory is not your Nexuiz/ folder (see [How can I place a shortcut to Nexuiz on my Linux desktop?]) - 3. your download might be corrupted, please download Nexuiz again + 2. on Linux: the current directory is not your Nexuiz/ folder. See [How can I place a shortcut to Nexuiz on my Linux desktop?] on how to fix this + 3. on Mac: you tried to extract and move the files from a Nexuiz update and it deleted the old files. When using the mac gui please be sure to move only the files not the folders as that will delete the old files or use the mv console command which will not delete the old files + 4. the engine could not initialize OpenGL. Please install the latest drivers for your graphic card. You will probably find one for your card there: [intel (http://intel.com)] [ati (http://ati.com)] [nvidia (http://nvidia.com)] + 5. your download might be corrupted, please download Nexuiz again ** The sound is broken, it crackles and stutters -Try run |nexuiz-sdl.exe| instead of |nexuiz.exe| (on Windows). Adding the command line options |-sndspeed 48000| and/or |-sndstereo| can also help on some systems (on Windows, Linux, Mac). +Try run |nexuiz-sdl.exe| instead of |nexuiz.exe| (on Windows). Adding the command line options |-sndspeed 48000| and/or |-sndstereo| can also help on some systems (on Linux, Mac, Windows). -** I can't switch to 32 bit color depth (Windows) +** I can't switch to 32 bit color depth (on Windows) Check if your desktop color depth is set to 32 bits per pixel. If it's just set to 16, Nexuiz can't switch to 32 bit mode. ** When I join a server or after a map change I see nothing but a black screen, but I can still move and shoot -This is probably because you don't have the map, that's running on the server. As Nexuiz does now support map/content download the server might be be setup to support this and you will have to get the map the old fashioned way. Those servers will have a download URL in their name or welcome message. There is also a [wiki page (http://alientrap.org/wiki/pmwiki.php?n=Main.CustomMaps)] dedicated to new maps. +This is probably because you don't have the map that's running on the server. As Nexuiz does now supports map/content download the server might not be be setup to support this and you will have to get the map the old fashioned way. Those servers will have a download URL in their name or welcome message. There is also a [wiki page (http://alientrap.org/wiki/pmwiki.php?n=Main.CustomMaps)] dedicated to new maps. * Server setup ** How do I start a server? -Please take a look at the file |readme.txt| in the |Docs/server/| directory where this topic is explained. +Use the |Create| menu to start a |listen server|. You will always have to play in a |listen server|. +If you want to create a server without being forced to play yourself please take a look at the file |readme.txt| in the |Docs/server/| directory where the |dedicated server| is explained. ** Which ports do I have to open in firewall/forward from my router to run a server? -The default port is 26000 UDP. You can change that by starting Nexuiz with |nexuiz-sdl.exe -port | (on Windows) or |nexuiz-linux-686-sdl -port | (on Linux). -To add the command line argument on Windows, create a new shortcut to |nexuiz-sdl.exe| and right click on it. Select properties and |-port | in the "Target:" line. Be sure that the "Start in:" line contains the full path to your Nexuiz folder and click "OK". -If you follow the tutorial mentioned above you do not need this command line argument as it will be done in the config file created for the server. +The default port is 26000 UDP. You can change that by starting Nexuiz with the parameter |-port | or having a line |port | in the server config file. +If you follow the tutorial mentioned above you do not need this command line argument as it will be done in the config file created for the server. To add the command line argument on Windows, create a new shortcut to |nexuiz.exe| or |nexuiz-dedicated.exe| and right click on it. Select properties and |-port | in the "Target:" line. Be sure that the "Start in:" line contains the full path to your Nexuiz folder and click "OK". The parameter will be used if you start Nexuiz via that new shortcut. ** Is there some kind of rcon? -Yes starting with Nexuiz 2.0 there is rcon (QuakeWorld compatible). To use it you must enter |rcon__password hackme| in the server console or server config file. The Nexuiz client has to set the same password in the same fasion. You can then issue commands with |rcon |. There are also external rcon tools but make sure you use a QW compatible rcon tool. -There is also a feature called |client side commands|. To enable it enter |sv__clientcommands 1| on your server console. Don't forget to set a password with |sv__clientcommands__password hackme|. Now you can become admin ingame by entering |ccl hackme| on the client console. To issue commands enter |cc | (e.g. |cc restart| or |cc chmap dm_nexdm12|). +Yes starting with Nexuiz 2.0 there is rcon (QuakeWorld compatible). To use it you must enter |rcon__password | in the server console or server config file. The Nexuiz client has to set the same password in the same fasion. You can then issue commands with |rcon | if you are connected to the server or have set |rcon__address | or |rcon__address :| to point to the server. There are also external rcon tools but make sure you use a QW compatible rcon tool. ** How can i kick people who are using special characters in their names? -Enter |status| at the console. You will see a list of all players. In front of their names you will see a number (the player id). You can kick the player you don't like with |kick # | (notice the space after #). +Enter |status| at the server console. You will see a list of all players. In front of their names you will see a number (the player id). You can kick the player you don't like with |kick # | (notice the space after #). * General questions ** How do I install new maps? -Maps usually ship as *.pk3 file. All you have to do is to copy this file to your |Nexuiz/data/| directory. +Maps usually ship as *.pk3 file. All you have to do is to copy this file to the |Nexuiz/data/| (on Linux, Mac, Windows) OR |~/.nexuiz/data/| (on Linux, Mac) directory. ** How can I place a shortcut to Nexuiz on my Linux desktop? -Use the script |nexuiz-linux.sh| instead of the binary. It will use the right version (32 or 64 bit). +Use the script |nexuiz-linux-sdl.sh| or |nexuiz-linux-glx.sh| instead of the binaries. The scripts will use the correct |working directory|,choose the right version (32 or 64 bit) and also allow you to start a extra X server. ** How do I open the console? Press |\[shift]+\[escape]|. To close it press |\[escape]| ** What console commands/variables are there? -You can get a list of variables by entering |cvarlist| on the console. |cmdlist| will give you a list of available commands. An annotated version of that output can be found at the [Nexuiz wiki (http://alientrap.org/wiki/pmwiki.php?n=Main.ConsoleCommands)]. +You can get a list of variables by entering |cvarlist| on the console ([How do I open the console?]). |cmdlist| will give you a list of available commands. An annotated version of that output can be found at the [Nexuiz wiki (http://alientrap.org/wiki/pmwiki.php?n=Main.ConsoleCommands)]. ** How can I speed up my frame rate? -The greatest performance boost can be achieved by turning off dynamic lights and shadows in the menu |Options / Effects|. Bloom is also quite resource. Other fps boots include disabeling |Deluxemapping| and |Coronas|. On older graphics cards or on-board/notebook chips with little video ram you can try to lower the texture resolution. To do this open the console ([How do I open the console?]) and type |gl__picmip #; r__restart| (where # is a number between 0 and 10, 0 is the highest quality). Nexuiz now does also include config files that will adjust your graphic settings. Open the console as explained in and type |exec normal.cfg| to get the default setting. |exec med.cfg| and |exec low.cfg| are of lower quality but will make Nexuiz faster. |exec high.cfg| and |exec ultra.cfg| will show what Nexuiz is able to look like but do require a very fast PC and graphic card. Just like the |gl_picmip| some of the settings in those config files require you to either restart Nexuiz or type |vid_restart| in the console afterwards. +The greatest performance boost can be achieved by turning off dynamic lights and shadows in the menu |Options / Effects|. Bloom is also quite resource. Other fps boots include disabeling |Deluxemapping| and |Coronas|. On older graphics cards or on-board/notebook chips with little video ram you can try to lower the texture quality in the menu |Options / Video|. Nexuiz also includes config files that will adjust your graphic settings. Open the console ([How do I open the console?]) and type |exec normal.cfg| to get the default setting (back). |exec med.cfg| and |exec low.cfg| are of lower quality but will make Nexuiz run faster. |exec high.cfg|, |exec ultra.cfg| and |exec ultimate.cfg| will show what Nexuiz is able to look like but do require a very fast PC and graphic card. Some of the settings in those config files require you to either restart Nexuiz or also type |vid_restart| in the console after exec'ing the config files. ** How can I activate colors in my name? Colors can be used in nicknames and chat messages by typing ^ followed by a number between 0 and 9. @@ -108,9 +109,9 @@ Colors can be used in nicknames and chat messages by typing ^ followed by a numb !----------------------------! ** How do i watch/record demos? -You can access your demos in the |Demos| menu. Click on the demo you want to watch and then on |Start| to watch the demo. -To record a demo yourself open the console ([How do I open the console?]) and type |rec | before playing. That is before starting a game or connection to a server. The demo file will be stored in |~/.nexuiz/data/demos/.dem| (Linux) or |Nexuiz/data/demos/.dem| (Windows). -To watch a demo: open the console and type |ply |. If you downloaded a demo, copy it to |Nexuiz/data/demos|. You might have to create this directory if you have never recorded a demo before. +You can access your demos in the |Demos| menu. Click on the demo you want to watch and then on |Start| to watch the demo. Or type |ply | in the console ([How do I open the console?]). +To record a demo yourself open the console and type |rec | before playing. That is before starting a game or connecting to a server. The demo file will be stored in |Nexuiz/data/demos/.dem| (on Windows) or |~/.nexuiz/data/demos/.dem| (on Linux, Mac). +If you downloaded a demo, copy it to |Nexuiz/data/demos/.dem| (on Linux, Mac, Windows) or |~/.nexuiz/data/demos/.dem| (on Linux, Mac). You might have to create this directory if you have never recorded a demo before. You can list all your demo files by typing |dem| on the console. Some usefull keybindings for viewing demos are listed [here (http://www.alientrap.org/forum/viewtopic.php?p=357#357)]. A simple way to automaticly record demos can be found [here (http://www.alientrap.org/forum/viewtopic.php?t=90)] diff --git a/Docs/FAQ.html b/Docs/FAQ.html index 70d681f9c..2e78f11a2 100644 --- a/Docs/FAQ.html +++ b/Docs/FAQ.html @@ -124,9 +124,9 @@ h1, h2, h3, h4, h5, h6 {
  • Troubleshooting
  • Server setup
    • @@ -160,7 +160,7 @@ h1, h2, h3, h4, h5, h6 {

    How do I install Nexuiz?

    -Just unzip the nexuiz-VERSION.zip file. You can do this with any archive program (like 7zip). It's very important to remain the directory structure while unpacking (in WinZip this option is called "Use folder names"). The directory structure should look like this afterwards: +Just unzip the nexuiz-<version>.zip file. You can do this with any archive program (like 7zip). It's very important to keep the directory structure while unpacking (in WinZip this option is called "Use folder names"). The directory structure should look like this afterwards: 

     Nexuiz
 |-- Docs
@@ -174,29 +174,31 @@ Nexuiz

    -

    When I start Nexuiz all I see is a black screen with some checkered squares

    +

    When I start Nexuiz all I see is a black screen or a black screen with some checkered squares

    -This happens when the engine can't load the data*.pk3 file. The reasons could be: +This happens when the engine can't load the data*.pk3 file or has trouble to initialize OpenGL. The reasons could be:

    1. you unpacked the zip file without folder names (see How do I install Nexuiz?)
      2. -
    2. on Linux: the current directory is not your Nexuiz/ folder (see How can I place a shortcut to Nexuiz on my Linux desktop?)
      3. +
    3. on Linux: the current directory is not your Nexuiz/ folder. See How can I place a shortcut to Nexuiz on my Linux desktop? on how to fix this
      4. +
    4. on Mac: you tried to extract and move the files from a Nexuiz update and it deleted the old files. When using the mac gui please be sure to move only the files not the folders as that will delete the old files or use the mv console command which will not delete the old files
      5. +
    5. the engine could not initialize OpenGL. Please install the latest drivers for your graphic card. You will probably find one for your card there: intel ati nvidia
    6. your download might be corrupted, please download Nexuiz again

    The sound is broken, it crackles and stutters

    -Try run nexuiz-sdl.exe instead of nexuiz.exe (on Windows). Adding the command line options -sndspeed 48000 and/or -sndstereo can also help on some systems (on Windows, Linux, Mac). +Try run nexuiz-sdl.exe instead of nexuiz.exe (on Windows). Adding the command line options -sndspeed 48000 and/or -sndstereo can also help on some systems (on Linux, Mac, Windows).

    -

    I can't switch to 32 bit color depth (Windows)

    +

    I can't switch to 32 bit color depth (on Windows)

    Check if your desktop color depth is set to 32 bits per pixel. If it's just set to 16, Nexuiz can't switch to 32 bit mode.

    When I join a server or after a map change I see nothing but a black screen, but I can still move and shoot

    -This is probably because you don't have the map, that's running on the server. As Nexuiz does now support map/content download the server might be be setup to support this and you will have to get the map the old fashioned way. Those servers will have a download URL in their name or welcome message. There is also a wiki page dedicated to new maps. +This is probably because you don't have the map that's running on the server. As Nexuiz does now supports map/content download the server might not be be setup to support this and you will have to get the map the old fashioned way. Those servers will have a download URL in their name or welcome message. There is also a wiki page dedicated to new maps.

    @@ -205,25 +207,24 @@ This is probably because you don't have the map, that's running on the server. A

    How do I start a server?

    -Please take a look at the file readme.txt in the Docs/server/ directory where this topic is explained. +Use the Create menu to start a listen server. You will always have to play in a listen server. +If you want to create a server without being forced to play yourself please take a look at the file readme.txt in the Docs/server/ directory where the dedicated server is explained.

    Which ports do I have to open in firewall/forward from my router to run a server?

    -The default port is 26000 UDP. You can change that by starting Nexuiz with nexuiz-sdl.exe -port <port> (on Windows) or nexuiz-linux-686-sdl -port <port> (on Linux). -To add the command line argument on Windows, create a new shortcut to nexuiz-sdl.exe and right click on it. Select properties and -port <port> in the "Target:" line. Be sure that the "Start in:" line contains the full path to your Nexuiz folder and click "OK". -If you follow the tutorial mentioned above you do not need this command line argument as it will be done in the config file created for the server. +The default port is 26000 UDP. You can change that by starting Nexuiz with the parameter -port <port> or having a line port <port> in the server config file. +If you follow the tutorial mentioned above you do not need this command line argument as it will be done in the config file created for the server. To add the command line argument on Windows, create a new shortcut to nexuiz.exe or nexuiz-dedicated.exe and right click on it. Select properties and -port <port> in the "Target:" line. Be sure that the "Start in:" line contains the full path to your Nexuiz folder and click "OK". The parameter will be used if you start Nexuiz via that new shortcut.

    Is there some kind of rcon?

    -Yes starting with Nexuiz 2.0 there is rcon (QuakeWorld compatible). To use it you must enter rcon_password hackme in the server console or server config file. The Nexuiz client has to set the same password in the same fasion. You can then issue commands with rcon <command>. There are also external rcon tools but make sure you use a QW compatible rcon tool. -There is also a feature called client side commands. To enable it enter sv_clientcommands 1 on your server console. Don't forget to set a password with sv_clientcommands_password hackme. Now you can become admin ingame by entering ccl hackme on the client console. To issue commands enter cc <command> (e.g. cc restart or cc chmap dm_nexdm12). +Yes starting with Nexuiz 2.0 there is rcon (QuakeWorld compatible). To use it you must enter rcon_password <password> in the server console or server config file. The Nexuiz client has to set the same password in the same fasion. You can then issue commands with rcon <command> if you are connected to the server or have set rcon_address <ip/hostname> or rcon_address <ip/hostname>:<port> to point to the server. There are also external rcon tools but make sure you use a QW compatible rcon tool.

    How can i kick people who are using special characters in their names?

    -Enter status at the console. You will see a list of all players. In front of their names you will see a number (the player id). You can kick the player you don't like with kick # <player id> <reason> (notice the space after #). +Enter status at the server console. You will see a list of all players. In front of their names you will see a number (the player id). You can kick the player you don't like with kick # <player id> <reason> (notice the space after #).

    @@ -232,12 +233,12 @@ Enter status at the console. You will see a list of all players. In fro

    How do I install new maps?

    -Maps usually ship as *.pk3 file. All you have to do is to copy this file to your Nexuiz/data/ directory. +Maps usually ship as *.pk3 file. All you have to do is to copy this file to the Nexuiz/data/ (on Linux, Mac, Windows) OR ~/.nexuiz/data/ (on Linux, Mac) directory.

    How can I place a shortcut to Nexuiz on my Linux desktop?

    -Use the script nexuiz-linux.sh instead of the binary. It will use the right version (32 or 64 bit). +Use the script nexuiz-linux-sdl.sh or nexuiz-linux-glx.sh instead of the binaries. The scripts will use the correct working directory,choose the right version (32 or 64 bit) and also allow you to start a extra X server.

    How do I open the console?

    @@ -247,12 +248,12 @@ Press [shift]+[escape]. To close it press [escape]

    What console commands/variables are there?

    -You can get a list of variables by entering cvarlist on the console. cmdlist will give you a list of available commands. An annotated version of that output can be found at the Nexuiz wiki. +You can get a list of variables by entering cvarlist on the console (How do I open the console?). cmdlist will give you a list of available commands. An annotated version of that output can be found at the Nexuiz wiki.

    How can I speed up my frame rate?

    -The greatest performance boost can be achieved by turning off dynamic lights and shadows in the menu Options / Effects. Bloom is also quite resource. Other fps boots include disabeling Deluxemapping and Coronas. On older graphics cards or on-board/notebook chips with little video ram you can try to lower the texture resolution. To do this open the console (How do I open the console?) and type gl_picmip #; r_restart (where # is a number between 0 and 10, 0 is the highest quality). Nexuiz now does also include config files that will adjust your graphic settings. Open the console as explained in and type exec normal.cfg to get the default setting. exec med.cfg and exec low.cfg are of lower quality but will make Nexuiz faster. exec high.cfg and exec ultra.cfg will show what Nexuiz is able to look like but do require a very fast PC and graphic card. Just like the glpicmip some of the settings in those config files require you to either restart Nexuiz or type vidrestart in the console afterwards. +The greatest performance boost can be achieved by turning off dynamic lights and shadows in the menu Options / Effects. Bloom is also quite resource. Other fps boots include disabeling Deluxemapping and Coronas. On older graphics cards or on-board/notebook chips with little video ram you can try to lower the texture quality in the menu Options / Video. Nexuiz also includes config files that will adjust your graphic settings. Open the console (How do I open the console?) and type exec normal.cfg to get the default setting (back). exec med.cfg and exec low.cfg are of lower quality but will make Nexuiz run faster. exec high.cfg, exec ultra.cfg and exec ultimate.cfg will show what Nexuiz is able to look like but do require a very fast PC and graphic card. Some of the settings in those config files require you to either restart Nexuiz or also type vid_restart in the console after exec'ing the config files.

    How can I activate colors in my name?

    @@ -276,9 +277,9 @@ Colors can be used in nicknames and chat messages by typing ^ followed by a numb

    How do i watch/record demos?

    -You can access your demos in the Demos menu. Click on the demo you want to watch and then on Start to watch the demo. -To record a demo yourself open the console (How do I open the console?) and type rec <name> before playing. That is before starting a game or connection to a server. The demo file will be stored in ~/.nexuiz/data/demos/<name>.dem (Linux) or Nexuiz/data/demos/<name>.dem (Windows). -To watch a demo: open the console and type ply <name>. If you downloaded a demo, copy it to Nexuiz/data/demos. You might have to create this directory if you have never recorded a demo before. +You can access your demos in the Demos menu. Click on the demo you want to watch and then on Start to watch the demo. Or type ply <name> in the console (How do I open the console?). +To record a demo yourself open the console and type rec <name> before playing. That is before starting a game or connecting to a server. The demo file will be stored in Nexuiz/data/demos/<name>.dem (on Windows) or ~/.nexuiz/data/demos/<name>.dem (on Linux, Mac). +If you downloaded a demo, copy it to Nexuiz/data/demos/<name>.dem (on Linux, Mac, Windows) or ~/.nexuiz/data/demos/<name>.dem (on Linux, Mac). You might have to create this directory if you have never recorded a demo before. You can list all your demo files by typing dem on the console. Some usefull keybindings for viewing demos are listed here. A simple way to automaticly record demos can be found here

    diff --git a/data/default.cfg b/data/default.cfg index a63da1d09..06f38b979 100644 --- a/data/default.cfg +++ b/data/default.cfg @@ -38,9 +38,6 @@ alias rec "record demos/$1" alias ply "playdemo demos/$1" alias tdem "timedemo demos/$1" -alias ccl "cmd clogin $1" -alias cc "cmd ccmd $*" - alias dropweapon "impulse 17" alias +show_info +button7 alias -show_info -button7 @@ -96,10 +93,6 @@ set sv_mapchange_delay 5 set minplayers 0 sv_cullentities_trace 1 -// disable rcon-like clientcommands to avoid server being open with default password -seta sv_clientcommands 0 -seta sv_clientcommands_password hackme - // restart server if all players hit "ready"-button set sv_ready_restart 0 diff --git a/data/qcsrc/server/clientcommands.qc b/data/qcsrc/server/clientcommands.qc index 57bb28417..10e55c08a 100644 --- a/data/qcsrc/server/clientcommands.qc +++ b/data/qcsrc/server/clientcommands.qc @@ -84,47 +84,7 @@ void SV_ParseClientCommand(string s) { tokenize(s); - if(argv(0) == "clogin") { - if(cvar("sv_clientcommands")) { - if(self.adminstatus < -5) { - sprint(self, "Too many unsuccessful tries.\n"); - } else if(argv(1) == cvar_string("sv_clientcommands_password")) { - self.adminstatus = 1; - sprint(self, "You now have remote admin status.\n"); - ServerConsoleEcho(strcat("ClientCommands: ", self.netname, " received admin status"), TRUE); - } else { - sprint(self, "Wrong password.\n"); - // use of -- produces compiler warning in the if() line??? - self.adminstatus = self.adminstatus - 1; - if(self.adminstatus == 0) - { - sprint(self, "You lost remote admin status.\n"); - ServerConsoleEcho(strcat("ClientCommands: ", self.netname, " lost admin status"), TRUE); - } - } - } else { - sprint(self, "Clientside commands NOT allowed.\n"); - } - } else if(argv(0) == "ccmd") { - if(cvar("sv_clientcommands")) { - if(self.adminstatus > 0) { - local string command; - command = argv(1); - index = 2; - while(argv(index) != "") { - command = strcat(command, " ", argv(index)); - index++; - } - command = strzone(command); - ServerConsoleEcho(strcat("ClientCommands: ", self.netname, " issued command '", command, "'"), TRUE); - localcmd(strcat(command, "\n")); - strunzone(command); - } else - sprint(self, "You don't have remote admin status.\n"); - } else { - sprint(self, "Clientside commands NOT allowed.\n"); - } - } else if(argv(0) == "vote") { + if(argv(0) == "vote") { if(argv(1) == "help") { local string vmasterdis; if(!cvar("sv_vote_master")) { @@ -191,8 +151,7 @@ void SV_ParseClientCommand(string s) { } else if(argv(1) == "stop") { if(!votecalled) { sprint(self, "^1No vote called.\n"); - } else if(self == votecaller - || self.adminstatus > 0) { // the votecaller and admins can stop a vote + } else if(self == votecaller) { // the votecaller can stop a vote VoteStop(self); } else { sprint(self, "^1You are not allowed to stop that Vote.\n"); diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh index 8edf2d649..4e6ad016f 100644 --- a/data/qcsrc/server/defs.qh +++ b/data/qcsrc/server/defs.qh @@ -23,9 +23,6 @@ string newlines = "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"; //.string wad; //.string map; -// is this client a remote administrator? -.float adminstatus; - //.float worldtype; .float delay; .float wait; -- 2.39.2