Diff: Map/Objectif/objectif.cpp

Revision:

76:a862cb10559c

Parent:

75:195dd2bb13a3

diff -r 195dd2bb13a3 -r a862cb10559c Map/Objectif/objectif.cpp
--- a/Map/Objectif/objectif.cpp	Thu May 05 04:36:59 2016 +0000
+++ b/Map/Objectif/objectif.cpp	Thu May 05 06:34:13 2016 +0000
@@ -1,46 +1,33 @@
 #include "objectif.h"
 
-/* Dernier Changement : Romain 0h20 */
+/* Dernier Changement : Romain 20h20 */
 
-objectif::objectif (int ntype, float nx_obj, float ny_obj, float nthet_obj, Odometry * nCodo, AX12 * np, ControlleurPince * npince, float arr) {
+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;
-	Codo = nCodo;
-	marche_arriere = arr;
 }
 
 bool objectif::Action () {
 	switch(type) {
-		case OBJ_BLOC_PRISE:
+		case OBJ_BLOC:
 			return obj_bloc_action();
-		case OBJ_BLOC_LACHE:
-			return obj_para_lache_action();
+			break;
 		case OBJ_PARA:
 			return obj_para_action();
+			break;
 		default:
-			return true;
-	}
-
-	if (marche_arriere != 0) {
-		Codo->GotoDist(-marche_arriere);
+			break;
 	}
 }
 
 bool objectif::obj_bloc_action () {
-	front_Sharp_activated = false;
 	return true;
 }
 
 bool objectif::obj_para_action() {
 	return true;
-}
-
-bool objectif::obj_para_lache_action() {
-	Codo->GotoDist(-80);
-	front_Sharp_activated = true;
-	return true;
 }
\ No newline at end of file