Removed all warnings

bitluni · bitluni · commit 77de85360628 · 2019-03-30T15:19:24.000+01:00
diff --git a/src/Graphics/Animation.h b/src/Graphics/Animation.h
@@ -30,6 +30,10 @@ class Animation : public Entity
 		time = 0;
 		this->drawMode = drawMode;
 	}
+
+	virtual ~Animation()
+	{
+	}
 	
 	bool act(int dt)
 	{
diff --git a/src/Graphics/Font.h b/src/Graphics/Font.h
@@ -16,9 +16,9 @@ class Font
   public:
 	const int firstChar;
 	const int charCount;
+	const unsigned char *pixels;
 	const int charWidth;
 	const int charHeight;
-	const unsigned char *pixels;
 	Font(int charWidth, int charHeight, const unsigned char *pixels, int firstChar = 32, int charCount = 96)
 		:firstChar(firstChar),
 		charCount(charCount),
diff --git a/src/Graphics/GraphicsR1G1B1A1.h b/src/Graphics/GraphicsR1G1B1A1.h
@@ -54,39 +54,45 @@ class GraphicsR1G1B1A1: public Graphics<unsigned char>
 	virtual void dot(int x, int y, Color color)
 	{
 		if ((unsigned int)x < xres && (unsigned int)y < yres)
+		{
 			if(x & 1)
 				backBuffer[y][x >> 1] = (backBuffer[y][x >> 1] & 0xf) | (color << 4);
 			else
 				backBuffer[y][x >> 1] = (backBuffer[y][x >> 1] & 0xf0) | (color & 0xf);
+		}
 	}
 
 	virtual void dotAdd(int x, int y, Color color)
 	{
 		if ((unsigned int)x < xres && (unsigned int)y < yres)
+		{
 			if(x & 1)
 				backBuffer[y][x >> 1] = backBuffer[y][x >> 1] | (color << 4);
 			else
 				backBuffer[y][x >> 1] = backBuffer[y][x >> 1] | (color & 0xf);
+		}
 	}
 	
 	virtual void dotMix(int x, int y, Color color)
 	{
 		if ((unsigned int)x < xres && (unsigned int)y < yres && (color & 8) != 0)
 		{
 			if(x & 1)
-				backBuffer[y][x >> 1] = (backBuffer[y][x >> 1] & 0xf) | color << 4;
+				backBuffer[y][x >> 1] = (backBuffer[y][x >> 1] & 0xf) | (color << 4);
 			else
-				backBuffer[y][x >> 1] =  (backBuffer[y][x >> 1] & 0xf0) | color & 0xf;
+				backBuffer[y][x >> 1] =  (backBuffer[y][x >> 1] & 0xf0) | (color & 0xf);
 		}	
 	}
 	
 	virtual Color get(int x, int y)
 	{
 		if ((unsigned int)x < xres && (unsigned int)y < yres)
+		{
 			if(x & 1)
 				return backBuffer[y][x >> 1] = backBuffer[y][x >> 1] >> 4;
 			else
 				return backBuffer[y][x >> 1] = backBuffer[y][x >> 1] & 0xf;
+		}
 		return 0;
 	}
 
diff --git a/src/Graphics/GraphicsR1G1B1A1X2S2Swapped.h b/src/Graphics/GraphicsR1G1B1A1X2S2Swapped.h
@@ -86,6 +86,6 @@ class GraphicsR1G1B1A1X2S2Swapped: public Graphics<unsigned char>
 
 	virtual Color** allocateFrameBuffer()
 	{
-		Graphics<Color>::allocateFrameBuffer(xres, yres, (Color)SBits);
+		return Graphics<Color>::allocateFrameBuffer(xres, yres, (Color)SBits);
 	}
 };
diff --git a/src/Graphics/ImageDrawer.h b/src/Graphics/ImageDrawer.h
@@ -25,6 +25,8 @@ class ImageDrawer
 			case Image::R5G5B4A2:
 				imageR5G5B4A2(image, x, y, srcX, srcY, srcXres, srcYres);
 			break;
+			default:
+			break;
 		}
 	}
 
@@ -35,6 +37,8 @@ class ImageDrawer
 			case Image::R5G5B4A2:
 				imageAddR5G5B4A2(image, x, y, srcX, srcY, srcXres, srcYres);
 			break;
+			default:
+			break;
 		}
 	}
 
@@ -45,6 +49,8 @@ class ImageDrawer
 			case Image::R5G5B4A2:
 				imageMixR5G5B4A2(image, x, y, srcX, srcY, srcXres, srcYres);
 			break;
+			default:
+			break;
 		}
 	}
 
@@ -55,6 +61,8 @@ class ImageDrawer
 			case Image::R5G5B4A2:
 				imageR5G5B4A2(image, x, y, 0, 0, image.xres, image.yres);
 			break;
