Melee math fixes, use floating point math where intended

Fixed a couple silly errors resulting from someone not understanding how floating point vs. integral math works in C++.

Closes #935.