diff options
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/server.h | 9 | ||||
| -rw-r--r-- | src/server/sv_bot.c | 9 | ||||
| -rw-r--r-- | src/server/sv_ccmds.c | 35 | ||||
| -rw-r--r-- | src/server/sv_client.c | 14 | ||||
| -rw-r--r-- | src/server/sv_game.c | 9 | ||||
| -rw-r--r-- | src/server/sv_init.c | 9 | ||||
| -rw-r--r-- | src/server/sv_main.c | 19 | ||||
| -rw-r--r-- | src/server/sv_net_chan.c | 9 | ||||
| -rw-r--r-- | src/server/sv_rankings.c | 9 | ||||
| -rw-r--r-- | src/server/sv_snapshot.c | 9 | ||||
| -rw-r--r-- | src/server/sv_world.c | 9 | 
11 files changed, 61 insertions, 79 deletions
diff --git a/src/server/server.h b/src/server/server.h index 31fd4116..da5e0947 100644 --- a/src/server/server.h +++ b/src/server/server.h @@ -1,21 +1,22 @@  /*  ===========================================================================  Copyright (C) 1999-2005 Id Software, Inc. +Copyright (C) 2000-2006 Tim Angus -This file is part of Quake III Arena source code. +This file is part of Tremulous. -Quake III Arena source code is free software; you can redistribute it +Tremulous is free software; you can redistribute it  and/or modify it under the terms of the GNU General Public License as  published by the Free Software Foundation; either version 2 of the License,  or (at your option) any later version. -Quake III Arena source code is distributed in the hope that it will be +Tremulous is distributed in the hope that it will be  useful, but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  GNU General Public License for more details.  You should have received a copy of the GNU General Public License -along with Quake III Arena source code; if not, write to the Free Software +along with Tremulous; if not, write to the Free Software  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA  ===========================================================================  */ diff --git a/src/server/sv_bot.c b/src/server/sv_bot.c index 49ed0c57..12eb4563 100644 --- a/src/server/sv_bot.c +++ b/src/server/sv_bot.c @@ -1,21 +1,22 @@  /*  ===========================================================================  Copyright (C) 1999-2005 Id Software, Inc. +Copyright (C) 2000-2006 Tim Angus -This file is part of Quake III Arena source code. +This file is part of Tremulous. -Quake III Arena source code is free software; you can redistribute it +Tremulous is free software; you can redistribute it  and/or modify it under the terms of the GNU General Public License as  published by the Free Software Foundation; either version 2 of the License,  or (at your option) any later version. -Quake III Arena source code is distributed in the hope that it will be +Tremulous is distributed in the hope that it will be  useful, but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  GNU General Public License for more details.  You should have received a copy of the GNU General Public License -along with Quake III Arena source code; if not, write to the Free Software +along with Tremulous; if not, write to the Free Software  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA  ===========================================================================  */ diff --git a/src/server/sv_ccmds.c b/src/server/sv_ccmds.c index b4fafc6f..9128249f 100644 --- a/src/server/sv_ccmds.c +++ b/src/server/sv_ccmds.c @@ -1,21 +1,22 @@  /*  ===========================================================================  Copyright (C) 1999-2005 Id Software, Inc. +Copyright (C) 2000-2006 Tim Angus -This file is part of Quake III Arena source code. +This file is part of Tremulous. -Quake III Arena source code is free software; you can redistribute it +Tremulous is free software; you can redistribute it  and/or modify it under the terms of the GNU General Public License as  published by the Free Software Foundation; either version 2 of the License,  or (at your option) any later version. -Quake III Arena source code is distributed in the hope that it will be +Tremulous is distributed in the hope that it will be  useful, but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  GNU General Public License for more details.  You should have received a copy of the GNU General Public License -along with Quake III Arena source code; if not, write to the Free Software +along with Tremulous; if not, write to the Free Software  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA  ===========================================================================  */ @@ -157,29 +158,15 @@ static void SV_Map_f( void ) {  	Cvar_Get ("g_gametype", "0", CVAR_SERVERINFO | CVAR_USERINFO | CVAR_LATCH );  	cmd = Cmd_Argv(0); -	if( Q_stricmpn( cmd, "sp", 2 ) == 0 ) { -		Cvar_SetValue( "g_gametype", GT_SINGLE_PLAYER ); -		Cvar_SetValue( "g_doWarmup", 0 ); -		// may not set sv_maxclients directly, always set latched -		Cvar_SetLatched( "sv_maxclients", "8" ); -		cmd += 2; -		cheat = qfalse; +	if ( !Q_stricmp( cmd, "devmap" ) || !Q_stricmp( cmd, "spdevmap" ) ) { +		cheat = qtrue;  		killBots = qtrue; -	} -	else { -		if ( !Q_stricmp( cmd, "devmap" ) || !Q_stricmp( cmd, "spdevmap" ) ) { -			cheat = qtrue; -			killBots = qtrue; -		} else { -			cheat = qfalse; -			killBots = qfalse; -		} -		if( sv_gametype->integer == GT_SINGLE_PLAYER ) { -			Cvar_SetValue( "g_gametype", GT_FFA ); -		} +	} else { +		cheat = qfalse; +		killBots = qfalse;  	} -	// save the map name here cause on a map restart we reload the q3config.cfg +	// save the map name here cause on a map restart we reload the autogen.cfg  	// and thus nuke the arguments of the map command  	Q_strncpyz(mapname, map, sizeof(mapname)); diff --git a/src/server/sv_client.c b/src/server/sv_client.c index d7a755b5..44fdff3c 100644 --- a/src/server/sv_client.c +++ b/src/server/sv_client.c @@ -1,21 +1,22 @@  /*  ===========================================================================  Copyright (C) 1999-2005 Id Software, Inc. +Copyright (C) 2000-2006 Tim Angus -This file is part of Quake III Arena source code. +This file is part of Tremulous. -Quake III Arena source code is free software; you can redistribute it +Tremulous is free software; you can redistribute it  and/or modify it under the terms of the GNU General Public License as  published by the Free Software Foundation; either version 2 of the License,  or (at your option) any later version. -Quake III Arena source code is distributed in the hope that it will be +Tremulous is distributed in the hope that it will be  useful, but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  GNU General Public License for more details.  You should have received a copy of the GNU General Public License -along with Quake III Arena source code; if not, write to the Free Software +along with Tremulous; if not, write to the Free Software  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA  ===========================================================================  */ @@ -49,11 +50,6 @@ void SV_GetChallenge( netadr_t from ) {  	int		oldestTime;  	challenge_t	*challenge; -	// ignore if we are in single player -	if ( Cvar_VariableValue( "g_gametype" ) == GT_SINGLE_PLAYER || Cvar_VariableValue("ui_singlePlayerActive")) { -		return; -	} -  	oldest = 0;  	oldestTime = 0x7fffffff; diff --git a/src/server/sv_game.c b/src/server/sv_game.c index ba50fbba..2d07fab7 100644 --- a/src/server/sv_game.c +++ b/src/server/sv_game.c @@ -1,21 +1,22 @@  /*  ===========================================================================  Copyright (C) 1999-2005 Id Software, Inc. +Copyright (C) 2000-2006 Tim Angus -This file is part of Quake III Arena source code. +This file is part of Tremulous. -Quake III Arena source code is free software; you can redistribute it +Tremulous is free software; you can redistribute it  and/or modify it under the terms of the GNU General Public License as  published by the Free Software Foundation; either version 2 of the License,  or (at your option) any later version. -Quake III Arena source code is distributed in the hope that it will be +Tremulous is distributed in the hope that it will be  useful, but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  GNU General Public License for more details.  You should have received a copy of the GNU General Public License -along with Quake III Arena source code; if not, write to the Free Software +along with Tremulous; if not, write to the Free Software  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA  ===========================================================================  */ diff --git a/src/server/sv_init.c b/src/server/sv_init.c index 4ce424ee..4e931845 100644 --- a/src/server/sv_init.c +++ b/src/server/sv_init.c @@ -1,21 +1,22 @@  /*  ===========================================================================  Copyright (C) 1999-2005 Id Software, Inc. +Copyright (C) 2000-2006 Tim Angus -This file is part of Quake III Arena source code. +This file is part of Tremulous. -Quake III Arena source code is free software; you can redistribute it +Tremulous is free software; you can redistribute it  and/or modify it under the terms of the GNU General Public License as  published by the Free Software Foundation; either version 2 of the License,  or (at your option) any later version. -Quake III Arena source code is distributed in the hope that it will be +Tremulous is distributed in the hope that it will be  useful, but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  GNU General Public License for more details.  You should have received a copy of the GNU General Public License -along with Quake III Arena source code; if not, write to the Free Software +along with Tremulous; if not, write to the Free Software  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA  ===========================================================================  */ diff --git a/src/server/sv_main.c b/src/server/sv_main.c index 99a3b81a..90a16880 100644 --- a/src/server/sv_main.c +++ b/src/server/sv_main.c @@ -1,21 +1,22 @@  /*  ===========================================================================  Copyright (C) 1999-2005 Id Software, Inc. +Copyright (C) 2000-2006 Tim Angus -This file is part of Quake III Arena source code. +This file is part of Tremulous. -Quake III Arena source code is free software; you can redistribute it +Tremulous is free software; you can redistribute it  and/or modify it under the terms of the GNU General Public License as  published by the Free Software Foundation; either version 2 of the License,  or (at your option) any later version. -Quake III Arena source code is distributed in the hope that it will be +Tremulous is distributed in the hope that it will be  useful, but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  GNU General Public License for more details.  You should have received a copy of the GNU General Public License -along with Quake III Arena source code; if not, write to the Free Software +along with Tremulous; if not, write to the Free Software  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA  ===========================================================================  */ @@ -322,11 +323,6 @@ void SVC_Status( netadr_t from ) {  	int		playerLength;  	char	infostring[MAX_INFO_STRING]; -	// ignore if we are in single player -	if ( Cvar_VariableValue( "g_gametype" ) == GT_SINGLE_PLAYER ) { -		return; -	} -  	strcpy( infostring, Cvar_InfoString( CVAR_SERVERINFO ) );  	// echo back the parameter to status. so master servers can use it as a challenge @@ -376,11 +372,6 @@ void SVC_Info( netadr_t from ) {  	char	*gamedir;  	char	infostring[MAX_INFO_STRING]; -	// ignore if we are in single player -	if ( Cvar_VariableValue( "g_gametype" ) == GT_SINGLE_PLAYER || Cvar_VariableValue("ui_singlePlayerActive")) { -		return; -	} -  	/*  	 * Check whether Cmd_Argv(1) has a sane length. This was not done in the original Quake3 version which led  	 * to the Infostring bug discovered by Luigi Auriemma. See http://aluigi.altervista.org/ for the advisory. diff --git a/src/server/sv_net_chan.c b/src/server/sv_net_chan.c index d4607d33..e1d835d3 100644 --- a/src/server/sv_net_chan.c +++ b/src/server/sv_net_chan.c @@ -1,21 +1,22 @@  /*  ===========================================================================  Copyright (C) 1999-2005 Id Software, Inc. +Copyright (C) 2000-2006 Tim Angus -This file is part of Quake III Arena source code. +This file is part of Tremulous. -Quake III Arena source code is free software; you can redistribute it +Tremulous is free software; you can redistribute it  and/or modify it under the terms of the GNU General Public License as  published by the Free Software Foundation; either version 2 of the License,  or (at your option) any later version. -Quake III Arena source code is distributed in the hope that it will be +Tremulous is distributed in the hope that it will be  useful, but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  GNU General Public License for more details.  You should have received a copy of the GNU General Public License -along with Quake III Arena source code; if not, write to the Free Software +along with Tremulous; if not, write to the Free Software  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA  ===========================================================================  */ diff --git a/src/server/sv_rankings.c b/src/server/sv_rankings.c index 844447be..023a7a2a 100644 --- a/src/server/sv_rankings.c +++ b/src/server/sv_rankings.c @@ -1,21 +1,22 @@  /*  ===========================================================================  Copyright (C) 1999-2005 Id Software, Inc. +Copyright (C) 2000-2006 Tim Angus -This file is part of Quake III Arena source code. +This file is part of Tremulous. -Quake III Arena source code is free software; you can redistribute it +Tremulous is free software; you can redistribute it  and/or modify it under the terms of the GNU General Public License as  published by the Free Software Foundation; either version 2 of the License,  or (at your option) any later version. -Quake III Arena source code is distributed in the hope that it will be +Tremulous is distributed in the hope that it will be  useful, but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  GNU General Public License for more details.  You should have received a copy of the GNU General Public License -along with Quake III Arena source code; if not, write to the Free Software +along with Tremulous; if not, write to the Free Software  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA  ===========================================================================  */ diff --git a/src/server/sv_snapshot.c b/src/server/sv_snapshot.c index db5164bb..26e3d31b 100644 --- a/src/server/sv_snapshot.c +++ b/src/server/sv_snapshot.c @@ -1,21 +1,22 @@  /*  ===========================================================================  Copyright (C) 1999-2005 Id Software, Inc. +Copyright (C) 2000-2006 Tim Angus -This file is part of Quake III Arena source code. +This file is part of Tremulous. -Quake III Arena source code is free software; you can redistribute it +Tremulous is free software; you can redistribute it  and/or modify it under the terms of the GNU General Public License as  published by the Free Software Foundation; either version 2 of the License,  or (at your option) any later version. -Quake III Arena source code is distributed in the hope that it will be +Tremulous is distributed in the hope that it will be  useful, but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  GNU General Public License for more details.  You should have received a copy of the GNU General Public License -along with Quake III Arena source code; if not, write to the Free Software +along with Tremulous; if not, write to the Free Software  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA  ===========================================================================  */ diff --git a/src/server/sv_world.c b/src/server/sv_world.c index e8485ce4..2060985d 100644 --- a/src/server/sv_world.c +++ b/src/server/sv_world.c @@ -1,21 +1,22 @@  /*  ===========================================================================  Copyright (C) 1999-2005 Id Software, Inc. +Copyright (C) 2000-2006 Tim Angus -This file is part of Quake III Arena source code. +This file is part of Tremulous. -Quake III Arena source code is free software; you can redistribute it +Tremulous is free software; you can redistribute it  and/or modify it under the terms of the GNU General Public License as  published by the Free Software Foundation; either version 2 of the License,  or (at your option) any later version. -Quake III Arena source code is distributed in the hope that it will be +Tremulous is distributed in the hope that it will be  useful, but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  GNU General Public License for more details.  You should have received a copy of the GNU General Public License -along with Quake III Arena source code; if not, write to the Free Software +along with Tremulous; if not, write to the Free Software  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA  ===========================================================================  */  | 
