This commit is contained in:
parent
80ecc1858a
commit
b061d250d6
1 changed files with 9 additions and 8 deletions
|
@ -584,20 +584,18 @@ if(newmode!=-1)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
m_allowConversation=false;
|
||||||
for(i=0;i<_frames;i++)
|
for(i=0;i<_frames;i++)
|
||||||
{
|
{
|
||||||
// Think
|
// Think
|
||||||
updatePadInput();
|
updatePadInput();
|
||||||
|
|
||||||
// Trying to converate?
|
// Trying to converate?
|
||||||
if(getPadInputDown()&PI_UP)
|
if(m_allowConversation==false&&
|
||||||
|
getPadInputDown()&PI_UP)
|
||||||
{
|
{
|
||||||
m_allowConversation=true;
|
m_allowConversation=true;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
m_allowConversation=false;
|
|
||||||
}
|
|
||||||
|
|
||||||
m_currentPlayerModeClass->think();
|
m_currentPlayerModeClass->think();
|
||||||
|
|
||||||
|
@ -1241,7 +1239,8 @@ void CPlayer::renderSb(DVECTOR *_pos,int _animNo,int _animFrame)
|
||||||
PAUL_DBGMSG("FRAME OVERRUN ON SPONGEBOB ADDON!");
|
PAUL_DBGMSG("FRAME OVERRUN ON SPONGEBOB ADDON!");
|
||||||
_animFrame=0;
|
_animFrame=0;
|
||||||
}
|
}
|
||||||
addonGfx->Render(*_pos,addonAnimFrame,_animFrame,m_facing==FACING_RIGHT?0:1);
|
ft4=addonGfx->Render(*_pos,addonAnimFrame,_animFrame,m_facing==FACING_RIGHT?0:1);
|
||||||
|
setSemiTrans(ft4,flash);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1257,12 +1256,14 @@ void CPlayer::renderSb(DVECTOR *_pos,int _animNo,int _animFrame)
|
||||||
PAUL_DBGMSG("FRAME OVERRUN ON SPONGEBOB GLASSES ADDON!");
|
PAUL_DBGMSG("FRAME OVERRUN ON SPONGEBOB GLASSES ADDON!");
|
||||||
_animFrame=0;
|
_animFrame=0;
|
||||||
}
|
}
|
||||||
addonGfx->Render(*_pos,addonAnimFrame,_animFrame,m_facing==FACING_RIGHT?0:1);
|
ft4=addonGfx->Render(*_pos,addonAnimFrame,_animFrame,m_facing==FACING_RIGHT?0:1);
|
||||||
|
setSemiTrans(ft4,flash);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Render SB
|
// Render SB
|
||||||
m_actorGfx->Render(*_pos,_animNo,_animFrame,m_facing==FACING_RIGHT?0:1);
|
ft4=m_actorGfx->Render(*_pos,_animNo,_animFrame,m_facing==FACING_RIGHT?0:1);
|
||||||
|
setSemiTrans(ft4,flash);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue