Refactoring

1 files changed, 99 insertions, 99 deletions

diff --git a/src/Font.c b/src/Font.c
index c4b1491..d8d1e9e 100644
--- a/src/Font.c
+++ b/src/Font.c
@@ -21,73 +21,73 @@
 static char _internal_text[FONT_INTERNAL_TEXT_BUFFER_MAX_SIZE];
 static unsigned char _blend_effect_lum;
 
-bool FontLoadImage(char* strPath, TYPE_FONT * ptrFont)
+bool FontLoadImage(char *path, struct font *font)
 {
-	if(GfxSpriteFromFile(strPath, &ptrFont->spr) == false)
+	if (GfxSpriteFromFile(path, &font->spr) == false)
 	{
 		return false;
 	}
-	
-	ptrFont->spr_w = ptrFont->spr.w;
-	ptrFont->spr_h = ptrFont->spr.h;
-	ptrFont->spr_u = ptrFont->spr.u;
-	ptrFont->spr_v = ptrFont->spr.v;
-	
-	//Now set default values to font
-	
-	ptrFont->char_w = FONT_DEFAULT_CHAR_SIZE;
-	ptrFont->char_h = FONT_DEFAULT_CHAR_SIZE;
-	
-	ptrFont->spr.attribute |= COLORMODE(COLORMODE_4BPP);
-	ptrFont->spr.attribute &= COLORMODE(~(COLORMODE_8BPP | COLORMODE_16BPP | COLORMODE_24BPP));
-	ptrFont->spr.r = NORMAL_LUMINANCE;
-	ptrFont->spr.g = NORMAL_LUMINANCE;
-	ptrFont->spr.b = NORMAL_LUMINANCE;
-	
-	//At this point, spr.w and spr.h = real w/h
-	ptrFont->char_per_row = (uint8_t)(ptrFont->spr_w / ptrFont->char_w);
-	ptrFont->max_ch_wrap = 0;
-	
-	ptrFont->spr.w = ptrFont->char_w;
-	ptrFont->spr.h = ptrFont->char_h;
-	
-	ptrFont->flags = FONT_NOFLAGS;
-	
-	ptrFont->init_ch = FONT_DEFAULT_INIT_CHAR;
-	
-	dprintf("Sprite CX = %d, sprite CY = %d\n",ptrFont->spr.cx, ptrFont->spr.cy);
-	
+
+	font->spr_w = font->spr.w;
+	font->spr_h = font->spr.h;
+	font->spr_u = font->spr.u;
+	font->spr_v = font->spr.v;
+
+	/* Now set default values to font */
+
+	font->char_w = FONT_DEFAULT_CHAR_SIZE;
+	font->char_h = FONT_DEFAULT_CHAR_SIZE;
+
+	font->spr.attribute |= COLORMODE(COLORMODE_4BPP);
+	font->spr.attribute &= COLORMODE(~(COLORMODE_8BPP | COLORMODE_16BPP | COLORMODE_24BPP));
+	font->spr.r = NORMAL_LUMINANCE;
+	font->spr.g = NORMAL_LUMINANCE;
+	font->spr.b = NORMAL_LUMINANCE;
+
+	/* At this point, spr.w and spr.h = real w/h */
+	font->char_per_row = (uint8_t)(font->spr_w / font->char_w);
+	font->max_ch_wrap = 0;
+
+	font->spr.w = font->char_w;
+	font->spr.h = font->char_h;
+
+	font->flags = FONT_NOFLAGS;
+
+	font->init_ch = FONT_DEFAULT_INIT_CHAR;
+
+	dprintf("Sprite CX = %d, sprite CY = %d\n",font->spr.cx, font->spr.cy);
+
 	return true;
 }
 
-void FontSetInitChar(TYPE_FONT * ptrFont, char c)
+void FontSetInitChar(struct font *font, char c)
 {
-	ptrFont->init_ch = c;
+	font->init_ch = c;
 }
 
-void FontSetFlags(TYPE_FONT * ptrFont, FONT_FLAGS flags)
+void FontSetFlags(struct font *font, enum font_flags flags)
 {
-	ptrFont->flags = flags;
+	font->flags = flags;
 }
 
-void FontSetSize(TYPE_FONT * ptrFont, short size, short bitshift)
+void FontSetSize(struct font *font, short size, short bitshift)
 {
-	ptrFont->char_w = size;
-	ptrFont->char_h = size;
-
-    ptrFont->char_w_bitshift = bitshift;
-	
-	//At this point, spr.w and spr.h = real w/h
-	ptrFont->char_per_row = (uint8_t)(ptrFont->spr_w / ptrFont->char_w);
-	ptrFont->max_ch_wrap = 0;
-	
-	ptrFont->spr.w = ptrFont->char_w;
-	ptrFont->spr.h = ptrFont->char_h;
+	font->char_w = size;
+	font->char_h = size;
+
+    font->char_w_bitshift = bitshift;
+
+	/* At this point, spr.w and spr.h = real w/h */
+	font->char_per_row = (uint8_t)(font->spr_w / font->char_w);
+	font->max_ch_wrap = 0;
+
+	font->spr.w = font->char_w;
+	font->spr.h = font->char_h;
 }
 
-void FontSetSpacing(TYPE_FONT* ptrFont, short spacing)
+void FontSetSpacing(struct font *font, short spacing)
 {
-    ptrFont->char_spacing = spacing;
+    font->char_spacing = spacing;
 }
 
 void FontCyclic(void)
@@ -95,99 +95,99 @@ void FontCyclic(void)
 	_blend_effect_lum -= 8;
 }
 
