EmaMaker
/
SPQR-Team1-2020
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

status vector now working better. Still have to fix something

code_midgen
EmaMaker 2020-02-12 21:44:30 +01:00
parent 73981ad784
commit be2bff433d
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/goalie.cpp
View File

@ -37,19 +37,11 @@ void Goalie::goalie(int plusang) {
else dir = dir; else dir = dir;
storcimentoPorta(); storcimentoPorta();
<<<<<<< HEAD
if(ball->distance > 200 && (ball->angle > 340 || ball->angle < 20)) drive->prepareDrive(dir, 350, cstorc); if(ball->distance > 200 && (ball->angle > 340 || ball->angle < 20)) drive->prepareDrive(dir, 350, cstorc);
else { else {
drive->prepareDrive(dir, 350, 0); drive->prepareDrive(dir, 350, 0);
cstorc = 0; cstorc = 0;
} }
=======
//if(ball->distance > 200 && (ball->angle > 340 || ball->angle < 20)) drive->prepareDrive(ball->dir, 350, cstorc);
//else {
drive->prepareDrive(ball->dir, 350, 0);
// cstorc = 0;
//}
>>>>>>> 5a9ce6692fe1b3165fa36a1f5a11c729c8818dd4
} }
} }