Merge branch 'master' into divVerent/csad

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cl_client.qc

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 7ccbacbf314fd191cde32f899bfa1c86e2f36593..1dcbf0d1f5bb8df19a81d03b76957e3c8a853aaf 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -7,9 +7,9 @@ void send_CSQC_teamnagger() {
 }
 
 void Announce(string snd) {
 }
 
 void Announce(string snd) {

-       WriteByte(MSG_ALL, SVC_TEMPENTITY);
-       WriteByte(MSG_ALL, TE_CSQC_ANNOUNCE);
-       WriteString(MSG_ALL, snd);
+       WriteByte(MSG_BROADCAST, SVC_TEMPENTITY);
+       WriteByte(MSG_BROADCAST, TE_CSQC_ANNOUNCE);
+       WriteString(MSG_BROADCAST, snd);

 }
 
 void AnnounceTo(entity e, string snd) {
 }
 
 void AnnounceTo(entity e, string snd) {


@@ -471,7 +471,7 @@ void PutObserverInServer (void)
        self.superweapons_finished = 0;
        self.pushltime = 0;
        self.istypefrag = 0;
        self.superweapons_finished = 0;
        self.pushltime = 0;
        self.istypefrag = 0;

-       self.think = SUB_Null;
+       self.think = func_null;

        self.nextthink = 0;
        self.hook_time = 0;
        self.runes = 0;
        self.nextthink = 0;
        self.hook_time = 0;
        self.runes = 0;


@@ -787,7 +787,7 @@ void PutClientInServer (void)
                self.invincible_finished = 0;
                self.pushltime = 0;
                // players have no think function
                self.invincible_finished = 0;
                self.pushltime = 0;
                // players have no think function

-               self.think = SUB_Null;
+               self.think = func_null;

                self.nextthink = 0;
                self.hook_time = 0;
                self.dmg_team = 0;
                self.nextthink = 0;
                self.hook_time = 0;
                self.dmg_team = 0;


@@ -1355,7 +1355,7 @@ void ClientConnect (void)
        DecodeLevelParms();
 
 #ifdef WATERMARK
        DecodeLevelParms();
 
 #ifdef WATERMARK

-       sprint(self, strcat("^4SVQC Build information: ^1", WATERMARK(), "\n"));
+       sprint(self, strcat("^4SVQC Build information: ^1", WATERMARK, "\n"));

 #endif
 
        self.classname = "player_joining";
 #endif
 
        self.classname = "player_joining";


@@ -1538,8 +1538,6 @@ void ClientConnect (void)
        if(!sv_foginterval && world.fog != "")
                stuffcmd(self, strcat("\nfog ", world.fog, "\nr_fog_exp2 0\nr_drawfog 1\n"));
 
        if(!sv_foginterval && world.fog != "")
                stuffcmd(self, strcat("\nfog ", world.fog, "\nr_fog_exp2 0\nr_drawfog 1\n"));
 

-       SoundEntity_Attach(self);
-

        if(autocvar_g_hitplots || strstrofs(strcat(" ", autocvar_g_hitplots_individuals, " "), strcat(" ", self.netaddress, " "), 0) >= 0)
        {
                self.hitplotfh = fopen(strcat("hits-", matchid, "-", self.netaddress, "-", ftos(self.playerid), ".plot"), FILE_WRITE);
        if(autocvar_g_hitplots || strstrofs(strcat(" ", autocvar_g_hitplots_individuals, " "), strcat(" ", self.netaddress, " "), 0) >= 0)
        {
                self.hitplotfh = fopen(strcat("hits-", matchid, "-", self.netaddress, "-", ftos(self.playerid), ".plot"), FILE_WRITE);


@@ -1635,8 +1633,6 @@ void ClientDisconnect (void)
        bprint ("^4",self.netname);
        bprint ("^4 disconnected\n");
 
        bprint ("^4",self.netname);
        bprint ("^4 disconnected\n");
 

-       SoundEntity_Detach(self);
-

        DropAllRunes(self);
        MUTATOR_CALLHOOK(ClientDisconnect);
 
        DropAllRunes(self);
        MUTATOR_CALLHOOK(ClientDisconnect);
 


@@ -1782,15 +1778,9 @@ void player_powerups (void)
        olditems = self.items;
 
        if((self.items & IT_USING_JETPACK) && !self.deadflag)
        olditems = self.items;
 
        if((self.items & IT_USING_JETPACK) && !self.deadflag)

-       {
-               SoundEntity_StartSound(self, CH_TRIGGER_SINGLE, "misc/jetpack_fly.wav", VOL_BASE, autocvar_g_jetpack_attenuation);

                self.modelflags |= MF_ROCKET;
                self.modelflags |= MF_ROCKET;

-       }

        else
        else

-       {
-               SoundEntity_StopSound(self, CH_TRIGGER_SINGLE);

                self.modelflags &~= MF_ROCKET;
                self.modelflags &~= MF_ROCKET;

-       }

 
        self.effects &~= (EF_RED | EF_BLUE | EF_ADDITIVE | EF_FULLBRIGHT | EF_FLAME | EF_NODEPTHTEST);
 
 
        self.effects &~= (EF_RED | EF_BLUE | EF_ADDITIVE | EF_FULLBRIGHT | EF_FLAME | EF_NODEPTHTEST);
 


@@ -3033,10 +3023,6 @@ void PlayerPostThink (void)
                if (intermission_running)
                        return;         // intermission or finale
                GetPressedKeys();
                if (intermission_running)
                        return;         // intermission or finale
                GetPressedKeys();

-       } else if (self.classname == "observer") {
-               //do nothing
-       } else if (self.classname == "spectator") {
-               //do nothing

        }
        
 #ifdef TETRIS
        }
        
 #ifdef TETRIS


@@ -3089,7 +3075,7 @@ void PlayerPostThink (void)
 
        if((g_cts || g_race) && self.cvar_cl_allow_uidtracking == 1 && self.cvar_cl_allow_uid2name == 1)
        {
 
        if((g_cts || g_race) && self.cvar_cl_allow_uidtracking == 1 && self.cvar_cl_allow_uid2name == 1)
        {

-               if(!self.stored_netname)
+               if not(self.stored_netname)

                        self.stored_netname = strzone(uid2name(self.crypto_idfp));
                if(self.stored_netname != self.netname)
                {
                        self.stored_netname = strzone(uid2name(self.crypto_idfp));
                if(self.stored_netname != self.netname)
                {