World Limit Issues

function cPlayer::onLevelLoaded(%this, %scenegraph)
{
//	echo("cPlayer::onLevelLoaded(%this, %scenegraph);");
	$player = %this;

	moveMap.bindCmd(keyboard, "w", "playerUp();", "playerUpStop();");
	moveMap.bindCmd(keyboard, "s", "playerDown();", "playerDownStop();");
	moveMap.bindCmd(keyboard, "a", "playerLeft();", "playerLeftStop();");
	moveMap.bindCmd(keyboard, "d", "playerRight();", "playerRightStop();");

	%this.gridSize = 2;
	%this.ready = true;
}

function cPlayer::onCollision(%srcObject, %dstObject, %srcRef, %dstRef, %time, %normal, %contacts, %points)
{
	echo("cPlayer::onCollision(%srcObject, %dstObject, %srcRef, %dstRef, %time:" SPC %time SPC ", %normal:" SPC %normal SPC", %contacts:" SPC %contacts SPC", %points:" SPC %points SPC ");");
}

function cPlayer::onWorldLimit(%this, %limitMode, %limit)
{
	// called when cPlayer object reaches World Limits
//	echo("cPlayer::onWorldLimit(%this, %limitMode, %limit);");
//	echo("Hit" SPC %limit SPC "limit.");
	if(%this.key1 $= %limit )
	{
		%this.ready = true;
	}
}

function cPlayer::onPositionTarget(%this)
{
	// Called when target reaches moveTo destination
//	echo("cPlayer::onPositionTarget(%this);");
//	echo("Position:" SPC %this.getPosition());
	%this.ready = true;
	%this.updateMovement();
}

function cPlayer::updateMovement(%this)
{
//	echo("cPlayer::updateMovement();");
//	echo("Ready:" SPC %this.ready SPC ", Key:" SPC %this.key1);
	if(%this.ready && %this.key1 !$= "")
	{
		%this.ready = false;
		$pos = %this.getPosition();
		$X = (getWord($pos, 0) / %this.gridSize) * %this.gridSize;
		$Y = (getWord($pos, 1) / %this.gridSize) * %this.gridSize;
		echo("Position:" SPC $pos SPC "-" SPC $X SPC $Y);
		echo("Direction:" SPC %this.key1);
		switch$ (%this.key1)
		{
			case "top":
				$Y -= %this.gridSize;
			case "bottom":
				$Y += %this.gridSize;
			case "left":
				$X -= %this.gridSize;
			case "right":
				$X += %this.gridSize;
			default:
				// Note, moveTo's callback does not fire if you are already AT the target location
				%this.ready = true;
		}
//		echo("Target:" SPC $X SPC $Y);
		if($X != getWord($pos, 0) || $Y != getWord($pos, 1))
		{
//			echo("moveTo:" SPC $X SPC $Y);
			%this.moveTo($X, $Y, %this.speed, true, true);
		}
		else
		{
//			echo("At target position, not moving.");
			$this.ready = true;
		}
	}
}


function cPlayer::addKey(%this, %key)
{
	// Adds key to beginning of buffer
	%this.removeKey(%key);
//	echo("cPlayer::addKey(%this, " @ %key @ ");");
	%this.key4 = %this.key3;
	%this.key3 = %this.key2;
	%this.key2 = %this.key1;
	%this.key1 = %key;
}

function cPlayer::removeKey(%this, %key)
{
//	echo("cPlayer::removeKey(%this, " @ %key @ ");");
	// removes key from buffer, and shifts later keys to the beginning
	switch$ (%key)
	{
		case %this.key1:
			%this.key1 = %this.key2;
			%this.key2 = %this.key3;
			%this.key3 = %this.key4;
			%this.key4 = "";
		case %this.key2:
			%this.key2 = %this.key3;
			%this.key3 = %this.key4;
			%this.key4 = "";
		case %this.key3:
			%this.key3 = %this.key4;
			%this.key4 = "";
		case %this.key4:
			%this.key4 = "";
	}		
}


function playerUp()
{
//	echo("playerUp();");
	$player.addKey("top");
	$player.updateMovement();
}

function playerDown()
{
//	echo("playerDown();");
	$player.addKey("bottom");
	$player.updateMovement();
}

function playerLeft()
{
//	echo("playerLeft();");
	$player.addKey("left");
	$player.updateMovement();
}

function playerRight()
{
//	echo("playerRight();");
	$player.addKey("right");
	$player.updateMovement();
}

function playerUpStop()
{
//	echo("playerUpStop();");
	$player.removeKey("top");
	$player.updateMovement();
}

function playerDownStop()
{
//	echo("playerDownStop();");
	$player.removeKey("bottom");
	$player.updateMovement();
}

function playerLeftStop()
{
//	echo("playerLeftStop();");
	$player.removeKey("left");
	$player.updateMovement();
}

function playerRightStop()
{
//	echo("playerRightStop();");
	$player.removeKey("right");
	$player.updateMovement();
}