Icon adjustments

3 files changed, 39 insertions, 39 deletions

diff --git a/src/graphics/Graphics.cpp b/src/graphics/Graphics.cpp
index 144f302..4d6b63e 100644
--- a/src/graphics/Graphics.cpp
+++ b/src/graphics/Graphics.cpp
@@ -875,53 +875,53 @@ void Graphics::draw_icon(int x, int y, Icon icon, unsigned char alpha, bool inve
 		}
 		break;
 	case IconVelocity:
-		drawchar(x, y, 0x98, 128, 160, 255, 255);
+		drawchar(x, y, 0x98, 128, 160, 255, alpha);
 		break;
 	case IconPressure:
-		drawchar(x, y, 0x99, 255, 212, 32, 255);
+		drawchar(x, y, 0x99, 255, 212, 32, alpha);
 		break;
 	case IconPersistant:
-		drawchar(x, y, 0x9A, 212, 212, 212, 255);
+		drawchar(x, y, 0x9A, 212, 212, 212, alpha);
 		break;
 	case IconFire:
-		drawchar(x+1, y, 0x9B, 255, 0, 0, 255);
-		drawchar(x+1, y, 0x9C, 255, 255, 64, 255);
+		drawchar(x+1, y, 0x9B, 255, 0, 0, alpha);
+		drawchar(x+1, y, 0x9C, 255, 255, 64, alpha);
 		break;
 	case IconBlob:
-		drawchar(x, y, 0xBF, 55, 255, 55, 255);
+		drawchar(x, y, 0xBF, 55, 255, 55, alpha);
 		break;
 	case IconHeat:
-		drawchar(x+2, y, 0xBE, 255, 0, 0, 255);
-		drawchar(x+2, y, 0xBD, 255, 255, 255, 255);
+		drawchar(x+2, y, 0xBE, 255, 0, 0, alpha);
+		drawchar(x+2, y, 0xBD, 255, 255, 255, alpha);
 		break;
 	case IconBlur:
-		drawchar(x, y, 0xC4, 100, 150, 255, 255);
+		drawchar(x, y, 0xC4, 100, 150, 255, alpha);
 		break;
 	case IconGradient:
-		drawchar(x, y, 0xD3, 255, 50, 255, 255);
+		drawchar(x, y, 0xD3, 255, 50, 255, alpha);
 		break;
 	case IconLife:
-		drawchar(x, y, 0xE0, 255, 255, 255, 255);
+		drawchar(x, y, 0xE0, 255, 255, 255, alpha);
 		break;
 	case IconEffect:
-		drawchar(x, y, 0xE1, 255, 255, 160, 255);
+		drawchar(x, y, 0xE1, 255, 255, 160, alpha);
 		break;
 	case IconGlow:
-		drawchar(x, y, 0xDF, 200, 255, 255, 255);
+		drawchar(x, y, 0xDF, 200, 255, 255, alpha);
 		break;
 	case IconWarp:
-		drawchar(x, y, 0xDE, 255, 255, 255, 255);
+		drawchar(x, y, 0xDE, 255, 255, 255, alpha);
 		break;
 	case IconBasic:
-		drawchar(x, y, 0xDB, 255, 255, 200, 255);
+		drawchar(x, y, 0xDB, 255, 255, 200, alpha);
 		break;
 	case IconAltAir:
-		drawchar(x, y, 0xD4, 255, 55, 55, 255);
-		drawchar(x, y, 0xD5, 55, 255, 55, 255);
+		drawchar(x, y, 0xD4, 255, 55, 55, alpha);
+		drawchar(x, y, 0xD5, 55, 255, 55, alpha);
 		break;
 	default:
 		if(invert)
-			drawchar(x, y, 't', 0, 0 ,0 ,alpha);
+			drawchar(x, y, 't', 0, 0, 0, alpha);
 		else
 			drawchar(x, y, 't', 255, 255, 255, alpha);
 		break;
diff --git a/src/interface/Checkbox.cpp b/src/interface/Checkbox.cpp
index 7799561..ae24b00 100644
--- a/src/interface/Checkbox.cpp
+++ b/src/interface/Checkbox.cpp
@@ -86,7 +86,7 @@ void Checkbox::Draw(const Point& screenPos)
 		if (!Appearance.icon)
 			g->drawtext(screenPos.X+18, screenPos.Y+4, text, 255, 255, 255, 255);
 		else
