Removed texture path param from Character.
This commit is contained in:
parent
402cd138d3
commit
6c83d3827a
4 changed files with 4 additions and 4 deletions
|
@ -26,7 +26,7 @@ std::vector<Character*> Character::mCharacterInstances = std::vector<Character*>
|
|||
* Saves pointer to this instance in static var for think().
|
||||
*/
|
||||
Character::Character(World& world, Collection& collection, Pathfinder& pathfinder,
|
||||
const String& texturePath, const PhysicalData& data, const Yaml& config) :
|
||||
const PhysicalData& data, const Yaml& config) :
|
||||
Sprite(config, data),
|
||||
mCollection(collection),
|
||||
mPathfinder(pathfinder),
|
||||
|
|
|
@ -31,7 +31,7 @@ class Character : public Sprite {
|
|||
// Public functions.
|
||||
public:
|
||||
Character(World& world, Collection& collection, Pathfinder& pathfinder,
|
||||
const String& texturePath, const PhysicalData& data, const Yaml& config);
|
||||
const PhysicalData& data, const Yaml& config);
|
||||
virtual ~Character() = 0;
|
||||
|
||||
static void think(float elapsedTime);
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
Enemy::Enemy(World& world, Collection& collection, Pathfinder& pathfinder,
|
||||
const Vector2f& position, const Yaml& config) :
|
||||
Character(world, collection, pathfinder, "enemy.png",
|
||||
Character(world, collection, pathfinder,
|
||||
PhysicalData(position, world, CATEGORY_ACTOR, MASK_ALL,
|
||||
true, false, true),
|
||||
config),
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
*/
|
||||
Player::Player(World& world, Collection& collection, Pathfinder& pathfinder,
|
||||
const Vector2f& position, const Yaml& config) :
|
||||
Character(world, collection, pathfinder, "player.png",
|
||||
Character(world, collection, pathfinder,
|
||||
PhysicalData(position, world, CATEGORY_ACTOR, MASK_ALL, true,
|
||||
false, true),
|
||||
config),
|
||||
|
|
Reference in a new issue