Merge pull request #1 from SupSuper/master

Resync with upstream
Initial pointer patch
Fixed base class
Unless I didn't fix it
More fixes
More more more
Removed unnecessary pointer shuffling
Various fixes to the game pointer management
More fixes
Even more fixes
More state fixes
Fixes etc.
More fixes
Fixes and some style conformity changes
State pushing fix and style conformity changes
Fixes and style conformity changes
Fixes and style conformity changes
State pushing fix
Fixes and style conformity changes
Fixes