attack <=> run bug fix

Author: unknown

AIControl.cpp

@@ -29,8 +29,10 @@ void AIControl::PlayAction(int skip){
 }
 void AIControl::moveTowardLyubu() {
 	for (int i = 0;i< this->npcStateMachineList.size(); i++){
+		if (npcStateMachineList[i]->CanBeControl() == FALSE){
+			continue;
+		}
 		int npcId = npcStateMachineList[i]->character;
-
 		FnActor lyubu;
 		FnActor npc;
 		lyubu.Object(this->lyubuId);
@@ -44,8 +46,8 @@ void AIControl::moveTowardLyubu() {
 
 		float distance;
 		distance = sqrt((npcPos[0] - lyubuPos[0]) * (npcPos[0] - lyubuPos[0]) 
-			+ (npcPos[0] - lyubuPos[0])	* (npcPos[0] - lyubuPos[0]) 
-			+ (npcPos[0] - lyubuPos[0]) * (npcPos[0] - lyubuPos[0]));
+			+ (npcPos[1] - lyubuPos[1])	* (npcPos[1] - lyubuPos[1]));
+			//+ (npcPos[0] - lyubuPos[0]) * (npcPos[0] - lyubuPos[0]));
 
 		//sprintf(debug, "%s distance = %f\n",debug,distance);
 
@@ -77,10 +79,11 @@ void AIControl::moveTowardLyubu() {
 			npcStateMachineList[i]->ChangeState(STATERUN, FALSE);
 		}
 		else if (distance <= ATTACK_DISTANCE) {
+			//sprintf(debug, "%s distance = %f\n",debug,distance);
 			npcStateMachineList[i]->AppendAttackCode(NORMAL_ATT);
 		}
 		else {
-			npcStateMachineList[i]->ChangeState(STATEIDLE, TRUE);
+			npcStateMachineList[i]->ChangeState(STATEIDLE);
 		}
 	}
 }

GameControl.cpp

@@ -44,11 +44,7 @@ BOOL GameControl::CharacterMoveForward(DIRECTION_CODE code){
 	}
 
 	// please check "beBlock" and decide what to do.
-	if (code == MOVE_FORWARD) {
-		//GameControl::CamFallow();
-	}else if (code == MOVE_BACK) {
-		//GameControl::CamBackOff();
-	}else if ((code == MOVE_LEFT || code == MOVE_RIGHT) && beBlock == TRUE){
+	if ((code == MOVE_LEFT || code == MOVE_RIGHT) && beBlock == TRUE){
 		GameControl::CamRevolution(code);
 	}
 
@@ -469,7 +465,7 @@ void GameControl::CamMove(float skip){
 				cam.MoveForward(-0.1, FALSE, FALSE, 0.0, TRUE);	//prevent the actor be under the camera, or it can't go out there
 				firstBlock = FALSE;
 			}
-			sprintf(debug, "%s Camera is blocked\n", debug);
+			//sprintf(debug, "%s Camera is blocked\n", debug);
 			float pos[3];
 			cam.GetWorldPosition(pos);
 			if (pos[2] > CAM_MAX_HIGHT) {