Merge compatibility fixes

Made fixes so that the project would run after the inventory zoom branch
was merged. (initially it didn't)

Fixed:
- main.cpp
- player.cpp