Merge branch 'master' of https://github.com/SupSuper/OpenXcom
allow selective definition of internal sound catalogs
get sound by depth
add ambient sound effects to battlescape

defined by terrain type.
adjust bubbles when aiming.
use different sprite sheet for underwater bullets
fix reorder, remove unused variables from Globe
Merge pull request #939 from ajschult/Globe-compile

fix reorder, remove unused variables from Globe
weapons that don't work on land
else*
Merge branch 'master' of https://github.com/SupSuper/OpenXcom
Merge branch 'master' into craft_kill_credits

* master:
  else*
  weapons that don't work on land
  fix reorder, remove unused variables from Globe
  use different sprite sheet for underwater bullets
  adjust bubbles when aiming.
  add ambient sound effects to battlescape
  get sound by depth
  allow selective definition of internal sound catalogs