From ae04add7889aa1041a5e098e0daffc3333f95983 Mon Sep 17 00:00:00 2001 From: James Bunton Date: Wed, 7 Nov 2007 20:32:50 +1100 Subject: [PATCH] Fixed fmax for all systems --- pong.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pong.c b/pong.c index 8cf082b..2931d5a 100644 --- a/pong.c +++ b/pong.c @@ -38,7 +38,7 @@ static GLdouble ballVecX = 0.0; static GLdouble ballVecY = 0.0; -static inline double fmax(double a, double b) { +static inline double myfmax(double a, double b) { return a > b ? a : b; } @@ -78,14 +78,14 @@ static void run(void) { // Check for collisions with paddles if(ballVecX < 0 && ballX <= -HEIGHT + -ballVecX * 1.5) { if(ballY >= paddle1 - PADDLESIZE && ballY <= paddle1 + PADDLESIZE) { - GLdouble speedChange = fmax(1.0, fabs(paddle1 - ballY) * SPEEDBINC); + GLdouble speedChange = myfmax(1.0, fabs(paddle1 - ballY) * SPEEDBINC); ballVecX *= -speedChange * SPEEDXINC; ballVecY *= speedChange * SPEEDYINC; } } if(ballVecX > 0 && ballX >= HEIGHT - ballVecX * 1.5) { if(ballY >= paddle2 - PADDLESIZE && ballY <= paddle2 + PADDLESIZE) { - GLdouble speedChange = fmax(1.0, fabs(paddle2 - ballY) * SPEEDBINC); + GLdouble speedChange = myfmax(1.0, fabs(paddle2 - ballY) * SPEEDBINC); ballVecX *= -speedChange * SPEEDXINC; ballVecY *= speedChange * SPEEDYINC; } -- 2.39.2