This commit is contained in:
parent
3dc5daccbb
commit
86147c2ef3
2 changed files with 11 additions and 7 deletions
|
@ -131,10 +131,11 @@ int NewY=YPos>>4;
|
||||||
ShiftX=XPos & 15;
|
ShiftX=XPos & 15;
|
||||||
ShiftY=YPos & 15;
|
ShiftY=YPos & 15;
|
||||||
|
|
||||||
#ifdef __USER_paul__
|
//!!#ifdef __USER_paul__
|
||||||
MapX=NewX;
|
MapX=NewX;
|
||||||
MapY=NewY;
|
MapY=NewY;
|
||||||
UpdateWholeMap();
|
UpdateWholeMap();
|
||||||
|
/*
|
||||||
#else
|
#else
|
||||||
if (NewX>MapX)
|
if (NewX>MapX)
|
||||||
{ // update right column
|
{ // update right column
|
||||||
|
@ -160,6 +161,7 @@ int NewY=YPos>>4;
|
||||||
MapY=NewY;
|
MapY=NewY;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
|
@ -185,13 +185,13 @@ void CPlayer::init()
|
||||||
m_skel.setAnimDatabase(CAnimDB::GetPlayerAnimBank());
|
m_skel.setAnimDatabase(CAnimDB::GetPlayerAnimBank());
|
||||||
|
|
||||||
|
|
||||||
#ifdef __USER_paul__
|
//!!#ifdef __USER_paul__
|
||||||
m_respawnPos.vx=23*16;
|
m_respawnPos.vx=23*16;
|
||||||
m_respawnPos.vy=10*16;
|
m_respawnPos.vy=10*16;
|
||||||
#else
|
//!!#else
|
||||||
m_respawnPos.vx=10;
|
//!! m_respawnPos.vx=10;
|
||||||
m_respawnPos.vy=10;
|
//!! m_respawnPos.vy=10;
|
||||||
#endif
|
//!!#endif
|
||||||
|
|
||||||
|
|
||||||
m_animNo=0;
|
m_animNo=0;
|
||||||
|
@ -264,7 +264,7 @@ if(newmode!=-1)
|
||||||
setMode((PLAYER_MODE)newmode);
|
setMode((PLAYER_MODE)newmode);
|
||||||
newmode=-1;
|
newmode=-1;
|
||||||
}
|
}
|
||||||
|
/*!!
|
||||||
#ifndef __USER_paul__
|
#ifndef __USER_paul__
|
||||||
int padInput=PadGetHeld(0);
|
int padInput=PadGetHeld(0);
|
||||||
int move=7*_frames;
|
int move=7*_frames;
|
||||||
|
@ -279,6 +279,8 @@ if(newmode!=-1)
|
||||||
GameScene.sendEvent( USER_REQUEST_TALK_EVENT, this );
|
GameScene.sendEvent( USER_REQUEST_TALK_EVENT, this );
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
*/
|
||||||
|
#if 1
|
||||||
if(_frames>=3)_frames=2;
|
if(_frames>=3)_frames=2;
|
||||||
|
|
||||||
for(i=0;i<_frames;i++)
|
for(i=0;i<_frames;i++)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue