King_DuckZ/clooneljump
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed unneeded code in Placeable.

Browse source
This commit is contained in:
King_DuckZ 2014-02-24 21:09:33 +01:00
parent a9b53f33e1
commit d9ccbede66
3 changed files with 2 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/gameplaysceneclassic.cpp
View file

@ -29,7 +29,7 @@ namespace cloonel {
std::unique_ptr<Character> player(new Character("resources/graphics/player.png", SDLObject(), ushort2(80, 120))); std::unique_ptr<Character> player(new Character("resources/graphics/player.png", SDLObject(), ushort2(80, 120)));
player->Prepare(); player->Prepare();
player->SwapMover(moverSine.get()); moverSine->RegisterPlaceable(player.get());
std::swap(moverSine, m_moverSine); std::swap(moverSine, m_moverSine);
std::swap(player, m_player); std::swap(player, m_player);

19
src/placeable.cpp
View file

@ -6,24 +6,7 @@ namespace cloonel {
///-------------------------------------------------------------------------- ///--------------------------------------------------------------------------
///-------------------------------------------------------------------------- ///--------------------------------------------------------------------------
Placeable::Placeable (float2 parPos) : Placeable::Placeable (float2 parPos) :
m_pos(parPos), m_pos(parPos)
m_mover(nullptr),
m_idForMover(0)
{ {
} }
///--------------------------------------------------------------------------
///--------------------------------------------------------------------------
void Placeable::SwapMover (Mover* parMover) {
if (m_mover) {
assert(0 != m_idForMover);
m_mover->UnregisterPlaceable(m_idForMover);
m_idForMover = 0;
m_mover = nullptr;
}
if (parMover) {
m_idForMover = static_cast<int>(parMover->RegisterPlaceable(this));
m_mover = parMover;
}
}
} //namespace cloonel } //namespace cloonel

4
src/placeable.hpp
View file

@ -11,16 +11,12 @@ namespace cloonel {
float2 GetPos ( void ) const noexcept; float2 GetPos ( void ) const noexcept;
void AddOffset ( const float2& parOffset ) noexcept; void AddOffset ( const float2& parOffset ) noexcept;
void SwapMover ( Mover* parMover );
protected: protected:
explicit Placeable ( float2 parPos ); explicit Placeable ( float2 parPos );
~Placeable ( void ) noexcept = default; ~Placeable ( void ) noexcept = default;
private: private:
float2 m_pos; float2 m_pos;
Mover* m_mover;
int m_idForMover;
}; };
///-------------------------------------------------------------------------- ///--------------------------------------------------------------------------