mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 20:13:07 +01:00
Code Issues Releases Wiki Activity

Finished ini file loading and removed warnings

Browse Source
This commit is contained in:
Robert Jordan
2015-05-30 11:52:08 -04:00
parent dbc1df308f
commit 53a241d197
7 changed files with 294 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/interface/colour_schemes.c
View File

@@ -110,6 +110,16 @@ window_colour_scheme* colour_scheme_get_by_class(rct_windowclass classification)
return NULL;
}
int colour_scheme_get_index_by_class(rct_windowclass classification)
{
for (int i = 0; i < sizeof(gColourSchemes); i++) {
if (gColourSchemes[i].classification == classification) {
return i;
}
}
return -1;
}
void colour_scheme_update(rct_window *window)
{
@@ -122,10 +132,10 @@ void colour_scheme_update(rct_window *window)
transparent = true;
}
}
if (transparent)
//if (transparent)
window->flags |= WF_TRANSPARENT;
else
window->flags &= ~WF_TRANSPARENT;
//else
// window->flags &= ~WF_TRANSPARENT;
}
void colour_scheme_update_by_class(rct_window *window, rct_windowclass classification)
@@ -139,10 +149,10 @@ void colour_scheme_update_by_class(rct_window *window, rct_windowclass classific
transparent = true;
}
}
if (transparent)
//if (transparent)
window->flags |= WF_TRANSPARENT;
else
window->flags &= ~WF_TRANSPARENT;
//else
// window->flags &= ~WF_TRANSPARENT;
}
void colour_scheme_change_preset(int preset)
@@ -160,7 +170,7 @@ void colour_scheme_change_preset(int preset)
break;
}
gCurrentColourSchemePreset = preset;
for (int i = 0; i < gNumColourSchemeWindows; i++) {
for (int i = 0; i < (int)gNumColourSchemeWindows; i++) {
for (int j = 0; j < gColourSchemes[i].num_colours; j++) {
gColourSchemes[i].colours[j] = gConfigColourSchemes.presets[preset].colour_schemes[i].colours[j];
}
@@ -169,17 +179,49 @@ void colour_scheme_change_preset(int preset)
window_invalidate_all();
}
bool colour_scheme_create_preset(const char *name)
void colour_scheme_create_preset(const char *name)
{
int preset = gConfigColourSchemes.num_presets;
gConfigColourSchemes.num_presets++;
gConfigColourSchemes.presets = realloc(gConfigColourSchemes.presets, sizeof(colour_scheme_preset*) * gConfigColourSchemes.num_presets);
gConfigColourSchemes.presets = realloc(gConfigColourSchemes.presets, sizeof(colour_scheme_preset) * gConfigColourSchemes.num_presets);
strcpy(gConfigColourSchemes.presets[preset].name, name);
gConfigColourSchemes.presets[preset].colour_schemes = malloc(sizeof(window_colours) * gNumColourSchemeWindows);
for (int i = 0; i < gNumColourSchemeWindows; i++) {
for (int i = 0; i < (int)gNumColourSchemeWindows; i++) {
for (int j = 0; j < 6; j++)
gConfigColourSchemes.presets[preset].colour_schemes[i].colours[j] = gColourSchemes[i].colours[j];
}
colour_schemes_save_preset(preset);
colour_scheme_change_preset(gConfigColourSchemes.num_presets - 1);
colour_scheme_change_preset(preset);
}
void colour_scheme_delete_preset(int preset)
{
if (preset >= 2)
{
utf8 path[MAX_PATH];
platform_get_user_directory(path, "colour schemes");
strcat(path, gConfigColourSchemes.presets[preset].name);
strcat(path, ".ini");
platform_file_delete(path);
for (int i = preset; i < gConfigColourSchemes.num_presets - 1; i++) {
gConfigColourSchemes.presets[i] = gConfigColourSchemes.presets[i + 1];
}
gConfigColourSchemes.num_presets--;
colour_scheme_change_preset(0);
}
}
void colour_scheme_rename_preset(int preset, const char *newName)
{
utf8 src[MAX_PATH], dest[MAX_PATH];
platform_get_user_directory(src, "colour schemes");
platform_get_user_directory(dest, "colour schemes");
strcat(src, gConfigColourSchemes.presets[preset].name);
strcat(dest, newName);
strcat(src, ".ini");
strcat(dest, ".ini");
platform_file_move(src, dest);
strcpy(gConfigColourSchemes.presets[gCurrentColourSchemePreset].name, newName);
}

5
src/interface/colour_schemes.h
View File

@@ -47,11 +47,14 @@ extern uint16 gCurrentColourSchemePreset;
extern uint32 gNumColourSchemeWindows;
window_colour_scheme* colour_scheme_get_by_class(rct_windowclass classification);
int colour_scheme_get_index_by_class(rct_windowclass classification);
void colour_scheme_update(rct_window *window);
void colour_scheme_update_by_class(rct_window *window, rct_windowclass classification);
void colour_scheme_change_preset(int preset);
bool colour_scheme_create_preset(const char *name);
void colour_scheme_create_preset(const char *name);
void colour_scheme_delete_preset(int preset);
void colour_scheme_rename_preset(int preset, const char *newName);
#endif

6
src/interface/window.h
View File

@@ -408,9 +408,9 @@ enum {
WC_COLOUR_SCHEMES = 119,
// Only used for colour schemes
WC_STAFF = 1020,
WC_EDITOR_TRACK_BOTTOM_TOOLBAR = 1021,
WC_EDITOR_SCENARIO_BOTTOM_TOOLBAR = 1022,
WC_STAFF = 220,
WC_EDITOR_TRACK_BOTTOM_TOOLBAR = 221,
WC_EDITOR_SCENARIO_BOTTOM_TOOLBAR = 222,
} WINDOW_CLASS;
enum PROMPT_MODE {