diff --git a/SDL#4/err.log b/SDL#4/err.log index 56f111f..ed2c253 100644 --- a/SDL#4/err.log +++ b/SDL#4/err.log @@ -165,151 +165,6 @@ Grass collided with Mario from bottom Grass collided with Mario from bottom Grass collided with Mario from bottom Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from right -bottom -Grass collided with Mario from right -bottom -Grass collided with Mario from right -bottom -Grass collided with Mario from right -bottom -Grass collided with Mario from right -bottom -Grass collided with Mario from right -bottom -Grass collided with Mario from right -bottom -Grass collided with Mario from right -bottom -Grass collided with Mario from right -bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom Grass collided with Mario from right bottom Grass collided with Mario from right @@ -341,26 +196,24 @@ Grass collided with Mario from bottom Grass collided with Mario from bottom Grass collided with Mario from bottom Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom +Grass collided with Mario from right +bottom +Grass collided with Mario from right +bottom +Grass collided with Mario from right +bottom +Grass collided with Mario from right +bottom +Grass collided with Mario from right +bottom +Grass collided with Mario from right +bottom +Grass collided with Mario from right +bottom +Grass collided with Mario from right +bottom +Grass collided with Mario from right +bottom Grass collided with Mario from bottom Grass collided with Mario from bottom Grass collided with Mario from bottom @@ -430,6 +283,41 @@ Grass collided with Mario from bottom Grass collided with Mario from bottom Grass collided with Mario from bottom Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom +Grass collided with Mario from bottom Grass collided with Mario from right bottom Grass collided with Mario from right @@ -461,255 +349,24 @@ Grass collided with Mario from bottom Grass collided with Mario from bottom Grass collided with Mario from bottom Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom +Grass collided with Mario from right +bottom +Grass collided with Mario from right +bottom +Grass collided with Mario from right +bottom +Grass collided with Mario from right +bottom +Grass collided with Mario from right +bottom +Grass collided with Mario from right +bottom +Grass collided with Mario from right +bottom +Grass collided with Mario from right +bottom +Grass collided with Mario from right +bottom Grass collided with Mario from bottom Grass collided with Mario from bottom Grass collided with Mario from bottom @@ -745,25 +402,6 @@ Grass collided with Mario from bottom Grass collided with Mario from bottom Grass collided with Mario from bottom Grass collided with Mario from left -bottom -Grass collided with Mario from left -bottom -Grass collided with Mario from left -bottom -Grass collided with Mario from left -bottom -Grass collided with Mario from left -bottom -Grass collided with Mario from left -bottom -Grass collided with Mario from left -bottom -Grass collided with Mario from left -bottom -Grass collided with Mario from left -bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom Grass collided with Mario from left bottom Grass collided with Mario from left @@ -784,144 +422,19 @@ Grass collided with Mario from left bottom Grass collided with Mario from left bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -green-shell collided with Mario from left -green-shell collided with Mario from left -green-shell collided with Mario from left -green-shell collided with Mario from left -green-shell collided with Mario from left -Grass collided with Mario from bottom -green-shell collided with Mario from left -green-shell collided with Mario from left -green-shell collided with Mario from left -green-shell collided with Mario from left -green-shell collided with Mario from left -green-shell collided with Mario from left -green-shell collided with Mario from left -green-shell collided with Mario from left -Grass collided with Mario from bottom -green-shell collided with Mario from left -Grass collided with Mario from bottom -green-shell collided with Mario from left -Grass collided with Mario from bottom -Grass collided with Mario from bottom -green-shell collided with Mario from left -bottom -Grass collided with Mario from left -bottom -Grass collided with Mario from left -bottom -Grass collided with Mario from left -bottom -Grass collided with Mario from left -bottom -Grass collided with Mario from left -bottom -Grass collided with Mario from left -bottom -Grass collided with Mario from left -bottom -Grass collided with Mario from left -bottom -Grass collided with Mario from left -bottom -Grass collided with Mario from left -bottom -Grass collided with Mario from bottom -Grass collided with Mario from left -bottom -Grass collided with Mario from left -bottom -Grass collided with Mario from left -bottom -Grass collided with Mario from left -bottom -Grass collided with Mario from left -bottom -Grass collided with Mario from left -bottom -Grass collided with Mario from left -bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom -Grass collided with Mario from bottom +mario collide with WINDOW +mario collide with WINDOW +mario collide with WINDOW +mario collide with WINDOW +mario collide with WINDOW +mario collide with WINDOW +mario collide with WINDOW +mario collide with WINDOW +mario collide with WINDOW +mario collide with WINDOW +mario collide with WINDOW +mario collide with WINDOW +mario collide with WINDOW mario collide with WINDOW mario collide with WINDOW mario collide with WINDOW diff --git a/SDL#4/exe b/SDL#4/exe index da49bfa..8e05e2e 100755 Binary files a/SDL#4/exe and b/SDL#4/exe differ diff --git a/SDL#4/main.o b/SDL#4/main.o index 53d1b5e..067c898 100644 Binary files a/SDL#4/main.o and b/SDL#4/main.o differ diff --git a/SDL#4/todo.md b/SDL#4/todo.md index 6eb3958..87fddfa 100644 --- a/SDL#4/todo.md +++ b/SDL#4/todo.md @@ -5,10 +5,10 @@ A FAIRE EN COURS ======== -- [ ] Erreur accrochage quand saut sur un coin FAIT ==== +- [x] Erreur accrochage quand saut sur un coin - [x] Game Over quand on tombe - [x] Gestion des briques cassables quand collision - [?] Liberation memoire car lag diff --git a/SDL#4/xMario/xMarioMario.cpp b/SDL#4/xMario/xMarioMario.cpp index f03cb89..ea6491a 100644 --- a/SDL#4/xMario/xMarioMario.cpp +++ b/SDL#4/xMario/xMarioMario.cpp @@ -57,12 +57,6 @@ void xMarioMario::moveFromVelocity(){ after = this->move(_velocity[0], _velocity[1]); - - if( _velocity[0] != after[2] ) - cout << "col. on X : " << _velocity[0] << endl; - if( _velocity[1] != after[3] ) - cout << "col. on Y : " << _velocity[1] << endl; - /* (2) On modifie la velocite en fonction des collisions */ _velocity[0] = (double) after[2]; _velocity[1] = (double) after[3]; @@ -81,7 +75,7 @@ void xMarioMario::moveFromVelocity(){ // Si touche haut if( _up ){ // Si au sol et premier saut ou autre saut (pour la hauteur) - if( this->onFloor() && _jumps == 0 || _jumps == 1 ){ + if( this->onFloor() || this->onWall() && _jumps == 0 || _jumps == 1 ){ this->velocity(0, -1); _jumps++; } @@ -186,6 +180,11 @@ bool xMarioMario::onFloor(){ } +bool xMarioMario::onWall(){ + return _manager->hit((xSprite*)this, 1, 0) || _manager->hit((xSprite*)this, -1, 0); +} + + diff --git a/SDL#4/xMario/xMarioMario.h b/SDL#4/xMario/xMarioMario.h index 3e0bbf2..0c71ec4 100644 --- a/SDL#4/xMario/xMarioMario.h +++ b/SDL#4/xMario/xMarioMario.h @@ -26,6 +26,7 @@ // GETTER double velocity(bool way=XMARIO_VEL_HOR); // Recupere velocite bool onFloor(); // Si mario est sur le sol + bool onWall(); // Si mario est contre un mur // SETTER void velocity(double x=0.0, double y=0.0); // Modification de velocite diff --git a/SDL#4/xSDL/xSprite.cpp b/SDL#4/xSDL/xSprite.cpp index 8d4b6b8..db2c7bc 100644 --- a/SDL#4/xSDL/xSprite.cpp +++ b/SDL#4/xSDL/xSprite.cpp @@ -184,7 +184,7 @@ vector xSprite::move(int x, int y){ /* (1) Variables utiles */ int incrx = x; int incry = y; - bool moveFasterOnX = abs(x) >= abs(y); + bool moveFasterOnY = abs(x) <= abs(y); int signofx = (x==0) ? 0 : x / abs(x); int signofy = (y==0) ? 0 : y / abs(y); @@ -213,7 +213,7 @@ vector xSprite::move(int x, int y){ /* (4) Sinon, on decremente les deplacements 'alternativement' */ - if( moveFasterOnX ){ // Si on a plus de mouvement horizontal + if( moveFasterOnY ){ // Si on a plus de mouvement horizontal if( signofx != 0 && incrx != 0 ) // si la vel. sur x n'est pas nulle incrx -= signofx; // on diminue la vel. sur x else if( signofy != 0 && incry != 0 ) // sinon si vel. sur y n'est pas nulle