Commit bfab21ce authored by Gerhard Stein's avatar Gerhard Stein

Small Player Diving crash fixed

parent c6f18a07
......@@ -12,6 +12,9 @@
namespace galaxy {
const int A_KEENSWIM_MOVE = 0;
CPlayerDive::CPlayerDive(CMap *pmap,
const Uint16 foeID,
Uint32 x,
......@@ -28,8 +31,9 @@ CPlayerBase(pmap, foeID, x, y,
m_swimupspeed(0),
m_breathtimer(0)
{
mActionMap[A_KEENSWIM_MOVE] = (void (CPlayerBase::*)()) &CPlayerDive::processDiving;
setupGalaxyObjectOnMap(0x19EC, A_KEENSWIM_MOVE);
mp_processState = (void (CPlayerBase::*)())(&CPlayerDive::processDiving);
}
const int DIE_FALL_MAX_INERTIA = 150;
......
......@@ -12,8 +12,6 @@
namespace galaxy {
#define A_KEENSWIM_MOVE 0
class CPlayerDive : public CPlayerBase
{
public:
......
......@@ -357,6 +357,11 @@ void blitMaskedSprite(SDL_Surface *dst, SDL_Surface *src, Uint32 color)
*/
void CSprite::drawSprite( const Uint16 x, const Uint16 y, const Uint8 alpha )
{
if(m_alpha != 255)
{
printf("Hey\n");
}
g_pVideoDriver->mDrawTasks.add( new DrawSpriteTask( this, x, y, alpha ) );
}
......
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