Merge pull request #75 from StarbotArc/main

Yep. Should now be RGBAToColor32.

Author: StarbotArc

src/Core/Draw.h

@@ -31,12 +31,12 @@ inline color32 RGBAtoColor32(int r, int g, int b, int a)
 
 inline color32 Color32(int r, int g, int b, int a = 255)
 {
-	return COLOR32(r, g, b, a);
+	return RGBAtoColor32(r, g, b, a);
 }
 
 inline color32 Color32(int lum, int a = 255)
 {
-	return COLOR32(lum, lum, lum, a);
+	return RGBAtoColor32(lum, lum, lum, a);
 }
 
 inline color32 Color32a(color32 rgb, int a)

src/Core/GuiDialog.cpp

@@ -320,7 +320,7 @@ void DialogData::draw()
 		dlg.frame.draw({r.x, r.y, r.w, r.h}, 0);
 		recti tb = Shrink(r, 2);
 		tb.h = FRAME_TITLEBAR_H - 2;
-		Draw::fill(tb, COLOR32(0, 0, 0, 48));
+		Draw::fill(tb, RGBAtoColor32(0, 0, 0, 48));
 	}
 	else
 	{

src/Core/QuadBatch.cpp

@@ -86,7 +86,7 @@ void BatchSprite::draw(QuadBatchT* out, int x, int y, int y2)
 
 void BatchSprite::draw(QuadBatchTC* out, int x, int y, uchar alpha)
 {
-	draw(out, x, y, (color32)COLOR32(255, 255, 255, alpha));
+	draw(out, x, y, RGBAtoColor32(255, 255, 255, alpha));
 }
 
 void BatchSprite::draw(QuadBatchTC* out, int x, int y, color32 col)

src/Core/TextLayout.cpp

@@ -135,10 +135,10 @@ static void ReadMarkupColor(color32& out, const uchar* param, int len, color32 b
 	switch(ReadHexColor(channels, param, len))
 	{
 	case 2:
-		out = COLOR32(channels[0], channels[1], channels[2], channels[3]);
+		out = RGBAtoColor32(channels[0], channels[1], channels[2], channels[3]);
 		break;
 	case 1:
-		out = COLOR32(channels[0], channels[1], channels[2], 0) | (base & kColor32_AlphaMask);
+		out = RGBAtoColor32(channels[0], channels[1], channels[2], 0) | (base & kColor32_AlphaMask);
 		break;
 	case 0:
 		out = base;
@@ -854,4 +854,4 @@ int Text::getEscapedCharIndex(const char* str, int index)
 	return offset;
 }
 
-};
+};