Merge remote-tracking branch 'origin/tzork/misc-fixes'

diff --combined qcsrc/server/w_tuba.qc
index 8753e7ba5a4e93e4326284266f11c0d19c1725e0,62160715a3efb681a89e0ed7b93ead591e50335a..9623a32b831018d05b97c4785f3bfdee025ae0f5
--- 1/qcsrc/server/w_tuba.qc
--- 2/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@@ -243,17 -243,19 +243,17 @@@ float w_tuba(float req
                // TODO switch to alternate instruments :)
                if(self.weaponentity.state == WS_READY)
                {
 -                      /*
                        switch(self.tuba_instrument)
                        {
                                case 0:
                                        self.tuba_instrument = 1;
 -                                      self.weaponname = "laser";
 +                                      self.weaponname = "akordeon";
                                        break;
                                case 1:
                                        self.tuba_instrument = 0;
                                        self.weaponname = "tuba";
                                        break;
                        }
 -                      */
                        W_SetupShot(self, FALSE, 0, "", 0, 0);
                        pointparticles(particleeffectnum("teleport"), w_shotorg, '0 0 0', 1);
                        self.weaponentity.state = WS_INUSE;
@@@ -265,7 -267,7 +265,7 @@@
        else if (req == WR_CHECKAMMO2)
                return TRUE; // TODO use fuel?
        return TRUE;
- };
+ }
  #endif
  #ifdef CSQC
  float w_tuba(float req)