Added generic entity-collecting.

Now any cEntity can be collected, not only cPickups.
This should help PR #1098.