{
if (IS_CLIENT(caller))
{
- caller.version = ((argv(1) == "$gameversion") ? 1 : stof(argv(1)));
+ CS(caller).version = ((argv(1) == "$gameversion") ? 1 : stof(argv(1)));
- if (caller.version < autocvar_gameversion_min || caller.version > autocvar_gameversion_max)
+ if (CS(caller).version < autocvar_gameversion_min || CS(caller).version > autocvar_gameversion_max)
{
- caller.version_mismatch = 1;
+ CS(caller).version_mismatch = true;
ClientKill_TeamChange(caller, -2); // observe
}
else if (autocvar_g_campaign || autocvar_g_balance_teams)
{
case CMD_REQUEST_COMMAND:
{
- if (!gameover)
+ if (!game_stopped)
if (IS_CLIENT(caller) && !IS_PLAYER(caller))
if (joinAllowed(caller))
Join(caller);
if (caller.ready) // toggle
{
caller.ready = false;
- bprint(caller.netname, "^2 is ^1NOT^2 ready\n");
+ bprint(playername(caller, false), "^2 is ^1NOT^2 ready\n");
}
else
{
caller.ready = true;
- bprint(caller.netname, "^2 is ready\n");
+ bprint(playername(caller, false), "^2 is ready\n");
}
// cannot reset the game while a timeout is active!
{
case CMD_REQUEST_COMMAND:
{
- if (argv(1) != "")
+ if (argv(1) == "")
{
- if (IS_CLIENT(caller))
+ return;
+ }
+ if (!IS_CLIENT(caller))
+ {
+ return;
+ }
+ if (!teamplay)
+ {
+ sprint(caller, "^7selectteam can only be used in teamgames\n");
+ return;
+ }
+ if (caller.team_forced > 0)
+ {
+ sprint(caller, "^7selectteam can not be used as your team is forced\n");
+ return;
+ }
+ if (lockteams)
+ {
+ sprint(caller, "^7The game has already begun, you must wait until the next map to be able to join a team.\n");
+ return;
+ }
+ float selection;
+ switch (argv(1))
+ {
+ case "red":
{
- if (teamplay)
- {
- if (caller.team_forced <= 0)
- {
- if (!lockteams)
- {
- float selection;
-
- switch (argv(1))
- {
- case "red": selection = NUM_TEAM_1;
- break;
- case "blue": selection = NUM_TEAM_2;
- break;
- case "yellow": selection = NUM_TEAM_3;
- break;
- case "pink": selection = NUM_TEAM_4;
- break;
- case "auto": selection = (-1);
- break;
-
- default: selection = 0;
- break;
- }
-
- if (selection)
- {
- if (caller.team == selection && selection != -1 && !IS_DEAD(caller))
- {
- sprint(caller, "^7You already are on that team.\n");
- }
- else if (caller.wasplayer && autocvar_g_changeteam_banned)
- {
- sprint(caller, "^1You cannot change team, forbidden by the server.\n");
- }
- else
- {
- if (autocvar_g_balance_teams && autocvar_g_balance_teams_prevent_imbalance)
- {
- CheckAllowedTeams(caller);
- GetTeamCounts(caller);
- if (!TeamSmallerEqThanTeam(Team_TeamToNumber(selection), Team_TeamToNumber(caller.team), caller))
- {
- Send_Notification(NOTIF_ONE, caller, MSG_INFO, INFO_TEAMCHANGE_LARGERTEAM);
- return;
- }
- }
- ClientKill_TeamChange(caller, selection);
- }
- if(!IS_PLAYER(caller))
- caller.team_selected = true; // avoids asking again for team selection on join
- }
- }
- else
- {
- sprint(caller, "^7The game has already begun, you must wait until the next map to be able to join a team.\n");
- }
- }
- else
- {
- sprint(caller, "^7selectteam can not be used as your team is forced\n");
- }
- }
- else
- {
- sprint(caller, "^7selectteam can only be used in teamgames\n");
- }
+ selection = NUM_TEAM_1;
+ break;
+ }
+ case "blue":
+ {
+ selection = NUM_TEAM_2;
+ break;
+ }
+ case "yellow":
+ {
+ selection = NUM_TEAM_3;
+ break;
+ }
+ case "pink":
+ {
+ selection = NUM_TEAM_4;
+ break;
+ }
+ case "auto":
+ {
+ selection = (-1);
+ break;
}
+ default:
+ {
+ return;
+ }
+ }
+ if (caller.team == selection && selection != -1 && !IS_DEAD(caller))
+ {
+ sprint(caller, "^7You already are on that team.\n");
+ return;
+ }
+ if (caller.wasplayer && autocvar_g_changeteam_banned)
+ {
+ sprint(caller, "^1You cannot change team, forbidden by the server.\n");
return;
}
+ if (selection == -1)
+ {
+ ClientKill_TeamChange(caller, selection);
+ if (!IS_PLAYER(caller))
+ {
+ caller.team_selected = true; // avoids asking again for team selection on join
+ }
+ return;
+ }
+ if (autocvar_g_balance_teams && autocvar_g_balance_teams_prevent_imbalance)
+ {
+ CheckAllowedTeams(caller);
+ GetTeamCounts(caller);
+ if ((BIT(Team_TeamToNumber(selection) - 1) & FindBestTeams(caller, false)) == 0)
+ {
+ Send_Notification(NOTIF_ONE, caller, MSG_INFO, INFO_TEAMCHANGE_LARGERTEAM);
+ return;
+ }
+ }
+ ClientKill_TeamChange(caller, selection);
+ if (!IS_PLAYER(caller))
+ {
+ caller.team_selected = true; // avoids asking again for team selection on join
+ }
+ return;
}
-
default:
sprint(caller, "Incorrect parameters for ^2selectteam^7\n");
case CMD_REQUEST_USAGE:
{
case CMD_REQUEST_COMMAND:
{
- if (IS_CLIENT(caller))
+ if (!intermission_running && IS_CLIENT(caller))
{
+ if((IS_SPEC(caller) || IS_OBSERVER(caller)) && argv(1) != "")
+ {
+ entity client = GetFilteredEntity(argv(1));
+ int spec_accepted = VerifyClientEntity(client, false, false);
+ if(spec_accepted > 0 && IS_PLAYER(client))
+ {
+ if(Spectate(caller, client))
+ return; // fall back to regular handling
+ }
+ }
+
int mutator_returnvalue = MUTATOR_CALLHOOK(ClientCommand_Spectate, caller);
if (mutator_returnvalue == MUT_SPECCMD_RETURN) return;
default:
case CMD_REQUEST_USAGE:
{
- sprint(caller, "\nUsage:^3 cmd spectate\n");
- sprint(caller, " No arguments required.\n");
+ sprint(caller, "\nUsage:^3 cmd spectate <client>\n");
+ sprint(caller, " Where 'client' can be the player to spectate.\n");
return;
}
}
{
if (argc >= 3)
{
+ if(!IS_CLIENT(caller) && IS_REAL_CLIENT(caller)) // connecting
+ {
+ print_to(caller, "You can't ^2tell^7 a message while connecting.");
+ return;
+ }
+
entity tell_to = GetIndexedEntity(argc, 1);
float tell_accepted = VerifyClientEntity(tell_to, true, false);
projects / xonotic / xonotic-data.pk3dir.git / blobdiff