|
@@ -91,11 +91,8 @@ void game() {
|
|
ball.x = MAX(MIN(ball.x + ball.vel_x * TICK,COLS - 1),0);
|
|
ball.x = MAX(MIN(ball.x + ball.vel_x * TICK,COLS - 1),0);
|
|
|
|
|
|
// check for left border
|
|
// check for left border
|
|
- if (ball.x <= 1){
|
|
|
|
- printf("ballx: %f, ball y: %f\n",ball.x,ball.y);
|
|
|
|
- printf("left_paddlex: %f\n",left_paddle.y);
|
|
|
|
- if (round(ball.y) >= round(left_paddle.y) && round(ball.y) <= (round(left_paddle.y) + left_paddle.length -1)){
|
|
|
|
- ball.vel_x = - ball.vel_x;
|
|
|
|
|
|
+ if (ball.y >= left_paddle.y && ball.y <= (left_paddle.y + left_paddle.length - 1.0f)) {
|
|
|
|
+ ball.vel_x = -ball.vel_x;
|
|
} else {
|
|
} else {
|
|
printf("ballx: %f, ball y: %f\n",ball.x,ball.y);
|
|
printf("ballx: %f, ball y: %f\n",ball.x,ball.y);
|
|
printf("right player lost\n");
|
|
printf("right player lost\n");
|
|
@@ -103,9 +100,8 @@ void game() {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// check for right border
|
|
// check for right border
|
|
- if (ball.x >= COLS - 2){
|
|
|
|
- if (round(ball.y) >= round(right_paddle.y) && round(ball.y) <= (round(right_paddle.y) + right_paddle.length -1)){
|
|
|
|
- ball.vel_x = - ball.vel_x;
|
|
|
|
|
|
+ if (ball.y >= right_paddle.y && ball.y <= (right_paddle.y + right_paddle.length - 1.0f)) {
|
|
|
|
+ ball.vel_x = -ball.vel_x;
|
|
} else {
|
|
} else {
|
|
printf("ballx: %f, ball y: %f\n",ball.x,ball.y);
|
|
printf("ballx: %f, ball y: %f\n",ball.x,ball.y);
|
|
printf("left player lost\n");
|
|
printf("left player lost\n");
|
|
@@ -127,14 +123,13 @@ void game() {
|
|
// draw new positions on screen
|
|
// draw new positions on screen
|
|
reset_screen();
|
|
reset_screen();
|
|
|
|
|
|
- for (i=0;i<left_paddle.length;i++) {
|
|
|
|
- set_pixel( 0, round(left_paddle.y) + i);
|
|
|
|
|
|
+ for (i=0; i<left_paddle.length; i++) {
|
|
|
|
+ set_pixel( 0, floor(left_paddle.y) + i);
|
|
}
|
|
}
|
|
- for (i=0;i<right_paddle.length;i++) {
|
|
|
|
- set_pixel(COLS - 1, round(right_paddle.y) + i);
|
|
|
|
|
|
+ for (i=0; i<right_paddle.length; i++) {
|
|
|
|
+ set_pixel(COLS - 1, floor(right_paddle.y) + i);
|
|
}
|
|
}
|
|
- set_pixel(round(ball.x),round(ball.y));
|
|
|
|
- for (k=0;k<1000;k++){}
|
|
|
|
|
|
+ set_pixel(floor(ball.x), floor(ball.y));
|
|
|
|
|
|
draw();
|
|
draw();
|
|
}
|
|
}
|