+			default:
+			break;
 		}
 	}
 
@@ -65,6 +73,8 @@ class ImageDrawer
 			case Image::R5G5B4A2:
 				imageAddR5G5B4A2(image, x, y, 0, 0, image.xres, image.yres);
 			break;
+			default:
+			break;
 		}
 	}
 
@@ -75,6 +85,8 @@ class ImageDrawer
 			case Image::R5G5B4A2:
 				imageMixR5G5B4A2(image, x, y, 0, 0, image.xres, image.yres);
 			break;
+			default:
+			break;
 		}
 	}
 };
diff --git a/src/Graphics/Mesh.h b/src/Graphics/Mesh.h
@@ -20,23 +20,23 @@ class Mesh
   public:
 	typedef typename Graphics::Color Color;
 	int vertexCount;
-	int triangleCount;
 	int edgeCount;
+	int triangleCount;
 	const float (*vertices)[3];
+	const unsigned short (*edges)[2];
+	const unsigned short (*triangles)[3];
 	const float (*triangleNormals)[3];
 	short (*tvertices)[3];
 	signed char (*tTriNormals)[3];
-	const unsigned short (*triangles)[3];
-	const unsigned short (*edges)[2];
 
 	typedef Color (*triangleShader)(int trinangleNo, short *v0, short *v1, short *v2, const signed char *normal, Color color);
 
 	Mesh(int vertCount, const float verts[][3], int edgeCount_ = 0, const unsigned short edges_[][2] = 0, int triCount = 0, const unsigned short tris[][3] = 0, const float triNorms[][3] = 0)
 		: vertexCount(vertCount),
-		  vertices(verts),
 		  edgeCount(edgeCount_),
-		  edges(edges_),
 		  triangleCount(triCount),
+		  vertices(verts),
+		  edges(edges_),
 		  triangles(tris),
 		  triangleNormals(triNorms)
 	{
diff --git a/src/Graphics/Sprites.h b/src/Graphics/Sprites.h
@@ -63,7 +63,7 @@ class Sprites
 		this->count = count;
 		this->sprites = new Sprite[count];
 		for (int i = 0; i < count; i++)
-			this->sprites[i].init(resolutions[i][0], resolutions[i][1], pixels + offsets[i], pointOffsets[i + 1] - pointOffsets[i], &points[pointOffsets[i]], pixelFormat);
+			this->sprites[i].init(resolutions[i][0], resolutions[i][1], (unsigned char*)pixels + offsets[i], pointOffsets[i + 1] - pointOffsets[i], &points[pointOffsets[i]], pixelFormat);
 	}
 
 	void draw(ImageDrawer &g, int sprite, int x, int y)
diff --git a/src/Math/Matrix.h b/src/Math/Matrix.h
@@ -36,7 +36,7 @@ class Vector
 		return *this;
 	}
 
-	const float operator[](int i)
+	float operator[](int i) const
 	{
 		return v[i];
 	}
diff --git a/src/VGA/Mode.h b/src/VGA/Mode.h
@@ -22,12 +22,12 @@ class Mode
 	int vSync;
 	int vBack;
 	int vRes;
-	int activeLineCount;
 	int vDiv;
 	unsigned long pixelClock;
 	int hSyncPolarity;
 	int vSyncPolarity;
 	float aspect;
