Skip to content

Commit f949a39

Browse files
Harry121199Harry121199
committed
Resolved the conflict and updated digit 6 to boomer
2 parents 860ac9d + daf0676 commit f949a39

File tree

5 files changed

+43
-38
lines changed

5 files changed

+43
-38
lines changed

‎Fonts/Boomer/boomer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ class Boomer : public Fonts
736736

737737
char **six()
738738
{
739-
char **character = getCharGrid(7, 8);
739+
char **character = getCharGrid(6, 7);
740740
character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[1][3] = character[1][4] = character[1][5] = character[2][3] = character[2][4] = character[2][5] = character[3][3] = character[3][4] = character[3][2] = character[5][1] = character[5][2] = character[5][3] = character[5][4] = character[5][5] = character[4][3] = '_';
741741
character[5][0] = '\\';
742742
character[5][6] = '/';

‎Fonts/Straight/straight.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -528,17 +528,18 @@ class Straight : public Fonts
528528
529529
*/
530530

531-
/*
531+
532532
char **t()
533533
{
534-
char **character = getCharGrid(ROWS,COLS);
534+
char **character = getCharGrid(3,3);
535535

536-
//Enter the character grid in ROWS X COLS
536+
character[1][0]=character[2][0]='|';
537+
character[1][1]=character[2][1]='_';
537538

538539
return character;
539540
}
540541

541-
*/
542+
542543

543544
char **u()
544545
{

‎Fonts/banner/banner.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -287,27 +287,27 @@ class Banner : public Fonts
287287
}
288288
*/
289289

290-
/*
290+
291291
char **b()
292292
{
293-
char **character = getCharGrid(ROWS,COLS);
293+
char **character = getCharGrid(7,4);
294294

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

297297
return character;
298298
}
299-
*/
299+
300300

301-
/*
301+
302302
char **c()
303303
{
304-
char **character = getCharGrid(ROWS,COLS);
304+
char **character = getCharGrid(7,3);
305305

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

308308
return character;
309309
}
310-
*/
310+
311311

312312
/*
313313
char **d()

‎Fonts/carlos/carlos.h

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Carlos : public Fonts
1212

1313
char **A()
1414
{
15-
char **character = getCharGrid();
15+
char **character = getCharGrid(7,10);
1616

1717
character[0][3] = character[0][4] = character[0][5] = character[0][6] = '_';
1818
character[1][2] = '(';
@@ -38,7 +38,7 @@ class Carlos : public Fonts
3838

3939
char **B()
4040
{
41-
char **character = getCharGrid();
41+
char **character = getCharGrid(7,9);
4242

4343
character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[2][5] = character[4][5] = character[5][5] = '_';
4444
character[0][5] = character[0][6] = character[1][1] = character[1][5] = character[3][6] = character[5][1] = '_';
@@ -52,7 +52,7 @@ class Carlos : public Fonts
5252

5353
char **C()
5454
{
55-
char **character = getCharGrid();
55+
char **character = getCharGrid(7,8);
5656

5757
character[0][0] = character[0][1] = character[0][2] = character[1][0] = character[1][1] = character[1][3] = character[2][0] = character[2][2] = character[3][1] = character[4][1] = character[5][0] = character[5][2] = character[6][0] = character[6][1] = ' ';
5858
character[0][3] = character[0][4] = character[0][5] = character[0][6] = character[1][4] = character[1][5] = character[1][6] = character[5][4] = character[5][5] = character[5][6] = character[6][3] = character[6][4] = character[6][5] = character[6][6] = '_';
@@ -66,7 +66,7 @@ class Carlos : public Fonts
6666

6767
char **D()
6868
{
69-
char **character = getCharGrid();
69+
char **character = getCharGrid(7,10);
7070

7171
character[0][1] = '_';
7272
character[0][2] = '_';
@@ -117,7 +117,7 @@ class Carlos : public Fonts
117117

118118
char **E()
119119
{
120-
char **character = getCharGrid();
120+
char **character = getCharGrid(7,8);
121121
character[0][2] = '_';
122122
character[0][3] = '_';
123123
character[0][4] = '_';
@@ -172,7 +172,7 @@ class Carlos : public Fonts
172172

173173
char **G()
174174
{
175-
char **character = getCharGrid();
175+
char **character = getCharGrid(7,10);
176176
character[0][3] = '_';
177177
character[0][4] = '_';
178178
character[0][5] = '_';
@@ -223,7 +223,7 @@ class Carlos : public Fonts
223223

224224
char **H()
225225
{
226-
char **character = getCharGrid();
226+
char **character = getCharGrid(7,10);
227227

228228
character[0][0] = character[0][3] = character[0][4] = character[0][5] = character[0][6] = character[1][1] = character[1][2] = character[1][4] = character[1][5] = character[1][7] = character[1][8] = character[2][0] = character[2][2] = character[2][7] = character[3][0] = character[3][1] = character[3][3] = character[3][6] = character[4][0] = character[4][2] = character[4][4] = character[4][5] = character[4][7] = character[5][0] = character[5][1] = character[5][3] = character[5][6] = character[6][0] = character[6][4] = character[6][5] = ' ';
229229
character[0][1] = character[0][2] = character[0][7] = character[0][8] = character[2][4] = character[2][5] = character[3][4] = character[3][5] = character[6][2] = character[6][7] = '_';
@@ -325,7 +325,7 @@ class Carlos : public Fonts
325325

326326
char **Q()
327327
{
328-
char **character = getCharGrid();
328+
char **character = getCharGrid(8,11);
329329

330330
character[0][3] = '_';
331331
character[0][4] = '_';
@@ -365,6 +365,10 @@ class Carlos : public Fonts
365365
character[6][8] = '\\';
366366
character[6][9] = '_';
367367

368+
character[7][10] = ')';
369+
character[7][9] = character[7][8] = '_';
370+
character[7][7] = '\\';
371+
368372
return character;
369373
}
370374

@@ -381,7 +385,7 @@ class Carlos : public Fonts
381385

382386
char **S()
383387
{
384-
char **character = getCharGrid();
388+
char **character = getCharGrid(7,9);
385389

386390
// Enter the character grid in ROWS X COL
387391
character[0][3] = '_';
@@ -470,7 +474,7 @@ class Carlos : public Fonts
470474

471475
char **X()
472476
{
473-
char **character = getCharGrid();
477+
char **character = getCharGrid(7,11);
474478

475479
// Enter the character grid in ROWS X COL
476480
character[0][0] = character[0][3] = character[0][4] = character[0][5] = character[0][6] = character[0][7] = character[0][8] = character[1][2] = character[1][4] = character[1][5] = character[1][7] = character[1][8] = character[2][0] = character[2][2] = character[2][7] = character[3][0] = character[3][1] = character[3][3] = character[3][6] = character[4][0] = character[4][2] = character[4][4] = character[4][5] = character[4][7] = character[5][0] = character[5][1] = character[5][3] = character[5][6] = character[6][0] = character[6][4] = character[6][5] = ' ';
@@ -496,24 +500,24 @@ class Carlos : public Fonts
496500

497501
char **Z()
498502
{
499-
char **character = getCharGrid();
500-
character[0][1] = '_';
503+
char **character = getCharGrid(7,10);
504+
character[0][8] = '_';
501505
character[0][2] = '_';
502506
character[0][3] = '_';
503507
character[0][4] = '_';
504508
character[0][5] = '_';
505509
character[0][6] = '_';
506510
character[0][7] = '_';
507511

508-
character[1][0] = '(';
509-
character[1][1] = '_';
512+
character[1][1] = '(';
510513
character[1][2] = '_';
511514
character[1][3] = '_';
512515
character[1][4] = '_';
513516
character[1][5] = '_';
514-
character[1][6] = ' ';
517+
// character[1][6] = '_';
515518
character[1][7] = ' ';
516-
character[3][8] = ' ';
519+
character[1][8] = ' ';
520+
// character[3][9] = ' ';
517521
character[1][9] = ')';
518522

519523
character[2][5] = '/';
@@ -564,7 +568,7 @@ class Carlos : public Fonts
564568

565569
char **a()
566570
{
567-
char **character = getCharGrid();
571+
char **character = getCharGrid(7,10);
568572

569573
character[0][3] = character[0][4] = character[0][5] = character[0][6] = '_';
570574
character[1][2] = '(';
@@ -884,7 +888,7 @@ class Carlos : public Fonts
884888
// Numbers
885889
char **zero()
886890
{
887-
char **character = getCharGrid();
891+
char **character = getCharGrid(7,8);
888892

889893
character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[1][3] = character[1][4] = character[5][3] = character[5][4] = character[6][2] = character[6][3] = character[6][4] = character[6][5] = '_';
890894
character[2][0] = character[2][2] = character[3][0] = character[3][2] = character[4][0] = character[4][2] = character[5][0] = character[5][2] = '(';

‎readme.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,13 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
145145
<sub><b>alucard017</b></sub>
146146
</a>
147147
</td>
148+
<td align="center">
149+
<a href="https://github.com/XARTAN21">
150+
<img src="https://avatars.githubusercontent.com/u/124522194?v=4" width="70;" alt="XARTAN21"/>
151+
<br />
152+
<sub><b>XARTAN21</b></sub>
153+
</a>
154+
</td>
148155
<td align="center">
149156
<a href="https://github.com/Harry121199">
150157
<img src="https://avatars.githubusercontent.com/u/117886160?v=4" width="70;" alt="Harry121199"/>
@@ -158,13 +165,6 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
158165
<br />
159166
<sub><b>komal7141</b></sub>
160167
</a>
161-
</td>
162-
<td align="center">
163-
<a href="https://github.com/XARTAN21">
164-
<img src="https://avatars.githubusercontent.com/u/124522194?v=4" width="70;" alt="XARTAN21"/>
165-
<br />
166-
<sub><b>XARTAN21</b></sub>
167-
</a>
168168
</td></tr>
169169
<tr>
170170
<td align="center">

0 commit comments

Comments
 (0)