From d45a703f4c014b1c3d6ccbe71c4ac8ebd8172227 Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Tue, 16 Apr 2019 23:21:40 +1000
Subject: [PATCH] Fix colours in launcher being saved as 1 or 10 off (Thanks
 Cheesse)

---
 src/Http.c     |  2 +-
 src/LScreens.c |  2 +-
 src/Launcher.c |  1 +
 src/Window.c   | 25 ++++++++++++++++---------
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/Http.c b/src/Http.c
index d5b1cb043..dfb7f4fce 100644
--- a/src/Http.c
+++ b/src/Http.c
@@ -743,7 +743,7 @@ static void Http_WorkerLoop(void) {
 #ifdef CC_BUILD_WEB
 /* Access to XMLHttpRequest at 'http://static.classicube.net' from origin 'http://www.classicube.net' has been blocked by CORS policy: */
 /* No 'Access-Control-Allow-Origin' header is present on the requested resource. */
-const static String skinServer = String_FromConst("http://classicube.net/static/skins/");
+const static String skinServer = String_FromConst("http://www.classicube.net/static/skins/");
 #else
 const static String skinServer = String_FromConst("http://static.classicube.net/skins/");
 #endif
diff --git a/src/LScreens.c b/src/LScreens.c
index 4782c6048..e4ae59811 100644
--- a/src/LScreens.c
+++ b/src/LScreens.c
@@ -404,8 +404,8 @@ static void ColoursScreen_TextChanged(struct LInput* w) {
 	if (!Convert_ParseUInt8(&s->IptColours[index + 1].Text, &g)) return;
 	if (!Convert_ParseUInt8(&s->IptColours[index + 2].Text, &b)) return;
 
-	Launcher_SaveSkin();
 	col->R = r; col->G = g; col->B = b;
+	Launcher_SaveSkin();
 	Launcher_Redraw();
 }
 
diff --git a/src/Launcher.c b/src/Launcher.c
index fc3c291bf..14d0b80a2 100644
--- a/src/Launcher.c
+++ b/src/Launcher.c
@@ -308,6 +308,7 @@ void Launcher_LoadSkin(void) {
 CC_NOINLINE static void Launcher_SetCol(const char* key, BitmapCol col) {
 	String value; char valueBuffer[8];
 	PackedCol tmp;
+	/* Component order might be different to BitmapCol */
 	tmp.R = col.R; tmp.G = col.G; tmp.B = col.B; tmp.A = 0;
 	
 	String_InitArray(value, valueBuffer);
diff --git a/src/Window.c b/src/Window.c
index 72a1d1137..a14424ed7 100644
--- a/src/Window.c
+++ b/src/Window.c
@@ -40,23 +40,21 @@ static void Window_RegrabMouse(void) {
 	Window_CentreMousePosition();
 }
 
-#if !defined(CC_BUILD_SDL) && !defined(CC_BUILD_WEBCANVAS)
-void Window_EnableRawMouse(void) {
+static void Window_DefaultEnableRawMouse(void) {
 	Window_RegrabMouse();
 	Cursor_SetVisible(false);
 }
 
-void Window_UpdateRawMouse(void) {
+static void Window_DefaultUpdateRawMouse(void) {
 	Point2D p = Cursor_GetScreenPos();
 	Event_RaiseMouseMove(&MouseEvents.RawMoved, p.X - cursorPrev.X, p.Y - cursorPrev.Y);
 	Window_CentreMousePosition();
 }
 
-void Window_DisableRawMouse(void) {
+static void Window_DefaultDisableRawMouse(void) {
 	Window_RegrabMouse();
 	Cursor_SetVisible(true);
 }
-#endif
 
 
 /*########################################################################################################################*
@@ -658,6 +656,10 @@ void Window_DrawRaw(Rect2D r) {
 	BOOL success = BitBlt(win_DC, r.X, r.Y, r.Width, r.Height, draw_DC, r.X, r.Y, SRCCOPY);
 	SelectObject(draw_DC, oldSrc);
 }
+
+void Window_EnableRawMouse(void)  { Window_DefaultEnableRawMouse();  }
+void Window_UpdateRawMouse(void)  { Window_DefaultUpdateRawMouse();  }
+void Window_DisableRawMouse(void) { Window_DefaultDisableRawMouse(); }
 #endif
 
 
@@ -1554,6 +1556,10 @@ void Window_DrawRaw(Rect2D r) {
 	XPutImage(win_display, win_handle, win_gc, win_image,
 		r.X, r.Y, r.X, r.Y, r.Width, r.Height);
 }
+
+void Window_EnableRawMouse(void)  { Window_DefaultEnableRawMouse();  }
+void Window_UpdateRawMouse(void)  { Window_DefaultUpdateRawMouse();  }
+void Window_DisableRawMouse(void) { Window_DefaultDisableRawMouse(); }
 #endif
 
 
@@ -2184,6 +2190,10 @@ void Window_DrawRaw(Rect2D r) {
 	CGImageRelease(win_image);
 	CGDataProviderRelease(provider);
 }
+
+void Window_EnableRawMouse(void)  { Window_DefaultEnableRawMouse();  }
+void Window_UpdateRawMouse(void)  { Window_DefaultUpdateRawMouse();  }
+void Window_DisableRawMouse(void) { Window_DefaultDisableRawMouse(); }
 #endif
 
 
@@ -2524,10 +2534,7 @@ void Window_EnableRawMouse(void) {
 	SDL_SetRelativeMouseMode(true);
 	win_rawMouse = true;
 }
-
-void Window_UpdateRawMouse(void) {
-	Window_CentreMousePosition();
-}
+void Window_UpdateRawMouse(void) { Window_CentreMousePosition(); }
 
 void Window_DisableRawMouse(void) {
 	Window_RegrabMouse();