Added CUser::isInGame() which is the equivalent of GetState() == GAME_STATE_INGAME (just neater). Replaced all uses with this (fixing some logic along the way).