Skip to content

Commit b3b99f9

Browse files
committed
Letter D added to starwar
2 parents 89c9b20 + f71ae0a commit b3b99f9

File tree

7 files changed

+147
-93
lines changed

7 files changed

+147
-93
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@ jobs:
1515
with:
1616
readme_path: readme.md
1717
image_size: 70
18+
use_username: true
19+
columns_per_row: 7

Fonts/Straight/straight.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -507,17 +507,18 @@ char **Z()
507507
508508
*/
509509

510-
/*
510+
511511
char **p()
512512
{
513513
char **character = getCharGrid();
514514

515-
//Enter the character grid in ROWS X COLS
516-
515+
character[1][0]=character[2][0]='|';
516+
character[0][1]=character[1][1]='_';
517+
character[1][2]=')';
517518
return character;
518519
}
519520

520-
*/
521+
521522

522523
/*
523524
char **q()

Fonts/banner/banner.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -263,16 +263,16 @@ class Banner : public Fonts
263263
}
264264
*/
265265

266-
/*
266+
267267
char **W()
268268
{
269269
char **character = getCharGrid();
270270

271-
//Enter the character grid in ROWS X COLS
271+
character[0][0] = character[1][0] = character[2][0] = character[3][0] = character[4][0] = character[5][0] = character[0][6] = character[1][6] = character[2][6] = character[3][6] = character[4][6] = character[5][6] = character[1][3] = character[2][3] = character[3][3] = character[4][3] = character[5][3] = character[6][1] = character[6][2] = character[6][4] = character[6][5] = '#';
272272

273273
return character;
274274
}
275-
*/
275+
276276

277277
/*
278278
char **X()
@@ -285,27 +285,27 @@ class Banner : public Fonts
285285
}
286286
*/
287287

288-
/*
288+
289289
char **Y()
290290
{
291291
char **character = getCharGrid();
292292

293-
//Enter the character grid in ROWS X COLS
293+
character[3][3] = character[4][3] = character[5][3] = character[6][3] = character[0][0] = character[0][6] = character[1][1] = character[1][5] = character[2][2] = character[2][4] = '#';
294294

295295
return character;
296296
}
297-
*/
297+
298298

299-
/*
299+
300300
char **Z()
301301
{
302302
char **character = getCharGrid();
303303

304-
//Enter the character grid in ROWS X COLS
304+
character[0][0] = character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[0][6] = character[6][0] = character[6][1] = character[6][2] = character[6][3] = character[6][4] = character[6][5] = character[6][6] = character[0][3] = character[1][5] = character[2][4] = character[3][3] = character[4][2] = character[5][1] = '#';
305305

306306
return character;
307307
}
308-
*/
308+
309309

310310
// Lowercase
311311

Fonts/carlos/carlos.h

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -364,16 +364,50 @@ class Carlos : public Fonts
364364
}
365365
*/
366366

367-
/*
368-
char **S()
367+
char **S()
369368
{
370369
char **character = getCharGrid();
371370

372-
//Enter the character grid in ROWS X COL
371+
//Enter the character grid in ROWS X COL
372+
character[0][3] = '_';
373+
character[0][4] = '_';
374+
character[0][5] = '_';
375+
character[0][6] = '_';
376+
character[0][7] = ' ';
377+
character[1][1] = '/';
378+
character[1][3] = '_';
379+
character[1][4] = '_';
380+
character[1][5] = '_';
381+
character[1][6] = '_';
382+
character[1][7] = '\\';
383+
character[2][0] = '(';
384+
character[2][1] = ' ';
385+
character[2][2] = '(';
386+
character[2][3] = '_';
387+
character[2][4] = '_';
388+
character[2][5] = '_';
389+
character[3][1] = '\\';
390+
character[3][2] = '_';
391+
character[3][3] = '_';
392+
character[3][4] = '_';
393+
character[3][5] = '_';
394+
character[3][7] = '\\';
395+
character[4][6] = ')';
396+
character[4][8] = ')';
397+
character[5][4] = '_';
398+
character[5][3] = '_';
399+
character[5][2] = '_';
400+
character[5][5] = '/';
401+
character[5][7] = '/';
402+
character[6][1] = '/';
403+
character[6][2] = '_';
404+
character[6][3] = '_';
405+
character[6][4] = '_';
406+
character[6][5] = '_';
407+
character[6][6] = '/';
373408

374409
return character;
375410
}
376-
*/
377411

378412
/*
379413
char **T()

Fonts/starwar/starwar.h

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -273,16 +273,18 @@ class Starwar : public Fonts
273273
}
274274
*/
275275

276-
/*
277-
char **T()
276+
char **T()
278277
{
279278
char **character = getCharGrid();
280279

281280
//Enter the character grid in ROWS X COLS
282-
281+
character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[0][6] = character[0][7]= character[0][8]= character[0][9] = character[0][10] = character[0][11] = character[2][1] = character[2][2] = character[2][3] = character[2][8] = character[2][9] = character[2][10] = character[2][11] =character[5][5] =character[5][6] ='-';
282+
character[0][0] = character[0][12] = '.';
283+
character[2][0] = character[2][12] = '`';
284+
character[1][0] = character[1][12] = character[2][4] = character[2][7] = character[3][4] = character[3][7] = character[4][4] = character[4][7] = character[5][4] = character[5][7] = '|';
283285
return character;
284286
}
285-
*/
287+
286288

287289

288290
char **U()
@@ -700,17 +702,20 @@ class Starwar : public Fonts
700702

701703

702704

703-
/*
705+
706+
704707
char **two()
705708
{
706709
char **character = getCharGrid();
707-
708710
//Enter the character grid in ROWS X COLS
709-
711+
character[0][1] = character[0][2] = character[0][3] = character[1][1] = character[1][2] = character[4][4] = character[5][1] = character [5][2] = character [5][3] = character [5][4] = '_';
712+
character[1][4] = '\\';
713+
character[3][2] = character[3][4] = character[4][1] = character[4][3] = '/';
714+
character[2][3] = ')';
715+
character[1][0] = character[2][5] = character[5][0] = character[5][5] = '|';
710716
return character;
711717
}
712718

713-
*/
714719

715720
/*
716721
char **three()

example.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ using namespace ascii;
55

66
int main()
77
{
8+
<<<<<<< HEAD
89
Ascii a = Ascii(starwar);
910
a.print("D");
11+
=======
12+
Ascii a = Ascii(straight);
13+
a.print("p");
14+
>>>>>>> f71ae0aad9aba0868ed82e85e46f0f6f37b9bbf3
1015
return 0;
1116
}

0 commit comments

Comments
 (0)