pipe-game

git clone git://bebou.netlib.re/pipe-game
Log | Files | Refs | README |

commit 492453c2f5ff7d0957f4ef1a1e1705fce875e4fa
parent 3a3f4eafb441a77348e78e7970102359efd9266f
Auteurice: Arthur Pons <arthur.pons@unistra.fr>
Date:   Wed, 29 Jan 2025 21:05:16 +0100

Renommage de nom de fonction temp

Aussi y'avait pas besoin de curline
Aussi on peut plus passer dans une pile vide en cliquant
Sauf que ça casse le drag and drop oups

Diffstat:
M
interface.c
 | 
14
+++++++-------

1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/interface.c b/interface.c
@@ -121,7 +121,7 @@ struct pile* moveselection(struct pile* p, struct pile** piles, char* direction,
 	return p;
 }
 
-struct pile* movetest(int curline, struct pile* p, struct pile** piles, bool* selection, int direction) {
+struct pile* movecardfrompiletopile(struct pile* p, struct pile** piles, bool* selection, int direction) {
 	struct pile *newcurmenu=p;
 	if(direction) {
 		newcurmenu=p->destleft;
@@ -130,7 +130,7 @@ struct pile* movetest(int curline, struct pile* p, struct pile** piles, bool* se
 	}
 	if(*selection) {
 		addcardtopile(p->cards[p->curline],newcurmenu,piles);
-		removecardofpile(curline,p,piles);
+		removecardofpile(p->curline,p,piles);
 	} else if ( newcurmenu->cardCount==0 ) {
 		newcurmenu=p;
 	}
@@ -335,11 +335,11 @@ int main(int argc, char **argv) {
 						break;
 					/* -> */
 					case 65514:
-						curmenu=movetest(curmenu->curline, curmenu, piles, &selection, 0);
+						curmenu=movecardfrompiletopile(curmenu, piles, &selection, 0);
 						break;
 					/* <- */
 					case 65515:
-						curmenu=movetest(curmenu->curline, curmenu, piles, &selection, 1);
+						curmenu=movecardfrompiletopile(curmenu, piles, &selection, 1);
 						break;
 					case 13:
 						selection=!selection;
@@ -380,7 +380,7 @@ int main(int argc, char **argv) {
 						for(int i=0;i<NB_PILES;i++) {
 							if(    piles[i]->begin.x < ev.x && ev.x < piles[i]->end.x \
 							    && piles[i]->begin.y < ev.y && ev.y < piles[i]->end.y ) {
-								curmenu=piles[i];
+								if(piles[i]->cardCount>0) { curmenu=piles[i]; }
 								if(ev.mod==TB_MOD_MOTION) {
 									selection=true;
 									if(ev.y>prevpos.y) {
@@ -390,9 +390,9 @@ int main(int argc, char **argv) {
 									}
 									if(curmenu!=prevcurmenu) {
 										if(ev.x<prevpos.x) {
-											curmenu=movetest(prevcurmenu->curline, prevcurmenu, piles, &selection, 1);
+											curmenu=movecardfrompiletopile(prevcurmenu, piles, &selection, 1);
 										} else if (ev.x>prevpos.x) {
-											curmenu=movetest(prevcurmenu->curline, prevcurmenu, piles, &selection, 0);
+											curmenu=movecardfrompiletopile(prevcurmenu, piles, &selection, 0);
 										}
 									}
 								} else {