Removed some instances of re-scoping which were necessary in C, but no longer necessary in C++
Cleaned up bg_pmove.cpp slightly
Forced d_saberGhoul2Collision and d_saberSPStyleDamage to both be 1, and removed any code where the case was otherwise.