diff --git a/travail_de_groupe/chef_oeuvre/run b/travail_de_groupe/chef_oeuvre/run deleted file mode 100755 index 3bb2ed337ecc9cde061fc610fb98d62205011a36..0000000000000000000000000000000000000000 Binary files a/travail_de_groupe/chef_oeuvre/run and /dev/null differ diff --git a/travail_de_groupe/chef_oeuvre/src/player.c b/travail_de_groupe/chef_oeuvre/src/player.c index 92e4f572490653856233d111a7ee48c3781139b5..5520d17f0427599161664f2b9d78ee4317330de5 100644 --- a/travail_de_groupe/chef_oeuvre/src/player.c +++ b/travail_de_groupe/chef_oeuvre/src/player.c @@ -126,9 +126,8 @@ void manageMovement(){ int selectStateHover(){ int stateHover = 0; - int distance = sqrt(pow(abs(mousePosition.x-player.x), 2)+pow(abs(mousePosition.y-player.y), 2)); - printf("distance : %d\n", distance); - if(distance <= 2){ + int distance = sqrt(pow(abs(mousePosition.x - player.x/CELLSIZE), 2)+pow(abs(mousePosition.y - player.y/CELLSIZE), 2)); + if(distance <= 1){ stateHover = 1; } return stateHover; diff --git a/travail_de_groupe/chef_oeuvre/src/render.c b/travail_de_groupe/chef_oeuvre/src/render.c index 0f1adc2be3369f5aa754b479c86a055ec4616a96..21fafd8e148ecbc4a7726d1c5f6da3afc13a3f31 100644 --- a/travail_de_groupe/chef_oeuvre/src/render.c +++ b/travail_de_groupe/chef_oeuvre/src/render.c @@ -17,6 +17,9 @@ SDL_Texture * treeTexture; SDL_Surface * hoverSurface; SDL_Texture * hoverTexture; +SDL_Surface * noHoverSurface; +SDL_Texture * noHoverTexture; + SDL_Surface * playerSurface; SDL_Texture * playerTexture; @@ -109,7 +112,12 @@ void drawMap(){ SDL_RenderCopy(renderer, treeTexture, NULL, &rect); } if (mousePosition.x == j && mousePosition.y == i){ - SDL_RenderCopy(renderer, hoverTexture, NULL, &rect); + if (selectStateHover()){ + SDL_RenderCopy(renderer, hoverTexture, NULL, &rect); + } + else { + SDL_RenderCopy(renderer, noHoverTexture, NULL, &rect); + } } rect.x += CELLSIZE; } @@ -154,6 +162,9 @@ void mainLoop(){ hoverSurface = IMG_Load("Res/hover.png"); hoverTexture = SDL_CreateTextureFromSurface(renderer, hoverSurface); + noHoverSurface = IMG_Load("Res/noHover.png"); + noHoverTexture = SDL_CreateTextureFromSurface(renderer, noHoverSurface); + playerSurface = IMG_Load("Res/character_spritesheet.png"); playerTexture = SDL_CreateTextureFromSurface(renderer, playerSurface); @@ -177,6 +188,7 @@ void mainLoop(){ SDL_FreeSurface(playButtonSurface); SDL_FreeSurface(playButtonHoverSurface); SDL_FreeSurface(backgroundSidesSurface); + SDL_FreeSurface(noHoverSurface); unsigned int a = SDL_GetTicks(); unsigned int b = SDL_GetTicks();