Merge remote-tracking branch 'origin/master' into samual/weapons

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

diff --git a/qcsrc/server/vehicles/bumblebee.qc b/qcsrc/server/vehicles/bumblebee.qc
index 4330966dc7894f2b959b4c51ceedaa302e56e4f4..36a0a8e764715e8396156d3fdcd03d9243d88edd 100644 (file)
--- a/qcsrc/server/vehicles/bumblebee.qc
+++ b/qcsrc/server/vehicles/bumblebee.qc
@@ -232,7 +232,7 @@ void bumb_gunner_exit(float _exitflag)
        self.takedamage     = DAMAGE_AIM;
        self.solid          = SOLID_SLIDEBOX;
        self.movetype       = MOVETYPE_WALK;
-       self.effects        &~= EF_NODRAW;
+       self.effects        &= ~EF_NODRAW;
        self.alpha          = 1;
        self.PlayerPhysplug = func_null;
        self.view_ofs       = PL_VIEW_OFS;
@@ -315,7 +315,7 @@ float bumb_gunner_enter()
        other.vehicle_reload2   = self.vehicle_reload2;
        other.vehicle_energy    = self.vehicle_energy;
        other.PlayerPhysplug    = bumb_gunner_frame;
-       other.flags             &~= FL_ONGROUND;
+       other.flags             &= ~FL_ONGROUND;
 
        msg_entity = other;
        WriteByte(MSG_ONE, SVC_SETVIEWPORT);
@@ -531,7 +531,7 @@ float bumb_pilot_frame()
        if((pilot.BUTTON_ATCK || pilot.BUTTON_ATCK2) && (vehic.vehicle_energy > autocvar_g_vehicle_bumblebee_raygun_dps * sys_frametime || autocvar_g_vehicle_bumblebee_raygun == 0))
        {
                vehic.gun3.enemy.realowner = pilot;
-               vehic.gun3.enemy.effects &~= EF_NODRAW;
+               vehic.gun3.enemy.effects &= ~EF_NODRAW;
                
                vehic.gun3.enemy.hook_start = gettaginfo(vehic.gun3, gettagindex(vehic.gun3, "fire"));
                vehic.gun3.enemy.SendFlags |= BRG_START;
@@ -702,11 +702,11 @@ void bumb_blowup()
 {
        RadiusDamage(self, self.enemy, autocvar_g_vehicle_bumblebee_blowup_coredamage,
                                 autocvar_g_vehicle_bumblebee_blowup_edgedamage,
-                                autocvar_g_vehicle_bumblebee_blowup_radius, self,
+                                autocvar_g_vehicle_bumblebee_blowup_radius, self, world,
                                 autocvar_g_vehicle_bumblebee_blowup_forceintensity,
                                 DEATH_VH_BUMB_DEATH, world);
 
-       sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM);
+       sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTEN_NORM);
        pointparticles(particleeffectnum("explosion_large"), randomvec() * 80 + (self.origin + '0 0 100'), '0 0 0', 1);
        
        if(self.owner.deadflag == DEAD_DYING)
@@ -722,7 +722,7 @@ void bumb_diethink()
 
        if(random() < 0.1)
        {
-               sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM);
+               sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTEN_NORM);
                pointparticles(particleeffectnum("explosion_small"), randomvec() * 80 + (self.origin + '0 0 100'), '0 0 0', 1);
        }
 
@@ -787,7 +787,6 @@ void bumb_die()
        self.nextthink          = 0;
 
        setorigin(self, self.pos1);
-
 }
 
 void bumb_impact()