mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix going up at top level and issue when saving

This commit is contained in:
Thomas 2015-02-14 23:22:44 +01:00
parent 10babd3c77
commit c59aadb676
1 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/windows/loadsave.c
View File

@ -39,15 +39,15 @@ enum {
WIDX_BACKGROUND, WIDX_BACKGROUND,
WIDX_TITLE, WIDX_TITLE,
WIDX_CLOSE, WIDX_CLOSE,
WIDX_SCROLL WIDX_SCROLL,
}; };
// 0x9DE48C // 0x9DE48C
static rct_widget window_loadsave_widgets[] = { static rct_widget window_loadsave_widgets[] = {
{ WWT_FRAME, 0, 0, WW - 1, 0, WH - 1, STR_NONE, STR_NONE }, { WWT_FRAME, 0, 0, WW - 1, 0, WH - 1, STR_NONE, STR_NONE },
{ WWT_CAPTION, 0, 1, WW - 2, 1, 14, STR_NONE, STR_WINDOW_TITLE_TIP }, { WWT_CAPTION, 0, 1, WW - 2, 1, 14, STR_NONE, STR_WINDOW_TITLE_TIP },
{ WWT_CLOSEBOX, 0, WW-13, WW - 3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, { WWT_CLOSEBOX, 0, WW - 13, WW - 3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP },
{ WWT_SCROLL, 0, 4, WW - 5, 18, WH - 18, 2, STR_NONE }, { WWT_SCROLL, 0, 4, WW - 5, 18, WH - 18, 2, STR_NONE },
{ WIDGETS_END } { WIDGETS_END }
}; };
@ -267,10 +267,27 @@ static void window_loadsave_scrollmousedown()
strcpy(templateString, (char*)RCT2_ADDRESS_SCENARIO_NAME); strcpy(templateString, (char*)RCT2_ADDRESS_SCENARIO_NAME);
window_text_input_open(w, WIDX_SCROLL, STR_NONE, 2710, templateStringId, 0, 64); window_text_input_open(w, WIDX_SCROLL, STR_NONE, 2710, templateStringId, 0, 64);
} else { } else {
if ((_loadsaveType & 1) == LOADSAVETYPE_SAVE) if (_listItems[selectedItem].path[strlen(_listItems[selectedItem].path) - 1] == '\\'){
window_overwrite_prompt_open(_listItems[selectedItem].name, _listItems[selectedItem].path); // The selected item is a folder
else int includeNewItem;
window_loadsave_select(w, _listItems[selectedItem].path);
w->no_list_items = 0;
w->selected_list_item = -1;
includeNewItem = (_type & 1) == LOADSAVETYPE_SAVE;
char directory[MAX_PATH];
strncpy(directory, _listItems[selectedItem].path, sizeof(directory));
window_loadsave_populate_list(includeNewItem, 1, directory, _extension);
w->no_list_items = _listItemsCount;
} else {
if ((_loadsaveType & 1) == LOADSAVETYPE_SAVE)
window_overwrite_prompt_open(_listItems[selectedItem].name, _listItems[selectedItem].path);
else
window_loadsave_select(w, _listItems[selectedItem].path);
}
} }
} }
@ -392,12 +409,14 @@ static void window_loadsave_populate_list(int includeNewItem, int browsable, con
_listItemsCount = 0; _listItemsCount = 0;
if (browsable) { if (browsable) {
int topLevel = 1;
int lastSlash = MAX_PATH; int lastSlash = MAX_PATH;
for (int index = MAX_PATH - 3; index >= 0; index--){ for (int index = MAX_PATH - 3; index >= 0; index--){
if (directory[index] == '\\'){ if (directory[index] == '\\'){
if (lastSlash != MAX_PATH){ if (lastSlash != MAX_PATH){
// The last slash has been changed before, we're now one up // The last slash has been changed before, we're now one up
lastSlash = index; lastSlash = index;
topLevel = 0;
break; break;
} else { } else {
// The last slash, after the whole path // The last slash, after the whole path
@ -405,12 +424,14 @@ static void window_loadsave_populate_list(int includeNewItem, int browsable, con
} }
} }
} }
listItem = &_listItems[_listItemsCount]; if (!topLevel){
strncpy(listItem->name, "(up) ", sizeof(listItem->name)); listItem = &_listItems[_listItemsCount];
strncat(listItem->name, directory, sizeof(listItem->name) - strlen(listItem->name)); strncpy(listItem->name, "(up) ", sizeof(listItem->name));
memset(listItem->path, '\0', MAX_PATH); strncat(listItem->name, directory, sizeof(listItem->name) - strlen(listItem->name));
strncpy(listItem->path, directory, lastSlash + 1); memset(listItem->path, '\0', MAX_PATH);
_listItemsCount++; strncpy(listItem->path, directory, lastSlash + 1);
_listItemsCount++;
}
} }
if (includeNewItem) { if (includeNewItem) {
@ -464,24 +485,9 @@ static void window_loadsave_populate_list(int includeNewItem, int browsable, con
static void window_loadsave_select(rct_window *w, const char *path) static void window_loadsave_select(rct_window *w, const char *path)
{ {
if (path[strlen(path) - 1] == '\\'){
switch (_loadsaveType) {
int includeNewItem; case (LOADSAVETYPE_LOAD | LOADSAVETYPE_GAME) :
w->no_list_items = 0;
w->selected_list_item = -1;
includeNewItem = (_type & 1) == LOADSAVETYPE_SAVE;
char directory[MAX_PATH];
strncpy(directory, path, sizeof(directory));
window_loadsave_populate_list(includeNewItem, 1, directory, _extension);
w->no_list_items = _listItemsCount;
} else {
switch (_loadsaveType) {
case (LOADSAVETYPE_LOAD | LOADSAVETYPE_GAME) :
if (game_load_save(path)) { if (game_load_save(path)) {
window_close(w); window_close(w);
gfx_invalidate_screen(); gfx_invalidate_screen();
@ -543,7 +549,6 @@ static void window_loadsave_select(rct_window *w, const char *path)
} }
break; break;
} }
}
} }
#pragma region Overwrite prompt #pragma region Overwrite prompt