AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-17 03:25:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix colours in launcher being saved as 1 or 10 off (Thanks Cheesse)

Browse Source
This commit is contained in:
UnknownShadow200 2019-04-16 23:21:40 +10:00
parent dfc203a818
commit d45a703f4c
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Http.c
View File

@ -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

2
src/LScreens.c
View File

@ -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();
}

1
src/Launcher.c
View File

@ -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);

25
src/Window.c
View File

@ -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();