add damage guard sound fx

unknown · unknown · commit ecf6822c5e94 · 2012-01-08T12:21:34.000+08:00
diff --git a/ActorStateMachine.cpp b/ActorStateMachine.cpp
@@ -2,6 +2,9 @@
 
 extern char debug[1024];
 extern SCENEid sID;
+//extern WORLDid gID;
+extern AUDIOid audioG;
+extern AUDIOid audioD;
 using namespace std;
 #define MOVE_LENGTH 20.0
 
@@ -15,6 +18,12 @@ ActorStateMachine::~ActorStateMachine(void)
 	FnScene scene;
 	scene.Object(sID);
 	scene.DeleteObject(this->bloodID);
+	/*
+	FnWorld gw;
+	gw.Object(gID);
+	gw.DeleteAudio(audioG);
+	gw.DeleteAudio(audioD);
+	*/
 }
 
 ActorStateMachine::ActorStateMachine(ACTORid character, char * ActionFilename){
@@ -27,6 +36,25 @@ ActorStateMachine::ActorStateMachine(ACTORid character, char * ActionFilename){
 	this->effectiveAttack = FALSE;
 	this->initActionIDMap(ActionFilename);
 	this->initLife();
+	/*
+	FnWorld gw;
+	gw.Object(gID);
+	gw.SetAudioPath("Data\\Audio");
+	audioG = gw.CreateAudio();
+	FnAudio audio;
+	audio.Object(audioG);
+	BOOL beA = audio.Load("guard");   // au_bullet.hit1.wav
+	if (beA == FALSE){
+		sprintf(debug, "%s guard load failed\n", debug);
+	}
+
+	audioD = gw.CreateAudio();
+	audio.Object(audioD);
+	beA = audio.Load("damage");   // au_bullet.hit1.wav
+	if (beA == FALSE){
+		sprintf(debug, "%s damage load failed\n", debug);
+	}
+	*/
 }
 
 BOOL ActorStateMachine::initLife(){
@@ -360,6 +388,16 @@ int ActorStateMachine::AttackEnemy(float enemyPos[3], BOOL *beOutShot){
 }
 
 void ActorStateMachine::TakeDamage(float damage, BOOL beShot, float *attackerPos ){
+	if (this->state == STATEGUARD){
+		FnAudio audio;
+		audio.Object(audioG);
+		audio.Play(ONCE);
+		return;
+	}else{
+		FnAudio audio;
+		audio.Object(audioD);
+		audio.Play(ONCE);
+	}
 	FnActor actor;
 	actor.Object(character);
 	float pos[3];
@@ -372,9 +410,7 @@ void ActorStateMachine::TakeDamage(float damage, BOOL beShot, float *attackerPos
 		newDir[1] = attackerPos[1] - pos[1];
 		newDir[2] = 0.0f;
 		actor.SetWorldDirection(newDir,NULL);
-		//if (beShot == TRUE){
-			actor.MoveForward(-OUTSHOT_DIS,TRUE, FALSE, 0.0, TRUE);
-		//}
+		actor.MoveForward(-OUTSHOT_DIS,TRUE, FALSE, 0.0, TRUE);
 		actor.SetWorldDirection(dir,NULL);
 	}
 	this->life -= damage;
diff --git a/ActorStateMachine.h b/ActorStateMachine.h
@@ -23,6 +23,11 @@ typedef int ATTACK_CODE;
 #define MAX_LIFE 1000.0
 #define ROBOT_ATTACKRANGE 18000.0
 
+#define STUCK_SHOT 0
+#define SMALL_SHOT 1
+#define BIG_SHOT 2
+typedef int SHOT_CODE;
+
 // actor free meaning it can do anything by the controller.
 // actor stay meaning that it can't be move beacuse of being attacked.
 
@@ -39,6 +44,8 @@ class ActorStateMachine
 	int lastAttackIndex;
 	BOOL attackDisable;
 	BOOL startAttack;
+	//AUDIOid audioG;//guard
+	//AUDIOid audioD;//damage
 	int life;
 	BOOL initActionIDMap(char *ActionFilename);
 	std::map<std::string, ACTIONid> ActionIDMap;
diff --git a/Main.cpp b/Main.cpp
@@ -36,6 +36,8 @@ AIControl *npc;
 BattleRoom *bRoom;
 LyubuStateMachine * lyubuState;
 AUDIOid audioBG;
+AUDIOid audioG;//guard
+AUDIOid audioD;//damage
 eF3DFX *fx00 = NULL;
 
 char debug[1024] = "\0";
@@ -370,9 +372,22 @@ BOOL initFX(){
 	audioBG = gw.CreateAudio();
 	FnAudio audio;
 	audio.Object(audioBG);
-	BOOL beA = audio.Load("dmc4");
-	audio.Play(ONCE);
+	BOOL beA = audio.Load("battle");
+	audio.Play(LOOP);
+
+	audioD = gw.CreateAudio();
+	audio.Object(audioD);
+	beA = audio.Load("damage");
+	if (beA == FALSE){
+		sprintf(debug, "%s damage load failed\n", debug);
+	}
 
+	audioG = gw.CreateAudio();
+	audio.Object(audioG);
+	beA = audio.Load("guard");
+	if (beA == FALSE){
+		sprintf(debug, "%s guard load failed\n", debug);
+	}
 	return TRUE;
 }
 
@@ -387,6 +402,11 @@ void Reset(WORLDid gID, BYTE code, BOOL value){
 			for (i = 0; i < robbers_count; i++) {
 				scene.DeleteActor(robbers[i]);
 			}
+			FnWorld gw;
+			gw.Object(gID);
+			gw.DeleteAudio(audioG);
+			gw.DeleteAudio(audioD);
+			gw.DeleteAudio(audioBG);
 			debug[0] = '\0';
 			ActorStateMachine * lyubuState = kc->mainChar;
 			delete lyubuState;
