From 86147c2ef3d51ded9079a090e7a766b2225429cc Mon Sep 17 00:00:00 2001 From: Daveo Date: Mon, 12 Feb 2001 19:05:02 +0000 Subject: [PATCH] --- source/level/layertile.cpp | 4 +++- source/player/player.cpp | 14 ++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/source/level/layertile.cpp b/source/level/layertile.cpp index a8e056c3b..ecfa33e79 100644 --- a/source/level/layertile.cpp +++ b/source/level/layertile.cpp @@ -131,10 +131,11 @@ int NewY=YPos>>4; ShiftX=XPos & 15; ShiftY=YPos & 15; -#ifdef __USER_paul__ +//!!#ifdef __USER_paul__ MapX=NewX; MapY=NewY; UpdateWholeMap(); +/* #else if (NewX>MapX) { // update right column @@ -160,6 +161,7 @@ int NewY=YPos>>4; MapY=NewY; } #endif +*/ } /*****************************************************************************/ diff --git a/source/player/player.cpp b/source/player/player.cpp index c0eb614fb..79fb6d851 100644 --- a/source/player/player.cpp +++ b/source/player/player.cpp @@ -185,13 +185,13 @@ void CPlayer::init() m_skel.setAnimDatabase(CAnimDB::GetPlayerAnimBank()); -#ifdef __USER_paul__ +//!!#ifdef __USER_paul__ m_respawnPos.vx=23*16; m_respawnPos.vy=10*16; -#else - m_respawnPos.vx=10; - m_respawnPos.vy=10; -#endif +//!!#else +//!! m_respawnPos.vx=10; +//!! m_respawnPos.vy=10; +//!!#endif m_animNo=0; @@ -264,7 +264,7 @@ if(newmode!=-1) setMode((PLAYER_MODE)newmode); newmode=-1; } - +/*!! #ifndef __USER_paul__ int padInput=PadGetHeld(0); int move=7*_frames; @@ -279,6 +279,8 @@ if(newmode!=-1) GameScene.sendEvent( USER_REQUEST_TALK_EVENT, this ); } #else +*/ +#if 1 if(_frames>=3)_frames=2; for(i=0;i<_frames;i++)