icfp/icfp11
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of gitosis@stbuehler.de:icfp11

Browse Source 
Conflicts:

	src/control.h
This commit is contained in:
Stefan Bühler 2008-07-12 11:03:38 +02:00
commit 2a5f92a16c
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/path.c
View File

@ -26,7 +26,7 @@ path *path_new(map* m,vehicle *v){
/* Calculate a trivial path to the origin*/ /* Calculate a trivial path to the origin*/
/* Turn towards origin, take shorter direction*/ /* Turn towards origin, take shorter direction*/
angle = atan(v->y/v->x)*180/M_PI; angle = atan2(v->y,v->x)*180/M_PI;
stop = abs(angle - v->dir)/m->max_turn*1000; stop = abs(angle - v->dir)/m->max_turn*1000;
printf("Angle: %f stop: %f\n",angle,stop); printf("Angle: %f stop: %f\n",angle,stop);
if(angle - v->dir > 0){ if(angle - v->dir > 0){
@ -60,7 +60,6 @@ void path_execute(trial* t,path* p){
} }
now = getcurts(t); now = getcurts(t);
/*fprintf(stderr,"Now: %d TS: %d\n",now,clock());*/
/*magic number for latency, send messages that much earlier*/ /*magic number for latency, send messages that much earlier*/
while(tmp != NULL && now - 20 > tmp->ts){ while(tmp != NULL && now - 20 > tmp->ts){
tmp = (command*) g_queue_pop_head(p->commands); tmp = (command*) g_queue_pop_head(p->commands);