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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/console_cmds.cpp
#	src/landscape.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/openttd.cpp
#	src/roadveh_cmd.cpp
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/window_type.h
This commit is contained in:
Jonathan G Rennison
2018-07-24 18:30:42 +01:00
parent 4bdbf3863d 8975318286
commit 035f5622b9
108 changed files with 2185 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/script/api/script_window.hpp
View File

@@ -32,6 +32,7 @@
#include "../../widgets/engine_widget.h"
#include "../../widgets/error_widget.h"
#include "../../widgets/fios_widget.h"
#include "../../widgets/framerate_widget.h"
#include "../../widgets/genworld_widget.h"
#include "../../widgets/goal_widget.h"
#include "../../widgets/graph_widget.h"
@@ -788,6 +789,18 @@ public:
*/
WC_SAVE_PRESET = ::WC_SAVE_PRESET,
/**
* Framerate display; %Window numbers:
* - 0 = #FramerateDisplayWidgets
*/
WC_FRAMERATE_DISPLAY = ::WC_FRAMERATE_DISPLAY,
/**
* Frame time graph; %Window numbers:
* - 0 = #FrametimeGraphWindowWidgets
*/
WC_FRAMETIME_GRAPH = ::WC_FRAMETIME_GRAPH,
WC_INVALID = ::WC_INVALID, ///< Invalid window.
};
@@ -1299,6 +1312,25 @@ public:
WID_SL_MISSING_NEWGRFS = ::WID_SL_MISSING_NEWGRFS, ///< Button to find missing NewGRFs online.
};
/* automatically generated from ../../widgets/framerate_widget.h */
/** Widgets of the #FramerateWindow class. */
enum FramerateWindowWidgets {
WID_FRW_CAPTION = ::WID_FRW_CAPTION,
WID_FRW_RATE_GAMELOOP = ::WID_FRW_RATE_GAMELOOP,
WID_FRW_RATE_DRAWING = ::WID_FRW_RATE_DRAWING,
WID_FRW_RATE_FACTOR = ::WID_FRW_RATE_FACTOR,
WID_FRW_INFO_DATA_POINTS = ::WID_FRW_INFO_DATA_POINTS,
WID_FRW_TIMES_NAMES = ::WID_FRW_TIMES_NAMES,
WID_FRW_TIMES_CURRENT = ::WID_FRW_TIMES_CURRENT,
WID_FRW_TIMES_AVERAGE = ::WID_FRW_TIMES_AVERAGE,
};
/** Widgets of the #FrametimeGraphWindow class. */
enum FrametimeGraphWindowWidgets {
WID_FGW_CAPTION = ::WID_FGW_CAPTION,
WID_FGW_GRAPH = ::WID_FGW_GRAPH,
};
/* automatically generated from ../../widgets/genworld_widget.h */
/** Widgets of the #GenerateLandscapeWindow class. */
enum GenerateLandscapeWidgets {