-void FontPrintText(TYPE_FONT * ptrFont, short x, short y, char* str, ...)
+void FontPrintText(struct font *font, short x, short y, char* str, ...)
 {
 	uint16_t i;
 	uint16_t line_count = 0;
 	int result;
 	short orig_x = x;
-	
+
 	va_list ap;
-	
+
 	va_start(ap, str);
-	
+
 	result = vsnprintf(	_internal_text,
 						FONT_INTERNAL_TEXT_BUFFER_MAX_SIZE,
 						str,
 						ap	);
 
-    if(ptrFont->flags & FONT_H_CENTERED)
+    if (font->flags & FONT_H_CENTERED)
     {
-        x = (X_SCREEN_RESOLUTION >> 1) - ((result >> 1) << ptrFont->char_w_bitshift);
+        x = (X_SCREEN_RESOLUTION >> 1) - ((result >> 1) << font->char_w_bitshift);
         orig_x = x;
     }
-	
-	for(i = 0; i < result ; i++)
+
+	for (i = 0; i < result ; i++)
 	{
 		char _ch = _internal_text[i];
-		
-		if(_ch == '\0')
+
+		if (_ch == '\0')
 		{
-			// End of string
+			/* End of string */
 			break;
 		}
-		
+
 		switch(_ch)
 		{
 			case ' ':
-				x += ptrFont->char_w;
+				x += font->char_w;
 				continue;
 			case '\n':
 				x = orig_x;
-				y += ptrFont->char_h;
+				y += font->char_h;
 			break;
 			default:
-				if(	(ptrFont->flags & FONT_WRAP_LINE) && (ptrFont->max_ch_wrap != 0) )
+				if (	(font->flags & FONT_WRAP_LINE) && (font->max_ch_wrap != 0) )
 				{
-					if(++line_count >= ptrFont->max_ch_wrap)
+					if (++line_count >= font->max_ch_wrap)
 					{
 						line_count = 0;
 						x = orig_x;
-						y += ptrFont->char_h;
+						y += font->char_h;
 					}
 				}
-	
-				ptrFont->spr.x = x;
-				ptrFont->spr.y = y;
-				ptrFont->spr.w = ptrFont->char_w;
-				ptrFont->spr.h = ptrFont->char_h;
-				ptrFont->spr.u = (short)( (_ch - ptrFont->init_ch) % ptrFont->char_per_row) * ptrFont->char_w;
-				ptrFont->spr.u += ptrFont->spr_u; // Add original offset for image
-				ptrFont->spr.v = (short)( (_ch - ptrFont->init_ch) / ptrFont->char_per_row) * ptrFont->char_h;
-				ptrFont->spr.v += ptrFont->spr_v; // Add original offset for image
-				
-				if(ptrFont->flags & FONT_BLEND_EFFECT)
+
+				font->spr.x = x;
+				font->spr.y = y;
+				font->spr.w = font->char_w;
+				font->spr.h = font->char_h;
+				font->spr.u = (short)( (_ch - font->init_ch) % font->char_per_row) *font->char_w;
+				font->spr.u += font->spr_u; /* Add original offset for image */
+				font->spr.v = (short)( (_ch - font->init_ch) / font->char_per_row) *font->char_h;
+				font->spr.v += font->spr_v; /* Add original offset for image */
+
+				if (font->flags & FONT_BLEND_EFFECT)
 				{
-					ptrFont->spr.r += 8;
-					ptrFont->spr.g += 8;
-					ptrFont->spr.b += 8;
+					font->spr.r += 8;
+					font->spr.g += 8;
+					font->spr.b += 8;
 				}
 				else
 				{
-					ptrFont->spr.r = NORMAL_LUMINANCE;
-					ptrFont->spr.g = NORMAL_LUMINANCE;
-					ptrFont->spr.b = NORMAL_LUMINANCE;
+					font->spr.r = NORMAL_LUMINANCE;
+					font->spr.g = NORMAL_LUMINANCE;
+					font->spr.b = NORMAL_LUMINANCE;
 				}
 				/*dprintf("char_w = %d, char_h = %d, char_per_row = %d, init_ch: %c\n",
-						ptrFont->char_w,
-						ptrFont->char_h,
-						ptrFont->char_per_row,
-						ptrFont->init_ch);
-				dprintf("Char: %c, spr.u = %d, spr.v = %d\n",str[i],ptrFont->spr.u, ptrFont->spr.v);
-				dprintf("Sprite CX = %d, sprite CY = %d\n",ptrFont->spr.cx, ptrFont->spr.cy);*/
-				//dprintf("Sprite rgb={%d,%d,%d}\n",ptrFont->spr.r, ptrFont->spr.g, ptrFont->spr.b);
-				
-				GfxSortSprite(&ptrFont->spr);
-				x += ptrFont->char_spacing;
+						font->char_w,
+						font->char_h,
+						font->char_per_row,
+						font->init_ch);
+				dprintf("Char: %c, spr.u = %d, spr.v = %d\n",str[i],font->spr.u, font->spr.v);
+				dprintf("Sprite CX = %d, sprite CY = %d\n",font->spr.cx, font->spr.cy);*/
+				/* dprintf("Sprite rgb={%d,%d,%d}\n",font->spr.r, font->spr.g, font->spr.b); */
+
+				GfxSortSprite(&font->spr);
+				x += font->char_spacing;
 			break;
 		}
 	}
-	
-	if(ptrFont->flags & FONT_BLEND_EFFECT)
+
+	if (font->flags & FONT_BLEND_EFFECT)
 	{
-		ptrFont->spr.r = _blend_effect_lum;
-		ptrFont->spr.g = _blend_effect_lum;
-		ptrFont->spr.b = _blend_effect_lum;
+		font->spr.r = _blend_effect_lum;
+		font->spr.g = _blend_effect_lum;
+		font->spr.b = _blend_effect_lum;
 	}
 
 	va_end(ap);