Fix removing currency on death
Improve error message for PowerManager loading powers
Define maximum level by xp table size instead of parameter
Merge pull request #775 from dorkster/bugfixes

 Fix removing currency on death
Merge pull request #782 from stefanbeller/improve_error_message

Improve error message for PowerManager loading powers
Merge pull request #783 from stefanbeller/maxlvl

Define maximum level by xp table size instead of parameter
Fix crash caused by #783

(I should really test these things before merging)
Merge pull request #9 from dorkster/fp_movement

Fix collision_to_map() not including 0.5 offset
Avatar::init: remove hero_cooldown resizing

It's overwritten later on with a newly constructed vector:
	stats.hero_cooldown = vector<int>(POWER_COUNT, 0);

Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
Move cooldown from statblocks to Avatar

We only need it in Avatar, so move it there.

Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
Merge pull request #789 from stefanbeller/powerlimit

Remove power limit and move hero_cooldown to Avatar
MapRenderer: Fix memory leak

The collision layer was not deleted properly when removed from the map
layers.

Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
Merge branch 'master' of git://github.com/clintbellanger/flare-engine into powerlimit
Merge pull request #790 from stefanbeller/memoryleak

Fix memleak in MapRenderer
ItemManager: Remove unused constant

It is obsolete since 83a2ad11d6
(2012-08-15, Item: replace arrays by vector.)

Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
Merge pull request #791 from stefanbeller/master

ItemManager: Remove unused constant
Fix namespace clash on round()
Merge pull request #792 from AMDmi3/round-collision

Fix namespace clash with ::round()
Merge branch 'master' of git://github.com/clintbellanger/flare-engine into floatingpointmovement

Conflicts:
	src/Avatar.h
	src/Hazard.cpp
	src/StatBlock.h
	src/Utils.cpp
	src/Utils.h
MapCollision: check_line: remove float_round

The arguments passed to is_valid_position may be a float, as it is
implemented as
	bool MapCollision::is_valid_position(
					float x, float y,
					MOVEMENTTYPE movement_type,
					bool is_hero) const
	{
		return is_valid_tile(floor(x), floor(y),
					movement_type, is_hero);
	}

Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>