pipe-game

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

commit f3256edc0bcfe863732e4743113a14049ce6477e
parent 8936b2e100d3f01d4be3d53716ca6bc87fcf6483
Auteurice: Arthur Pons <arthur.pons@unistra.fr>
Date:   Thu, 30 Jan 2025 22:07:15 +0100

Réorg des cases de texte en dessous

Aussi nblines retourne +1 comme ça pas besoin d'ajouter une ligne en
plus à la fin des cartes sources

Diffstat:
M
cards/sources/all-in
 | 
1
-
M
cards/sources/defend
 | 
1
-
M
cards/sources/strike
 | 
1
-
M
interface.c
 | 
26
+++++++++++++-------------

4 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/cards/sources/all-in b/cards/sources/all-in
@@ -1,3 +1,2 @@
 attack 20
 health -10
-
diff --git a/cards/sources/defend b/cards/sources/defend
@@ -1,2 +1 @@
 defend 5
-
diff --git a/cards/sources/strike b/cards/sources/strike
@@ -1,2 +1 @@
 attack 6
-
diff --git a/interface.c b/interface.c
@@ -37,7 +37,7 @@ int nblines(char *str) {
 	int l=0;
 	for (int i = 0; str[i] != '\0'; i++)
 		if (str[i]=='\n') l++;
-	return l;
+	return l+1;
 }
 
 int hr(int coloffset, int lineoffset, int length, bool selected) {
@@ -221,7 +221,7 @@ coord displaypile(struct pile *p, struct pile *curmenu, int coloffset, int lineo
 }
 
 coord displaytextblock(char *text, int coloffset, int lineoffset) {
-	coord p; int nbl=nblines(text), w=30;
+	coord p; int nbl=nblines(text), w=CARD_NAME_SIZE+2;
 	p.y=nbl+lineoffset; p.x=w+coloffset;
 	displaybox(NULL,coloffset,lineoffset,w,nbl,false);
 	coloffset++; lineoffset++;
@@ -255,21 +255,21 @@ int display(struct pile** piles, struct pile *curmenu, bool selection, char* cmd
 	coord p6=displaypile(piles[PLAYEDENNEMYARGS], curmenu, p5.x, 0, selection);
 	int m=max(max(p2.y,p4.y),p5.y);
 
-	p=displaytextblock(res,0,m+2);
-	p=displaytextblock(intern,0,p.y);
-	p=displaytextblock(cmd,0,p.y);
-
-	coord p7=displaytextblock(resennemy,p3.x,m+2);
-	p=displaytextblock(internennemy,p3.x,p7.y);
-	p=displaytextblock(cmdennemy,p3.x,p.y);
+	p=displaytextblock(res,CARD_NAME_SIZE/2,m+2);
+	p=displaytextblock(intern,CARD_NAME_SIZE/2,p.y);
+	p=displaytextblock(cmd,CARD_NAME_SIZE/2,p.y);
 
 	p=displaytextblock("\
 * enter to select card\n\
 * arrows to move selection\n\
-* m to create arg (if no whitespace)\n\
-* e to end turn and output res\n",0,p.y);
+* m to create arg \n\
+* e to end turn\n",p2.x+1,m+2);
+
+	coord p7=displaytextblock(resennemy,p3.x+CARD_NAME_SIZE/2,m+2);
+	p=displaytextblock(internennemy,p3.x+CARD_NAME_SIZE/2,p7.y);
+	p=displaytextblock(cmdennemy,p3.x+CARD_NAME_SIZE/2,p.y);
 
-	return p.y+1;
+	return p.y+4;
 }
 
 
@@ -323,7 +323,7 @@ int main(int argc, char **argv) {
 		updateinterncmd(internennemy, playedennemy);
 
 		int l=display(piles,curmenu,selection,cmd,res,intern,cmdennemy,resennemy,internennemy);
-		debug(l,*curmenu,ev);
+		debug(l++,*curmenu,ev);
 		tb_present();
 		tb_poll_event(&ev);
 		switch(ev.type) {