Skip to content

Commit 5df4e75

Browse files
Harry121199Harry121199
committed
Letter c fixed
1 parent 3092b90 commit 5df4e75

File tree

1 file changed

+37
-82
lines changed

1 file changed

+37
-82
lines changed

‎Fonts/starwar/starwar.h

Lines changed: 37 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -55,23 +55,21 @@ class Starwar : public Fonts
5555
return character;
5656
}
5757

58-
59-
char **D()
60-
{
61-
char **character = getCharGrid();
58+
char **D()
59+
{
60+
char **character = getCharGrid();
6261

63-
//Enter the character grid in ROWS X COLS
64-
character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[0][6] = character[0][7] = character[5][1] = character[5][2] = character[5][3] = character[5][4] = character[5][5] = character[5][6] = character[5][7] = '_';
65-
character[1][0] = character[2][0] = character[3][0] = character[4][0] = character[5][0] = character[2][9] = character[3][9] = character[4][9] = character[3][3] = character[3][6] = '|';
66-
character[2][4] = character[2][5] = character[4][4] = character[4][5] = '-';
67-
character[2][3] = character[2][6] = '.';
68-
character[4][3] = character[4][6] = '\'';
69-
character[1][8] = '\\';
70-
character[5][8] = '/';
62+
// Enter the character grid in ROWS X COLS
63+
character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[0][6] = character[0][7] = character[5][1] = character[5][2] = character[5][3] = character[5][4] = character[5][5] = character[5][6] = character[5][7] = '_';
64+
character[1][0] = character[2][0] = character[3][0] = character[4][0] = character[5][0] = character[2][9] = character[3][9] = character[4][9] = character[3][3] = character[3][6] = '|';
65+
character[2][4] = character[2][5] = character[4][4] = character[4][5] = '-';
66+
character[2][3] = character[2][6] = '.';
67+
character[4][3] = character[4][6] = '\'';
68+
character[1][8] = '\\';
69+
character[5][8] = '/';
7170

72-
return character;
73-
}
74-
71+
return character;
72+
}
7573

7674
/*
7775
char **E()
@@ -110,24 +108,13 @@ class Starwar : public Fonts
110108
{
111109
char **character = getCharGrid();
112110

113-
<<<<<<< HEAD
114111
// Enter the character grid in ROWS X COLS
115112
character[1][0] = character[1][3] = character[1][5] = character[1][8] = character[2][0] = character[2][3] = character[2][5] = character[2][8] = character[3][0] = character[3][8] = character[4][0] = character[4][3] = character[4][5] = character[4][8] = character[5][0] = character[5][3] = character[5][5] = character[5][8] = '|';
116-
117113
character[0][1] = character[0][2] = character[0][6] = character[0][7] = character[2][4] = character[3][4] = character[5][1] = character[5][2] = character[5][6] = character[5][7] = '_';
118114
character[0][0] = character[0][4] = character[0][8] = character[1][1] = character[1][2] = character[1][6] = character[1][7] = character[2][1] = character[2][2] = character[2][6] = character[2][7] = character[3][1] = character[3][2] = character[3][6] = character[3][7] = character[4][1] = character[4][1] = character[4][1] = character[4][1] = character[4][1] = character[4][1] = character[4][2] = character[4][6] = character[4][7] = character[1][4] = character[4][4] = character[5][4] = ' ';
119115
return character;
120116
}
121117
char **I()
122-
=======
123-
//Enter the character grid in ROWS X COLS
124-
character[1][0] = character[1][3] = character[1][5] = character[1][8] = character[2][0] = character[2][3] = character[2][5]= character[2][8]= character[3][0] = character[3][8] = character[4][0] = character[4][3] = character[4][5] = character[4][8] = character[5][0] = character[5][3] = character[5][5] = character[5][8] ='|';
125-
character[0][1] = character[0][2] = character[0][6] = character[0][7]= character[2][4]= character[3][4] = character[5][1] = character[5][2] = character[5][6] = character[5][7] = '_';
126-
character[0][0] = character[0][4] = character[0][8] = character[1][1] = character[1][2] = character[1][6] = character[1][7] = character[2][1] = character[2][2] = character[2][6] = character[2][7] = character[3][1] = character[3][2] = character[3][6] = character[3][7] = character[4][1] = character[4][1] = character[4][1] = character[4][1] = character[4][1] = character[4][1] = character[4][2] = character[4][6] = character[4][7] = character[1][4] = character[4][4] = character[5][4] = ' ';
127-
return character;
128-
}
129-
char **I()
130-
>>>>>>> 1d7a1642e8e330c32d1f98f91a9566ef369268a5
131118
{
132119
char **character = getCharGrid();
133120
character[0][1] = character[5][1] = character[0][2] = character[5][2] = '_';
@@ -191,7 +178,6 @@ class Starwar : public Fonts
191178
return character;
192179
}
193180

194-
<<<<<<< HEAD
195181
char **N()
196182
{
197183
// Enter the character grid in ROWS X COLS
@@ -205,13 +191,8 @@ class Starwar : public Fonts
205191
return character;
206192
}
207193

208-
=======
209-
return character;
210-
}
211-
212-
>>>>>>> 1d7a1642e8e330c32d1f98f91a9566ef369268a5
213194
/*
214-
195+
215196
char **O()
216197
{
217198
char **character = getCharGrid();
@@ -220,19 +201,12 @@ class Starwar : public Fonts
220201
221202
return character;
222203
}
223-
204+
224205
*/
225-
<<<<<<< HEAD
226206

