Merge pull request #15 from wingzero0/master

修正血條,也把debug message去掉

Author: Chun-Yi

AIControl.cpp

@@ -24,6 +24,7 @@ int AIControl::AddNPC(ACTORid npc, char * ActionFilename){
 	ActorStateMachine* stm = new ActorStateMachine(npc, ActionFilename);
 	this->npcStateMachineList.push_back(stm);
 	stm->life = 10;
+	stm->UpdateLifeBillboard();
 	return 0;
 }
 

ActorStateMachine.cpp

@@ -348,7 +348,7 @@ BOOL ActorStateMachine::UpdateEffectiveAttack(){
 	actor.Object(this->character);
 	float frame = actor.QueryCurrentFrame(0);
 	//sprintf(debug, "%s frame:%lf\n", debug, frame );
-	if (frame > 10.0){
+	if (frame > 15.0){
 		this->effectiveAttack =	TRUE;
 	}
 	/*
@@ -410,12 +410,12 @@ int ActorStateMachine::AttackEnemy(float enemyPos[3], SHOT_CODE *shot_code){
 
 	if (this->currentAttackIndex == 0){
 		if (cosine > 0.8){ // normal or heavy attack, only attack the front side enemy
-			sprintf(debug, "%s attack power = %d\n",debug,1);
+			//sprintf(debug, "%s attack power = %d\n",debug,1);
 			return 1;
 		}
 	}else if (this->currentAttackIndex <= 3){
 		if (cosine >= 0.0){
-			sprintf(debug, "%s attack power = %d\n",debug,2);
+			//sprintf(debug, "%s attack power = %d\n",debug,2);
 			return 3;
 		}
 	}
@@ -466,7 +466,10 @@ void ActorStateMachine::TakeDamage(int damage, SHOT_CODE shot_code, float *attac
 	}else {
 		this->ChangeState(STATEDAMAGE, TRUE);
 	}
+	this->UpdateLifeBillboard();
+}
 
+void ActorStateMachine::UpdateLifeBillboard(){
 	FnBillBoard blood;
 	blood.Object(bloodID, 0);
 	float size[2];

ActorStateMachine.h

@@ -74,5 +74,6 @@ class ActorStateMachine
 	BOOL CheckEffectiveAttack();
 	virtual int AttackEnemy(float enemyPos[3], SHOT_CODE *shot_code = NULL); // shot_code will be assgin a value after the call
 	virtual void TakeDamage(int damage, SHOT_CODE shot_code, float* attackerPos);
+	void UpdateLifeBillboard(); // billboard
 };
 

LyubuStateMachine.cpp

@@ -187,7 +187,7 @@ int LyubuStateMachine::AttackEnemy(float enemyPos[3], SHOT_CODE *shot_code){
 		if (this->attackKeyQueue[currentAttackIndex] == ULTIMATE_ATT){
 			if (frame > 100){ // almost finish attack
 				*shot_code = BIG_SHOT;
-				sprintf(debug, "%s attack power = %d\n",debug,10);
+				//sprintf(debug, "%s attack power = %d\n",debug,10);
 				return 10;
 			}
 			*shot_code = STUCK_SHOT;
@@ -199,12 +199,12 @@ int LyubuStateMachine::AttackEnemy(float enemyPos[3], SHOT_CODE *shot_code){
 		}
 	}else if (this->currentAttackIndex <= 2){
 		if (cosine >= 0.0){
-			sprintf(debug, "%s attack power = %d\n",debug,2);
+			//sprintf(debug, "%s attack power = %d\n",debug,2);
 			return 2;
 		}
 	}else if (this->currentAttackIndex <= 3){
 		if (cosine >= -1.0){
-			sprintf(debug, "%s attack power = %d\n",debug,2);
+			//sprintf(debug, "%s attack power = %d\n",debug,2);
 			return 3;
 		}
 	}

Main.cpp

@@ -528,6 +528,7 @@ void Render(int skip){
 	vp.Render(cID, TRUE, TRUE);
 	PlayAction(skip);
 	GetPosDetail(loopBuff);
+	debug[0] = '\0';
 	debug_message(debug,loopBuff);
 	FnWorld gw;
 	gw.Object(gID);