+	int activeLineCount;
 	Mode(
 		const int hFront = 0,
 		const int hSync = 0,
diff --git a/src/VGA/VGA14BitI.h b/src/VGA/VGA14BitI.h
@@ -101,7 +101,6 @@ class VGA14BitI : public VGA, public GraphicsR5G5B4A2
 	void interruptPixelLine(int y, unsigned long *pixels, unsigned long syncBits)
 	{
 		unsigned short *line = frontBuffer[y];
-		static int c = 0;
 		for (int i = 0; i < mode.hRes / 2; i++)
 		{
 			//writing two pixels improves speed drastically (avoids memory reads)
diff --git a/src/VGA/VGA3BitI.h b/src/VGA/VGA3BitI.h
@@ -87,13 +87,13 @@ class VGA3BitI : public VGA, public GraphicsR1G1B1A1
 		unsigned long base, baseh;
 		if (currentLine >= mode.vFront && currentLine < mode.vFront + mode.vSync)
 		{
-			baseh = syncBits(true, true);//(vsyncBit | hsyncBit) | ((vsyncBit | hsyncBit) << 16);
-			base = syncBits(false, true);//(vsyncBit | hsyncBitI) | ((vsyncBit | hsyncBitI) << 16);
+			baseh = syncBits(true, true);
+			base = syncBits(false, true);
 		}
 		else
 		{
-			baseh = syncBits(true, false);(vsyncBitI | hsyncBit) | ((vsyncBitI | hsyncBit) << 16);
-			base =  syncBits(false, false);(vsyncBitI | hsyncBitI) | ((vsyncBitI | hsyncBitI) << 16);
+			baseh = syncBits(true, false);
+			base =  syncBits(false, false);
 		}
 		for (int i = 0; i < mode.hSync / 4; i++)
 			signal[i] = baseh;

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,10 @@ class Animation : public Entity`
`30`	`30`	`time = 0;`
`31`	`31`	`this->drawMode = drawMode;`
`32`	`32`	`}`
	`33`	`+`
	`34`	`+ virtual ~Animation()`
	`35`	`+ {`
	`36`	`+ }`
`33`	`37`
`34`	`38`	`bool act(int dt)`
`35`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -54,39 +54,45 @@ class GraphicsR1G1B1A1: public Graphics<unsigned char>`
`54`	`54`	`virtual void dot(int x, int y, Color color)`
`55`	`55`	`{`
`56`	`56`	`if ((unsigned int)x < xres && (unsigned int)y < yres)`
	`57`	`+ {`
`57`	`58`	`if(x & 1)`
`58`	`59`	`backBuffer[y][x >> 1] = (backBuffer[y][x >> 1] & 0xf) \| (color << 4);`
`59`	`60`	`else`
`60`	`61`	`backBuffer[y][x >> 1] = (backBuffer[y][x >> 1] & 0xf0) \| (color & 0xf);`
	`62`	`+ }`
`61`	`63`	`}`
`62`	`64`
`63`	`65`	`virtual void dotAdd(int x, int y, Color color)`
`64`	`66`	`{`
`65`	`67`	`if ((unsigned int)x < xres && (unsigned int)y < yres)`
	`68`	`+ {`
`66`	`69`	`if(x & 1)`
`67`	`70`	`backBuffer[y][x >> 1] = backBuffer[y][x >> 1] \| (color << 4);`
`68`	`71`	`else`
`69`	`72`	`backBuffer[y][x >> 1] = backBuffer[y][x >> 1] \| (color & 0xf);`
	`73`	`+ }`
`70`	`74`	`}`
`71`	`75`
`72`	`76`	`virtual void dotMix(int x, int y, Color color)`
`73`	`77`	`{`
`74`	`78`	`if ((unsigned int)x < xres && (unsigned int)y < yres && (color & 8) != 0)`
`75`	`79`	`{`
`76`	`80`	`if(x & 1)`
`77`		`- backBuffer[y][x >> 1] = (backBuffer[y][x >> 1] & 0xf) \| color << 4;`
	`81`	`+ backBuffer[y][x >> 1] = (backBuffer[y][x >> 1] & 0xf) \| (color << 4);`
`78`	`82`	`else`
`79`		`- backBuffer[y][x >> 1] = (backBuffer[y][x >> 1] & 0xf0) \| color & 0xf;`
	`83`	`+ backBuffer[y][x >> 1] = (backBuffer[y][x >> 1] & 0xf0) \| (color & 0xf);`
`80`	`84`	`}`
`81`	`85`	`}`
`82`	`86`
`83`	`87`	`virtual Color get(int x, int y)`
`84`	`88`	`{`
`85`	`89`	`if ((unsigned int)x < xres && (unsigned int)y < yres)`
	`90`	`+ {`
`86`	`91`	`if(x & 1)`
`87`	`92`	`return backBuffer[y][x >> 1] = backBuffer[y][x >> 1] >> 4;`
`88`	`93`	`else`
`89`	`94`	`return backBuffer[y][x >> 1] = backBuffer[y][x >> 1] & 0xf;`
	`95`	`+ }`
`90`	`96`	`return 0;`
`91`	`97`	`}`
`92`	`98`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,6 @@ class GraphicsR1G1B1A1X2S2Swapped: public Graphics<unsigned char>`
`86`	`86`
`87`	`87`	`virtual Color** allocateFrameBuffer()`
`88`	`88`	`{`
`89`		`- Graphics<Color>::allocateFrameBuffer(xres, yres, (Color)SBits);`
	`89`	`+ return Graphics<Color>::allocateFrameBuffer(xres, yres, (Color)SBits);`
`90`	`90`	`}`
`91`	`91`	`};`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@ class ImageDrawer`
`25`	`25`	`case Image::R5G5B4A2:`
`26`	`26`	`imageR5G5B4A2(image, x, y, srcX, srcY, srcXres, srcYres);`
`27`	`27`	`break;`
	`28`	`+ default:`
	`29`	`+ break;`
`28`	`30`	`}`
`29`	`31`	`}`
`30`	`32`
`@@ -35,6 +37,8 @@ class ImageDrawer`
`35`	`37`	`case Image::R5G5B4A2:`
`36`	`38`	`imageAddR5G5B4A2(image, x, y, srcX, srcY, srcXres, srcYres);`
`37`	`39`	`break;`
	`40`	`+ default:`
	`41`	`+ break;`
`38`	`42`	`}`
`39`	`43`	`}`
`40`	`44`
`@@ -45,6 +49,8 @@ class ImageDrawer`
`45`	`49`	`case Image::R5G5B4A2:`
`46`	`50`	`imageMixR5G5B4A2(image, x, y, srcX, srcY, srcXres, srcYres);`
`47`	`51`	`break;`
	`52`	`+ default:`
	`53`	`+ break;`
`48`	`54`	`}`
`49`	`55`	`}`
`50`	`56`
`@@ -55,6 +61,8 @@ class ImageDrawer`
`55`	`61`	`case Image::R5G5B4A2:`
`56`	`62`	`imageR5G5B4A2(image, x, y, 0, 0, image.xres, image.yres);`
`57`	`63`	`break;`
	`64`	`+ default:`
	`65`	`+ break;`
`58`	`66`	`}`
`59`	`67`	`}`
`60`	`68`
`@@ -65,6 +73,8 @@ class ImageDrawer`
`65`	`73`	`case Image::R5G5B4A2:`
`66`	`74`	`imageAddR5G5B4A2(image, x, y, 0, 0, image.xres, image.yres);`
`67`	`75`	`break;`
	`76`	`+ default:`
	`77`	`+ break;`
`68`	`78`	`}`
`69`	`79`	`}`
`70`	`80`
`@@ -75,6 +85,8 @@ class ImageDrawer`
`75`	`85`	`case Image::R5G5B4A2:`
`76`	`86`	`imageMixR5G5B4A2(image, x, y, 0, 0, image.xres, image.yres);`
`77`	`87`	`break;`
	`88`	`+ default:`
	`89`	`+ break;`
`78`	`90`	`}`
`79`	`91`	`}`
`80`	`92`	`};`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ class Sprites`
`63`	`63`	`this->count = count;`
`64`	`64`	`this->sprites = new Sprite[count];`
`65`	`65`	`for (int i = 0; i < count; i++)`
`66`		`- this->sprites[i].init(resolutions[i][0], resolutions[i][1], pixels + offsets[i], pointOffsets[i + 1] - pointOffsets[i], &points[pointOffsets[i]], pixelFormat);`
	`66`	`+ this->sprites[i].init(resolutions[i][0], resolutions[i][1], (unsigned char*)pixels + offsets[i], pointOffsets[i + 1] - pointOffsets[i], &points[pointOffsets[i]], pixelFormat);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`void draw(ImageDrawer &g, int sprite, int x, int y)`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class Vector`
`36`	`36`	`return *this;`
`37`	`37`	`}`
`38`	`38`
`39`		`- const float operator[](int i)`
	`39`	`+ float operator[](int i) const`
`40`	`40`	`{`
`41`	`41`	`return v[i];`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,6 @@ class VGA14BitI : public VGA, public GraphicsR5G5B4A2`
`101`	`101`	`void interruptPixelLine(int y, unsigned long *pixels, unsigned long syncBits)`
`102`	`102`	`{`
`103`	`103`	`unsigned short *line = frontBuffer[y];`
`104`		`- static int c = 0;`
`105`	`104`	`for (int i = 0; i < mode.hRes / 2; i++)`
`106`	`105`	`{`
`107`	`106`	`//writing two pixels improves speed drastically (avoids memory reads)`
Original file line number	Diff line number	Diff line change
`@@ -87,13 +87,13 @@ class VGA3BitI : public VGA, public GraphicsR1G1B1A1`
`87`	`87`	`unsigned long base, baseh;`
`88`	`88`	`if (currentLine >= mode.vFront && currentLine < mode.vFront + mode.vSync)`
`89`	`89`	`{`
`90`		`- baseh = syncBits(true, true);//(vsyncBit \| hsyncBit) \| ((vsyncBit \| hsyncBit) << 16);`
`91`		`- base = syncBits(false, true);//(vsyncBit \| hsyncBitI) \| ((vsyncBit \| hsyncBitI) << 16);`
	`90`	`+ baseh = syncBits(true, true);`
	`91`	`+ base = syncBits(false, true);`
`92`	`92`	`}`
`93`	`93`	`else`
`94`	`94`	`{`
`95`		`- baseh = syncBits(true, false);(vsyncBitI \| hsyncBit) \| ((vsyncBitI \| hsyncBit) << 16);`
`96`		`- base = syncBits(false, false);(vsyncBitI \| hsyncBitI) \| ((vsyncBitI \| hsyncBitI) << 16);`
	`95`	`+ baseh = syncBits(true, false);`
	`96`	`+ base = syncBits(false, false);`
`97`	`97`	`}`
`98`	`98`	`for (int i = 0; i < mode.hSync / 4; i++)`
`99`	`99`	`signal[i] = baseh;`