227207
char **P()
228208
{
229209
char **character = getCharGrid();
230-
=======
231-
232-
char **P()
233-
{
234-
char **character = getCharGrid();
235-
>>>>>>> 1d7a1642e8e330c32d1f98f91a9566ef369268a5
236210

237211
// Enter the character grid in ROWS X COLS
238212
character[2][4] = character[1][4] = character[2][4] = character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[0][6] = character[5][2] = character[3][5] = character[3][4] = character[3][6] = '_';
@@ -254,19 +228,12 @@ class Starwar : public Fonts
254228
255229
return character;
256230
}
257-
231+
258232
*/
259-
<<<<<<< HEAD
260233

261234
char **R()
262235
{
263236
char **character = getCharGrid();
264-
=======
265-
266-
char **R()
267-
{
268-
char **character = getCharGrid();
269-
>>>>>>> 1d7a1642e8e330c32d1f98f91a9566ef369268a5
270237

271238
// Enter the character grid in ROWS X COLS
272239
character[2][4] = character[1][4] = character[2][4] = character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[0][6] = character[5][2] = character[5][7] = character[5][8] = character[5][9] = character[5][10] = character[5][11] = '_';
@@ -323,20 +290,7 @@ class Starwar : public Fonts
323290
{
324291
char **character = getCharGrid();
325292

326-
<<<<<<< HEAD
327293
// Enter the character grid in ROWS X COLS
328-
=======
329-
330-
char **V()
331-
{
332-
char **character = getCharGrid();
333-
334-
//Enter the character grid in ROWS X COLS
335-
336-
character[0][0] = character[0][1] = character[0][2] = character[0][3] = character[0][8] = character[0][9] = character[0][10] = character[0][11] = character[5][5] = character[5][6] = '_';
337-
character[1][0] = character[2][1] = character[3][2] = character[4][3] = character[5][4] = character[1][4] = character[2][5] = '\\';
338-
character[1][11] = character[2][10] = character[3][9] = character[4][8] = character[5][7] = character[1][7] = character[2][6] = '/';
339-
>>>>>>> 1d7a1642e8e330c32d1f98f91a9566ef369268a5
340294

341295
character[0][0] = character[0][1] = character[0][2] = character[0][3] = character[0][8] = character[0][9] = character[0][10] = character[0][11] = character[5][5] = character[5][6] = '_';
342296
character[1][0] = character[2][1] = character[3][2] = character[4][3] = character[5][4] = character[1][4] = character[2][5] = '\\';
@@ -701,21 +655,18 @@ class Starwar : public Fonts
701655

702656
// Numbers
703657

704-
705-
char **zero()
706-
{
707-
char **character = getCharGrid();
708-
709-
//Enter the character grid in ROWS X COLS
710-
character[0][2]=character[0][3]=character[0][4]=character[1][3]=character[4][3]=character[5][2]=character[5][3]=character[5][4]='_';
711-
character[1][1]=character[5][5]='/';
712-
character[1][5]=character[5][1]='\\';
713-
character[2][0]=character[3][0]=character[4][0]=character[2][6]=character[3][6]=character[4][6]=character[2][2]=character[3][2]=character[4][2]=character[2][4]=character[3][4]=character[4][4]='|';
658+
char **zero()
659+
{
660+
char **character = getCharGrid();
714661

715-
return character;
716-
}
662+
// Enter the character grid in ROWS X COLS
663+
character[0][2] = character[0][3] = character[0][4] = character[1][3] = character[4][3] = character[5][2] = character[5][3] = character[5][4] = '_';
664+
character[1][1] = character[5][5] = '/';
665+
character[1][5] = character[5][1] = '\\';
666+
character[2][0] = character[3][0] = character[4][0] = character[2][6] = character[3][6] = character[4][6] = character[2][2] = character[3][2] = character[4][2] = character[2][4] = character[3][4] = character[4][4] = '|';
717667

718-
668+
return character;
669+
}
719670

720671
char **one()
721672
{
@@ -753,13 +704,17 @@ class Starwar : public Fonts
753704
754705
*/
755706

756-
char **four()
757-
{
758-
char **character = getCharGrid();
759-
character[0][1] = character[0][4] = character[3][1] = character[3][2] = character[3][6] = character[5][4] = character[2][6] = '_';
760-
character[1][0] = character[1][2] = character[1][3] = character[1][5] = character[2][0] = character[2][2] = character[2][3] = character[2][5] = character[3][0] = character[3][7] = character[4][3] = character[4][5] = character[5][3] = character[5][5] = '|';
761-
return character;
762-
}
707+
/*
708+
char **four()
709+
{
710+
char **character = getCharGrid();
711+
712+
//Enter the character grid in ROWS X COLS
713+
714+
return character;
715+
}
716+
717+
*/
763718

764719
/*
765720
char **five()

0 commit comments

Comments
 (0)