-#include "../../common/command/command.qh"
+#include <common/command/command.qh>
#include "cmd.qh"
#include "common.qh"
#include "../mutators/all.qh"
#ifdef SVQC
- #include "../../common/vehicles/all.qh"
+ #include <common/vehicles/all.qh>
#endif
-#include "../../common/constants.qh"
-#include "../../common/deathtypes/all.qh"
-#include "../../common/mapinfo.qh"
-#include "../../common/notifications.qh"
-#include "../../common/physics/player.qh"
-#include "../../common/teams.qh"
-#include "../../common/util.qh"
-#include "../../common/triggers/triggers.qh"
+#include <common/constants.qh>
+#include <common/deathtypes/all.qh>
+#include <common/mapinfo.qh>
+#include <common/notifications.qh>
+#include <common/physics/player.qh>
+#include <common/teams.qh>
+#include <common/util.qh>
+#include <common/triggers/triggers.qh>
-#include "../../common/minigames/sv_minigames.qh"
+#include <common/minigames/sv_minigames.qh>
-#include "../../common/monsters/all.qc"
-#include "../../common/monsters/spawn.qh"
-#include "../../common/monsters/sv_monsters.qh"
+#include <common/monsters/all.qc>
+#include <common/monsters/spawn.qh>
+#include <common/monsters/sv_monsters.qh>
-#include "../../lib/warpzone/common.qh"
+#include <lib/warpzone/common.qh>
void ClientKill_TeamChange(float targetteam); // 0 = don't change, -1 = auto, -2 = spec
self.classname = STR_PLAYER;
PlayerScore_Clear(self);
Kill_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER_CPID, CPID_PREVENT_JOIN);
- Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_JOIN_PLAY, self.netname);
+ Send_Notification(NOTIF_ALL, world, MSG_INFO, ((teamplay) ? APP_TEAM_ENT_4(this, INFO_JOIN_PLAY_TEAM_) : INFO_JOIN_PLAY), self.netname);
PutClientInServer();
}
else
if (selection)
{
- if (self.team == selection && self.deadflag == DEAD_NO)
+ if (self.team == selection && !IS_DEAD(self))
{
sprint(self, "^7You already are on that team.\n");
}