Merge pull request #23 from GabrielRavier/improveCToE

Improve files starting with C, D and E

src/Caret.cpp

@@ -469,8 +469,7 @@ void ActCaret17(CARET *crt)
 }
 
 // Tables
-CARET_TABLE gCaretTable[18] =
+CARET_TABLE gCaretTable[18] = {
-{
 	{0, 0},
 	{0x800, 0x800},
 	{0x1000, 0x1000},

src/Draw.cpp

@@ -441,7 +441,6 @@ static void DrawBitmap(RECT *rcView, int x, int y, RECT *rect, Surface_Ids surf_
 
 	// Get SDL_Rects
 	SDL_Rect clipRect = RectToSDLRectScaled(rcView);
-
 	SDL_Rect frameRect = RectToSDLRectScaled(rect);
 
 	// Get dest rect
@@ -568,10 +567,13 @@ void InitTextObject(const char *font_name)
 		fontHeight = 12;
 	}
 	else
-	{*/
+	{
+		fontWidth = 5 * magnification;
+		fontHeight = 10 * magnification;
+	}*/
+
 	fontWidth = 5 * magnification;
 	fontHeight = 10 * magnification;
-//	}
 
 	size_t data_size;
 #ifdef WINDOWS

src/Ending.cpp

@@ -170,7 +170,7 @@ bool StartCreditScript()
 	if (Credit.size == -1)
 		return false;
 
-	//Allcoate buffer data
+	// Allocate buffer data
 	Credit.pData = (char*)malloc(Credit.size);
 	if (Credit.pData == NULL)
 		return false;
@@ -276,7 +276,7 @@ void ActionCredit_Read()
 				{
 					if (Credit.pData[Credit.offset] == 'l')
 					{
-						//what is this
+						// What is this
 						a = GetScriptNumber(&Credit.pData[++Credit.offset]);
 						Credit.offset += 4;
 						if (b == a)

src/Ending.h

@@ -33,7 +33,7 @@ struct ISLAND_SPRITE
 	int y;
 };
 
-#define MAX_STRIP (WINDOW_HEIGHT / 16) + 1
+#define MAX_STRIP ((WINDOW_HEIGHT / 16) + 1)
 
 void ActionStripper();
 void PutStripper();