Commit 89fd8b7a authored by Gerhard Stein's avatar Gerhard Stein

Removed virtual links

parent c0515579
......@@ -80,9 +80,7 @@ void CMap::resetScrolls()
Uint16 CMap::at(Uint16 x, Uint16 y, Uint16 t)
{
if(x < m_width && y < m_height )
{
return m_Plane[t].getMapDataAt(x,y);
}
else
return 0;
}
......
......@@ -15,7 +15,7 @@
namespace galaxy
{
class CStunnable: public virtual CGalaxySpriteObject
class CStunnable: public CGalaxySpriteObject
{
public:
CStunnable(CMap *pmap,
......
......@@ -22,7 +22,6 @@ const int MAX_BOUNCE_BOOST = -115;
const int HOR_SPEED = 40;
CBounder::CBounder(CMap *pmap, const Uint16 foeID, Uint32 x, Uint32 y) :
CGalaxySpriteObject(pmap, foeID, x, y),
CStunnable(pmap, foeID, x, y),
bounceboost(0),
mpInteractPlayer(NULL)
......
......@@ -26,7 +26,6 @@ const int LICK_HOP_X_SPEED = 50;
const int LICK_BREATHE_TIMER = 100;
CLick::CLick(CMap *pmap, const Uint16 foeID, Uint32 x, Uint32 y) :
CGalaxySpriteObject(pmap, foeID, x, y),
CStunnable(pmap, foeID, x, y),
m_timer(0)
{
......
......@@ -23,7 +23,6 @@ const int CSF_DISTANCE_TO_FOLLOW_TOLERANCE = 2<<CSF;
const int WALK_SPEED = 10;
CMimrock::CMimrock(CMap *pmap, const Uint16 foeID, Uint32 x, Uint32 y) :
CGalaxySpriteObject(pmap, foeID, x, y),
CStunnable(pmap, foeID, x, y)
{
mActionMap[A_MIMROCK_SIT] = (void (CStunnable::*)()) &CMimrock::processSit;
......
......@@ -27,7 +27,6 @@ const int SLUG_MOVE_TIMER = 10;
CPoisonSlug::CPoisonSlug(CMap *pmap, const Uint16 foeID, Uint32 x, Uint32 y,
std::vector< SmartPointer<CGalaxySpriteObject> >&ObjectPtrs) :
CGalaxySpriteObject(pmap, foeID, x, y),
CStunnable(pmap, foeID, x, y),
m_ObjectPtrs(ObjectPtrs),
m_timer(0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment