Player - took out solid map logic for simplicity

Added more stuff to GameConstants.java
NOTE - Multiplayer is still screwed up due to changes to GameState, look
at commented out code