nutomic/dungeon-gunner
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed texture path param from Character.

Browse source
This commit is contained in:
Felix Ableitner 2012-12-22 01:45:52 +01:00
parent 402cd138d3
commit 6c83d3827a
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/abstract/Character.cpp
View file

@ -26,7 +26,7 @@ std::vector<Character*> Character::mCharacterInstances = std::vector<Character*>
* Saves pointer to this instance in static var for think(). * Saves pointer to this instance in static var for think().
*/ */
Character::Character(World& world, Collection& collection, Pathfinder& pathfinder, 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), Sprite(config, data),
mCollection(collection), mCollection(collection),
mPathfinder(pathfinder), mPathfinder(pathfinder),

2
source/abstract/Character.h
View file

@ -31,7 +31,7 @@ class Character : public Sprite {
// Public functions. // Public functions.
public: public:
Character(World& world, Collection& collection, Pathfinder& pathfinder, 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; virtual ~Character() = 0;
static void think(float elapsedTime); static void think(float elapsedTime);

2
source/sprites/Enemy.cpp
View file

@ -11,7 +11,7 @@
Enemy::Enemy(World& world, Collection& collection, Pathfinder& pathfinder, Enemy::Enemy(World& world, Collection& collection, Pathfinder& pathfinder,
const Vector2f& position, const Yaml& config) : const Vector2f& position, const Yaml& config) :
Character(world, collection, pathfinder, "enemy.png", Character(world, collection, pathfinder,
PhysicalData(position, world, CATEGORY_ACTOR, MASK_ALL, PhysicalData(position, world, CATEGORY_ACTOR, MASK_ALL,
true, false, true), true, false, true),
config), config),

2
source/sprites/Player.cpp
View file

@ -18,7 +18,7 @@
*/ */
Player::Player(World& world, Collection& collection, Pathfinder& pathfinder, Player::Player(World& world, Collection& collection, Pathfinder& pathfinder,
const Vector2f& position, const Yaml& config) : const Vector2f& position, const Yaml& config) :
Character(world, collection, pathfinder, "player.png", Character(world, collection, pathfinder,
PhysicalData(position, world, CATEGORY_ACTOR, MASK_ALL, true, PhysicalData(position, world, CATEGORY_ACTOR, MASK_ALL, true,
false, true), false, true),
config), config),