dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'improved_breakdowns' into jgrpp

Browse Source 
# Conflicts:
#	src/vehiclelist.cpp
This commit is contained in:
Jonathan G Rennison
2017-08-15 19:26:26 +01:00
parent 1d1718c226 2d66f25f6c
commit f34833f111
60 changed files with 261 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/newgrf_gui.cpp
View File

@@ -1034,8 +1034,9 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
if (this->editable && this->active_sel != NULL) SetObjectToPlaceWnd(SPR_CURSOR_MOUSE, PAL_NONE, HT_DRAG, this);
break;
}
/* FALL THROUGH, with double click. */
/* With double click, continue */
}
FALLTHROUGH;
case WID_NS_REMOVE: { // Remove GRF
if (this->active_sel == NULL || !this->editable) break;
@@ -1089,8 +1090,9 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
if (this->editable && this->avail_sel != NULL && !HasBit(this->avail_sel->flags, GCF_INVALID)) SetObjectToPlaceWnd(SPR_CURSOR_MOUSE, PAL_NONE, HT_DRAG, this);
break;
}
/* FALL THROUGH, with double click. */
/* With double click, continue */
}
FALLTHROUGH;
case WID_NS_ADD:
if (this->avail_sel == NULL || !this->editable || HasBit(this->avail_sel->flags, GCF_INVALID)) break;
@@ -1228,10 +1230,12 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
}
this->avails.ForceRebuild();
/* FALL THROUGH */
FALLTHROUGH;
case GOID_NEWGRF_LIST_EDITED:
this->preset = -1;
/* FALL THROUGH */
FALLTHROUGH;
case GOID_NEWGRF_PRESET_LOADED: {
/* Update scrollbars */
int i = 0;