pipe-game

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

commit a772013d0dfebfd95c991f1dad0ddd11c93a7f4a
parent 03457c0cac1d4230ce0cf19e54da36ba7459cf51
Auteurice: Arthur Pons <arthur.pons@unistra.fr>
Date:   Tue, 21 Jan 2025 12:01:21 +0100

Retrait des variables h et p

C'était plus confus qu'autre chose d'avoir parfoir hand et parfois h
Maintenant on a que hand et quand on veut le modifier via une fonction
ou le &hand

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

1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/interface.c b/interface.c
@@ -153,9 +153,9 @@ int main(int argc, char **argv) {
 	char cmd[2000];
 	cmd[0]='\0';
 
-	pile hand=file2pile(fp); pile *h=&hand;
+	pile hand=file2pile(fp);
 	hand.curline=0;
-	pile played; pile *p=&played;
+	pile played;
 	played.cards=malloc(LIST_SIZE);
 	played.cardCount=0;
 	played.curline=0;
@@ -170,31 +170,31 @@ int main(int argc, char **argv) {
 		updatecmd(cmd, played);
 		updateres(res, cmd, fp2);
 		updateinterncmd(intern, played);
-		display(h,p,hand.curline,played.curline,curmenu,selection,cmd,res,intern);
+		display(&hand,&played,hand.curline,played.curline,curmenu,selection,cmd,res,intern);
 		tb_poll_event(&ev);
 		switch(ev.key) {
 			/* up */
 			case 65517:
 				if (curmenu=="hand") {
-					moveselection(h,"up",selection);
+					moveselection(&hand,"up",selection);
 				} else if (curmenu=="played") {
-					moveselection(p,"up",selection);
+					moveselection(&played,"up",selection);
 				}
 				break;
 			/* down */
 			case 65516:
 				if (curmenu=="hand") {
-					moveselection(h,"down",selection);
+					moveselection(&hand,"down",selection);
 				} else if (curmenu=="played") {
-					moveselection(p,"down",selection);
+					moveselection(&played,"down",selection);
 				}
 				break;
 			/* <- */
 			case 65515:
 				if (curmenu=="played") {
 					if (selection) {
-						addcardtopile(played.cards[played.curline],h);
-						removecardofpile(played.curline,p);
+						addcardtopile(played.cards[played.curline],&hand);
+						removecardofpile(played.curline,&played);
 						selection=!selection;
 					}
 					curmenu="hand";
@@ -204,8 +204,8 @@ int main(int argc, char **argv) {
 			case 65514:
 				if (curmenu=="hand") {
 					if (selection) {
-						addcardtopile(hand.cards[hand.curline],p);
-						removecardofpile(hand.curline,h);
+						addcardtopile(hand.cards[hand.curline],&played);
+						removecardofpile(hand.curline,&hand);
 					}
 					curmenu="played";
 				}