Diff: Map/Objectif/objectif.cpp

Revision:

60:8d2320a54a32

Parent:

57:86f491f5b25d

Child:

62:80a81e4ad9f8

--- a/Map/Objectif/objectif.cpp	Wed May 04 21:04:50 2016 +0200
+++ b/Map/Objectif/objectif.cpp	Wed May 04 23:35:03 2016 +0200
@@ -2,13 +2,31 @@
 
 /* Dernier Changement : Romain 20h20 */
 
-Objectif::Objectif (int type, float x_obj, float y_obj, float thet_obj, AX12 * nA1, AX12 * nA2, AX12 * nA3, Stepper * nS1, Stepper * nS2);
+objectif::objectif (int ntype, float nx_obj, float ny_obj, float nthet_obj, AX12 * np, ControlleurPince * npince) {
+	Parasol = np;
+	pince = npince;
+	type = ntype;
+	x_objectif = nx_obj;
+	y_objectif = ny_obj;
+	thet_objectif = nthet_obj;
+}
 bool Objectif::Action () {
 	switch(type) {
 		case OBJ_BLOC:
-		break;
+			return obj_bloc_action();
+			break;
+		case OBJ_PARA:
+			return obj_para_action();
+			break;
 		default:
-		break;
+			break;
 	}
+}
+
+bool Objectif::obj_bloc_action () {
+	return true;
+}
+
+bool Objectif::obj_para_action(); () {
 	return true;
 }
\ No newline at end of file