-			g->draw_icon(screenPos.X+iconPosition.X, screenPos.Y+iconPosition.Y, Appearance.icon);
+			g->draw_icon(screenPos.X+iconPosition.X, screenPos.Y+iconPosition.Y, Appearance.icon, 255);
 	}
 	else
 	{
@@ -94,7 +94,7 @@ void Checkbox::Draw(const Point& screenPos)
 		if (!Appearance.icon)
 			g->drawtext(screenPos.X+18, screenPos.Y+4, text, 255, 255, 255, 200);
 		else
-			g->draw_icon(screenPos.X+iconPosition.X, screenPos.Y+iconPosition.Y, Appearance.icon);
+			g->draw_icon(screenPos.X+iconPosition.X, screenPos.Y+iconPosition.Y, Appearance.icon, 200);
 	}
 }
 
diff --git a/src/render/RenderView.cpp b/src/render/RenderView.cpp
index 087b20b..6327ce3 100644
--- a/src/render/RenderView.cpp
+++ b/src/render/RenderView.cpp
@@ -75,113 +75,113 @@ RenderView::RenderView():
 {
 	ui::Checkbox * tCheckbox;
 
-	tCheckbox = new ui::Checkbox(ui::Point(1, YRES+4), ui::Point(55, 16), "Effects", "Adds Special flare effects to some elements");
+	tCheckbox = new ui::Checkbox(ui::Point(1, YRES+4), ui::Point(30, 16), "Effects", "Adds Special flare effects to some elements");
 	renderModes.push_back(tCheckbox);
 	tCheckbox->SetIcon(IconEffect);
 	tCheckbox->SetActionCallback(new RenderModeAction(this, RENDER_EFFE));
 	AddComponent(tCheckbox);
 
-	tCheckbox = new ui::Checkbox(ui::Point(1, YRES+4+18), ui::Point(55, 16), "Fire", "Fire effect for gasses");
+	tCheckbox = new ui::Checkbox(ui::Point(1, YRES+4+18), ui::Point(30, 16), "Fire", "Fire effect for gasses");
 	renderModes.push_back(tCheckbox);
 	tCheckbox->SetIcon(IconFire);
 	tCheckbox->SetActionCallback(new RenderModeAction(this, RENDER_FIRE));
 	AddComponent(tCheckbox);
 
-	tCheckbox = new ui::Checkbox(ui::Point(41, YRES+4), ui::Point(55, 16), "Glow", "Glow effect on some elements");
+	tCheckbox = new ui::Checkbox(ui::Point(41, YRES+4), ui::Point(30, 16), "Glow", "Glow effect on some elements");
 	renderModes.push_back(tCheckbox);
 	tCheckbox->SetIcon(IconGlow);
 	tCheckbox->SetActionCallback(new RenderModeAction(this, RENDER_GLOW));
 	AddComponent(tCheckbox);
 
-	tCheckbox = new ui::Checkbox(ui::Point(41, YRES+4+18), ui::Point(55, 16), "Blur", "Blur effect for liquids");
+	tCheckbox = new ui::Checkbox(ui::Point(41, YRES+4+18), ui::Point(30, 16), "Blur", "Blur effect for liquids");
 	renderModes.push_back(tCheckbox);
 	tCheckbox->SetIcon(IconBlur);
 	tCheckbox->SetActionCallback(new RenderModeAction(this, RENDER_BLUR));
 	AddComponent(tCheckbox);
 
-	tCheckbox = new ui::Checkbox(ui::Point(81, YRES+4), ui::Point(55, 16), "Blob", "Makes everything be drawn like a blob");
+	tCheckbox = new ui::Checkbox(ui::Point(81, YRES+4), ui::Point(30, 16), "Blob", "Makes everything be drawn like a blob");
 	renderModes.push_back(tCheckbox);
 	tCheckbox->SetIcon(IconBlob);
 	tCheckbox->SetActionCallback(new RenderModeAction(this, RENDER_BLOB));
 	AddComponent(tCheckbox);
 
-	tCheckbox = new ui::Checkbox(ui::Point(81, YRES+4+18), ui::Point(55, 16), "Point", "Basic rendering, without this, most things will be invisible");
+	tCheckbox = new ui::Checkbox(ui::Point(81, YRES+4+18), ui::Point(30, 16), "Point", "Basic rendering, without this, most things will be invisible");
 	renderModes.push_back(tCheckbox);
 	tCheckbox->SetIcon(IconBasic);
 	tCheckbox->SetActionCallback(new RenderModeAction(this, RENDER_BASC));
 	AddComponent(tCheckbox);
 
-	tCheckbox = new ui::Checkbox(ui::Point(136, YRES+4), ui::Point(70, 16), "Alt. Air", "Displays pressure as red and blue, and velocity as white");
+	tCheckbox = new ui::Checkbox(ui::Point(136, YRES+4), ui::Point(30, 16), "Alt. Air", "Displays pressure as red and blue, and velocity as white");
 	displayModes.push_back(tCheckbox);
 	tCheckbox->SetIcon(IconAltAir);
 	tCheckbox->SetActionCallback(new DisplayModeAction(this, DISPLAY_AIRC));
 	AddComponent(tCheckbox);
 
-	tCheckbox = new ui::Checkbox(ui::Point(136, YRES+4+18), ui::Point(70, 16), "Pressure", "Displays pressure, red is positive and blue is negative");
+	tCheckbox = new ui::Checkbox(ui::Point(136, YRES+4+18), ui::Point(30, 16), "Pressure", "Displays pressure, red is positive and blue is negative");
 	displayModes.push_back(tCheckbox);
 	tCheckbox->SetIcon(IconPressure);
 	tCheckbox->SetActionCallback(new DisplayModeAction(this, DISPLAY_AIRP));
 	AddComponent(tCheckbox);
 
-	tCheckbox = new ui::Checkbox(ui::Point(176, YRES+4), ui::Point(70, 16), "Velocity", "Displays velocity and positive pressure: up/down adds blue, right/left adds red, still pressure adds green");
+	tCheckbox = new ui::Checkbox(ui::Point(176, YRES+4), ui::Point(30, 16), "Velocity", "Displays velocity and positive pressure: up/down adds blue, right/left adds red, still pressure adds green");
 	displayModes.push_back(tCheckbox);
 	tCheckbox->SetIcon(IconVelocity);
 	tCheckbox->SetActionCallback(new DisplayModeAction(this, DISPLAY_AIRV));
 	AddComponent(tCheckbox);
 
-	tCheckbox = new ui::Checkbox(ui::Point(176, YRES+4+18), ui::Point(70, 16), "Air-heat", "Displays the temperature of the air like heat display does");
+	tCheckbox = new ui::Checkbox(ui::Point(176, YRES+4+18), ui::Point(30, 16), "Air-heat", "Displays the temperature of the air like heat display does");
 	displayModes.push_back(tCheckbox);
 	tCheckbox->SetIcon(IconHeat);
 	tCheckbox->SetActionCallback(new DisplayModeAction(this, DISPLAY_AIRH));
 	AddComponent(tCheckbox);
 
-	/*tCheckbox = new ui::Checkbox(ui::Point(216, YRES+4), ui::Point(70, 16), "Air", "");
+	/*tCheckbox = new ui::Checkbox(ui::Point(216, YRES+4), ui::Point(30, 16), "Air", "");
 	displayModes.push_back(tCheckbox);
 	tCheckbox->SetIcon(IconAltAir);
 	tCheckbox->SetActionCallback(new DisplayModeAction(this, DISPLAY_AIR));
 	AddComponent(tCheckbox);*/
 
-	tCheckbox = new ui::Checkbox(ui::Point(221, YRES+4+18), ui::Point(70, 16), "Warp", "Gravity lensing, Newtonian Gravity bends light with this on");
+	tCheckbox = new ui::Checkbox(ui::Point(221, YRES+4+18), ui::Point(30, 16), "Warp", "Gravity lensing, Newtonian Gravity bends light with this on");
 	displayModes.push_back(tCheckbox);
 	tCheckbox->SetIcon(IconWarp);
 	tCheckbox->SetActionCallback(new DisplayModeAction(this, DISPLAY_WARP));
 	AddComponent(tCheckbox);
 
 #ifdef OGLR
-	tCheckbox = new ui::Checkbox(ui::Point(221, YRES+4), ui::Point(70, 16), "Effect", "I don't know what this does...") //I would remove the whole checkbox, but then there's a large empty space
+	tCheckbox = new ui::Checkbox(ui::Point(221, YRES+4), ui::Point(30, 16), "Effect", "I don't know what this does...") //I would remove the whole checkbox, but then there's a large empty space
 #else
-	tCheckbox = new ui::Checkbox(ui::Point(221, YRES+4), ui::Point(70, 16), "Effect", "Does nothing");
+	tCheckbox = new ui::Checkbox(ui::Point(221, YRES+4), ui::Point(30, 16), "Effect", "Does nothing");
 #endif
 	displayModes.push_back(tCheckbox);
 	tCheckbox->SetIcon(IconEffect);
 	tCheckbox->SetActionCallback(new DisplayModeAction(this, DISPLAY_EFFE));
 	AddComponent(tCheckbox);
 
-	tCheckbox = new ui::Checkbox(ui::Point(261, YRES+4), ui::Point(70, 16), "Persistent", "Element paths persist on the screen for a while");
+	tCheckbox = new ui::Checkbox(ui::Point(261, YRES+4), ui::Point(30, 16), "Persistent", "Element paths persist on the screen for a while");
 	displayModes.push_back(tCheckbox);
 	tCheckbox->SetIcon(IconPersistant);
 	tCheckbox->SetActionCallback(new DisplayModeAction(this, DISPLAY_PERS));
 	AddComponent(tCheckbox);
 
-	tCheckbox = new ui::Checkbox(ui::Point(306, YRES+4), ui::Point(50, 16), "Heat", "Displays temperatures of the elements, dark blue is coldest, pink is hotest");
+	tCheckbox = new ui::Checkbox(ui::Point(306, YRES+4), ui::Point(30, 16), "Heat", "Displays temperatures of the elements, dark blue is coldest, pink is hotest");
 	colourModes.push_back(tCheckbox);
 	tCheckbox->SetIcon(IconHeat);
 	tCheckbox->SetActionCallback(new ColourModeAction(this, COLOUR_HEAT));
 	AddComponent(tCheckbox);
 
-	tCheckbox = new ui::Checkbox(ui::Point(306, YRES+4+18), ui::Point(50, 16), "Life", "Displays the life value of elements in greyscale gradients");
+	tCheckbox = new ui::Checkbox(ui::Point(306, YRES+4+18), ui::Point(30, 16), "Life", "Displays the life value of elements in greyscale gradients");
 	colourModes.push_back(tCheckbox);
 	tCheckbox->SetIcon(IconLife);
 	tCheckbox->SetActionCallback(new ColourModeAction(this, COLOUR_LIFE));
 	AddComponent(tCheckbox);
 
-	tCheckbox = new ui::Checkbox(ui::Point(346, YRES+4+18), ui::Point(50, 16), "H-Gradient", "Changes colors of elements slightly to show heat diffusing through them");
+	tCheckbox = new ui::Checkbox(ui::Point(346, YRES+4+18), ui::Point(30, 16), "H-Gradient", "Changes colors of elements slightly to show heat diffusing through them");
 	colourModes.push_back(tCheckbox);
 	tCheckbox->SetIcon(IconGradient);
 	tCheckbox->SetActionCallback(new ColourModeAction(this, COLOUR_GRAD));
 	AddComponent(tCheckbox);
 
-	tCheckbox = new ui::Checkbox(ui::Point(346, YRES+4), ui::Point(50, 16), "Basic", "No special effects at all for anything, overrides all other options and deco");
+	tCheckbox = new ui::Checkbox(ui::Point(346, YRES+4), ui::Point(30, 16), "Basic", "No special effects at all for anything, overrides all other options and deco");
 	colourModes.push_back(tCheckbox);
 	tCheckbox->SetIcon(IconBasic);
 	tCheckbox->SetActionCallback(new ColourModeAction(this, COLOUR_BASC));