Merged master into Lyberta/TeamplayFixes_.
authorLyberta <lyberta@lyberta.net>
Sun, 27 Aug 2017 23:44:07 +0000 (02:44 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 27 Aug 2017 23:44:07 +0000 (02:44 +0300)
1  2 
qcsrc/server/client.qc
qcsrc/server/client.qh
qcsrc/server/command/cmd.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/player.qc
qcsrc/server/scores_rules.qc
qcsrc/server/teamplay.qc
qcsrc/server/teamplay.qh

Simple merge
Simple merge
Simple merge
@@@ -1091,15 -1095,9 +1095,15 @@@ void GameCommand_moveplayer(float reque
  
                                                                // If so, lets continue and finally move the player
                                                                client.team_forced = 0;
 -                                                              MoveToTeam(client, team_id, 6);
 -                                                              successful = strcat(successful, (successful ? ", " : ""), playername(client, false));
 -                                                              LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") has been moved to the ", Team_ColoredFullName(team_id), "^7.");
 +                                                              if (MoveToTeam(client, team_id, 6))
 +                                                              {
 +                                                                      successful = strcat(successful, (successful ? ", " : ""), playername(client, false));
-                                                                       LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") has been moved to the ", Team_ColoredFullName(team_id), "^7.\n");
++                                                                      LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") has been moved to the ", Team_ColoredFullName(team_id), "^7.");
 +                                                              }
 +                                                              else
 +                                                              {
 +                                                                      LOG_INFO("Unable to move player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ")");
 +                                                              }
                                                                continue;
                                                        }
                                                        else
Simple merge
@@@ -1,8 -1,10 +1,11 @@@
  #include "scores_rules.qh"
  
+ #include <server/defs.qh>
+ #include <server/miscfunctions.qh>
  #include "client.qh"
  #include "scores.qh"
+ #include <common/gamemodes/rules.qh>
 +#include "teamplay.qh"
  
  int ScoreRules_teams;
  
Simple merge
Simple merge