diff options
Diffstat (limited to 'clld.c')
| -rw-r--r-- | clld.c | 45 |
1 files changed, 22 insertions, 23 deletions
@@ -49,8 +49,8 @@ int main(int argc, char **argv) { }; struct colis { - unsigned int w; - unsigned int h; + int w; + int h; double xvel; double yvel; struct pos pos; @@ -74,11 +74,6 @@ int main(int argc, char **argv) { char *buf = NULL; size_t size; - /*getline(&buf, &size, stdin);*/ - /*if (postype == -1) - postype = atoi(strtok(buf, "\n"));*/ - - /*buf = NULL;*/ getline(&buf, &size, stdin); if (colltype == -1) @@ -230,9 +225,9 @@ int main(int argc, char **argv) { } if (!flt) { - cursor.gnded = (cursor.b2 == floor.b1 && cursor.yvel == 0) ? 1 : 0; - cursor.clx = ((cursor.a2 >= floor.a1 && cursor.a1 <= floor.a2) && (cursor.b1+(cursor.h/2) >= floor.b1 && cursor.b2-(cursor.h/2) <= floor.b2)) ? 1 : 0; - cursor.cly = ((cursor.b2 >= floor.b1 && cursor.b1 <= floor.b2) && (cursor.a1+(cursor.w/2) >= floor.a1 && cursor.a2-(cursor.w/2) <= floor.a2)) ? 1 : 0; + cursor.gnded = (cursor.b2 == floor.b1-(int)cursor.yvel+1) ? 1 : 0; + cursor.clx = ((cursor.a2 > floor.a1-(int)cursor.xvel-1 && cursor.b2 > floor.b1) && (cursor.a1 < (floor.a2-(int)cursor.xvel+1) && cursor.b1 < floor.b2)) ? 1 : 0; + cursor.cly = ((cursor.b2 > floor.b1-(int)cursor.yvel-1 && cursor.a2 > floor.a1) && (cursor.b1 < (floor.b2-(int)cursor.yvel+1) && cursor.a1 < floor.a2)) ? 1 : 0; } else { cursor.gnded = (cursor.d2 == floor.d1) ? 1 : 0; cursor.clx = ((cursor.c2 >= floor.c1 && cursor.c1 <= floor.c2) && (cursor.d1+(cursor.h/2) >= floor.b1 && cursor.d1 <= floor.d2)) ? 1 : 0; @@ -245,25 +240,29 @@ int main(int argc, char **argv) { if (verbose >= 1) printf("cursor.pos.x: %i\ncursor.w: %u, cursor.h: %u\nfloor.pos.x: %i\nfloor.w: %u, floor.h: %u\n", cursor.pos.x, cursor.w, cursor.h, floor.pos.x, floor.w, floor.h); if(!flt) { - if (cursor.clx && cursor.xvel != 0) { - if (cursor.a2 >= floor.a1 && cursor.a2 < floor.a2 && cursor.xvel > 0) - cursor.pos.x = floor.pos.x-cursor.w; - else if (cursor.a1 <= floor.a2 && cursor.a1 > floor.a1 && cursor.xvel < 0) - cursor.pos.x = floor.pos.x+floor.w; - } else if (cursor.cly && cursor.yvel !=0) { - if (cursor.b2 >= floor.b1 && cursor.b2 < floor.b2 && cursor.yvel > 0) - cursor.pos.y = floor.pos.y-cursor.h; - else if (cursor.b1 <= floor.b2 && cursor.b1 > floor.b1 && cursor.yvel < 0) - cursor.pos.y = floor.pos.y+floor.h; + if (cursor.clx) { + if (cursor.a2 > floor.a1-(int)cursor.xvel-1 && cursor.xvel > 0) + cursor.pos.x = (floor.pos.x-(int)cursor.xvel)-cursor.w-1; + else if (cursor.a1 < floor.a2-(int)cursor.xvel+1 && cursor.xvel < 0) + cursor.pos.x = (floor.pos.x+floor.w)-(int)cursor.xvel+1; + cursor.xvel = 0; + } + if (cursor.cly) { + if (cursor.b2 > floor.b1-(int)cursor.yvel-1 && cursor.yvel > 0) + cursor.pos.y = (floor.pos.y-(int)cursor.yvel)-cursor.h-1; + else if (cursor.b1 < floor.b2-(int)cursor.yvel+1 && cursor.yvel < 0) + cursor.pos.y = (floor.pos.y+floor.h)-(int)cursor.yvel+1; + cursor.yvel = 0; } - if ((cursor.clx && cursor.xvel == 0) && (cursor.cly && cursor.yvel == 0)) - cursor.pos.y = floor.pos.y-cursor.h; + + if (verbose >= 1) { printf("cursor.gnded: %u\nclx: %u, cly: %u\n", cursor.gnded, cursor.clx, cursor.cly); printf("x: %i, y: %i\n", cursor.pos.x, cursor.pos.y); printf("floor.x: %i, floor.y: %i\n", floor.pos.x, floor.pos.y); } - printf("%u, %u\n%u\n%i, %i\n%07.06f, %07.06f\n", cursor.clx, cursor.cly, cursor.gnded, cursor.pos.x, cursor.pos.y, cursor.xvel, cursor.yvel); + printf ("r: %i\n", (floor.pos.x+floor.w)-(int)cursor.xvel+1); + printf("%u, %u\n%u\n%i %i\n%07.06f, %07.06f\n", cursor.clx, cursor.cly, cursor.gnded, cursor.pos.x, cursor.pos.y, cursor.xvel, cursor.yvel); } else { if (cursor.clx) { |