Merge branch 'opfor' into opforfixed

dlls/gearbox/func_tank_of.cpp

@@ -28,7 +28,7 @@
 //=========================================================
 // CFuncTankOF
 //=========================================================
-class CFuncTankOF : public CFuncTank
+class CFuncTankOF : public CFuncTankGun
 {
 public:
 
@@ -78,4 +78,4 @@ public:
 
 };
 
-LINK_ENTITY_TO_CLASS(func_tankcontrols_of, CFuncTankControlsOF);
+LINK_ENTITY_TO_CLASS(func_tankcontrols_of, CFuncTankControlsOF);

dlls/gearbox/gearbox_effects.cpp

@@ -304,7 +304,7 @@ void CBlowerCannon::BlowerCannonThink( void )
 			CSpore::CreateSpore(pev->origin, angles, this, CSpore::GRENADE, false, false);
 			break;
 		case BLOWERCANNON_SHOCKBEAM:
-			CShock::Shoot(pev, pev->angles, pev->origin, gpGlobals->v_forward * 2000);
+			CShock::Shoot(pev, angles, pev->origin, gpGlobals->v_forward * 2000);
 			break;
 		case BLOWERCANNON_DISPLACERBALL:
 			CDisplacerBall::Shoot(pev, pev->origin, gpGlobals->v_forward * 500, angles);